Attachment #78446 for issue #120066

View | Details | Raw Unified | Return to issue 120066
Collapse All | Expand All

Lines 80-86 Link Here

(-)svx/sdi/svxitems.sdi (-1 / +2 lines)
80	SVX_SNAP_FORMATTEDFIELD,	80	SVX_SNAP_FORMATTEDFIELD,
81	SVX_SNAP_PATTERNFIELD,	81	SVX_SNAP_PATTERNFIELD,
82	SVX_SNAP_FILECONTROL,	82	SVX_SNAP_FILECONTROL,
83	SVX_SNAP_TREECONTROL	83	SVX_SNAP_TREECONTROL,
		84	SVX_SNAP_GRIDCONTROL
84	}	85	}
85	item SvxChooseControlEnum SvxChooseControlItem;	86	item SvxChooseControlEnum SvxChooseControlItem;
86		87

Lines 57-62 Link Here

(-)basctl/source/inc/dlgeddef.hxx (+1 lines)
57	#define OBJ_DLG_PATTERNFIELD ((sal_uInt16)22)	57	#define OBJ_DLG_PATTERNFIELD ((sal_uInt16)22)
58	#define OBJ_DLG_FILECONTROL ((sal_uInt16)23)	58	#define OBJ_DLG_FILECONTROL ((sal_uInt16)23)
59	#define OBJ_DLG_TREECONTROL ((sal_uInt16)24)	59	#define OBJ_DLG_TREECONTROL ((sal_uInt16)24)
		60	#define OBJ_DLG_GRIDCONTROL ((sal_uInt16)25)
60		61
61	// control properties	62	// control properties
62	#define DLGED_PROP_BACKGROUNDCOLOR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )	63	#define DLGED_PROP_BACKGROUNDCOLOR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )

Lines 54-59 Link Here

(-)basctl/source/inc/dlgresid.hrc (+1 lines)
54	#define RID_STR_TRANSLATION_NOTLOCALIZED ( RID_DLG_START + 21 )	54	#define RID_STR_TRANSLATION_NOTLOCALIZED ( RID_DLG_START + 21 )
55	#define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 )	55	#define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 )
56	#define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 )	56	#define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 )
		57	#define RID_STR_CLASS_GRIDCONTROL ( RID_DLG_START + 24 )
57	// Property Browser Headline Id's -----------------------------------------------------------	58	// Property Browser Headline Id's -----------------------------------------------------------
58		59
59	#define RID_STR_BRWTITLE_PROPERTIES ( RID_DLG_START + 60 )	60	#define RID_STR_BRWTITLE_PROPERTIES ( RID_DLG_START + 60 )

Lines 795-800 Link Here

(-)basctl/source/dlged/dlgedobj.cxx (+8 lines)
795	{	795	{
796	nResId = RID_STR_CLASS_TREECONTROL;	796	nResId = RID_STR_CLASS_TREECONTROL;
797	}	797	}
		798	else if ( supportsService( "com.sun.star.awt.grid.UnoControlGridModel" ) )
		799	{
		800	nResId = RID_STR_CLASS_GRIDCONTROL;
		801	}
798		802
799	else	803	else
800	{	804	{
Lines 925-930 Link Here
925	{	929	{
926	return OBJ_DLG_TREECONTROL;	930	return OBJ_DLG_TREECONTROL;
927	}	931	}
		932	else if ( supportsService( "com.sun.star.awt.grid.UnoControlGridModel" ))
		933	{
		934	return OBJ_DLG_GRIDCONTROL;
		935	}
928	else	936	else
929	{	937	{
930	return OBJ_DLG_CONTROL;	938	return OBJ_DLG_CONTROL;

Lines 113-120 Link Here

(-)basctl/source/dlged/dlgresid.src (-1 / +4 lines)
113	{	113	{
114	Text = "TreeControl" ;	114	Text = "TreeControl" ;
115	};	115	};
		116	String RID_STR_CLASS_GRIDCONTROL
		117	{
		118	Text = "TableControl" ;
		119	};
116		120
117
118	// Property Browser Headline ----------------------------------------------------------------	121	// Property Browser Headline ----------------------------------------------------------------
119		122
120	String RID_STR_BRWTITLE_PROPERTIES	123	String RID_STR_BRWTITLE_PROPERTIES

Lines 70-76 Link Here

(-)basctl/source/dlged/dlgedfac.cxx (-2 / +5 lines)
70		70
71	if( (pObjFactory->nInventor == DlgInventor) &&	71	if( (pObjFactory->nInventor == DlgInventor) &&
72	(pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) &&	72	(pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) &&
73	(pObjFactory->nIdentifier <= OBJ_DLG_TREECONTROL) )	73	(pObjFactory->nIdentifier <= OBJ_DLG_GRIDCONTROL) )
74	{	74	{
75	switch( pObjFactory->nIdentifier )	75	switch( pObjFactory->nIdentifier )
76	{	76	{
Lines 183-189 Link Here
183	case OBJ_DLG_FILECONTROL:	183	case OBJ_DLG_FILECONTROL:
184	pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact );	184	pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact );
185	break;	185	break;
186	case OBJ_DLG_TREECONTROL:	186	case OBJ_DLG_GRIDCONTROL:
		187	pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.grid.UnoControlGridModel") , xDialogSFact );
		188	break;
		189	case OBJ_DLG_TREECONTROL:
187	DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );	190	DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );
188	pObjFactory->pNewObj = pNew;	191	pObjFactory->pNewObj = pNew;
189	/*	192	/*

Lines 488-493 Link Here

(-)basctl/source/dlged/propbrw.cxx (+4 lines)
488	{	488	{
489	nResId = RID_STR_CLASS_TREECONTROL;	489	nResId = RID_STR_CLASS_TREECONTROL;
490	}	490	}
		491	else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.grid.UnoControlGridModel" ) ) ) )
		492	{
		493	nResId = RID_STR_CLASS_GRIDCONTROL;
		494	}
491	else	495	else
492	{	496	{
493	nResId = RID_STR_CLASS_CONTROL;	497	nResId = RID_STR_CLASS_CONTROL;

Lines 52-58 Link Here

(-)basctl/source/basicide/idetemp.hxx (-1 / +2 lines)
52	SVX_SNAP_FORMATTEDFIELD,	52	SVX_SNAP_FORMATTEDFIELD,
53	SVX_SNAP_PATTERNFIELD,	53	SVX_SNAP_PATTERNFIELD,
54	SVX_SNAP_FILECONTROL,	54	SVX_SNAP_FILECONTROL,
55	SVX_SNAP_TREECONTROL	55	SVX_SNAP_TREECONTROL,
		56	SVX_SNAP_GRIDCONTROL
56	};	57	};
57		58
58	#define SvxChooseControlItem SfxAllEnumItem	59	#define SvxChooseControlItem SfxAllEnumItem

Lines 171-176 Link Here

(-)basctl/source/basicide/tbxctl.cxx (+1 lines)
171	case SVX_SNAP_PATTERNFIELD: nTemp = SID_INSERT_PATTERNFIELD; break;	171	case SVX_SNAP_PATTERNFIELD: nTemp = SID_INSERT_PATTERNFIELD; break;
172	case SVX_SNAP_FILECONTROL: nTemp = SID_INSERT_FILECONTROL; break;	172	case SVX_SNAP_FILECONTROL: nTemp = SID_INSERT_FILECONTROL; break;
173	case SVX_SNAP_TREECONTROL: nTemp = SID_INSERT_TREECONTROL; break;	173	case SVX_SNAP_TREECONTROL: nTemp = SID_INSERT_TREECONTROL; break;
		174	case SVX_SNAP_GRIDCONTROL: nTemp = SID_FM_DBGRID; break;
174	}	175	}
175	if( nTemp )	176	if( nTemp )
176	{	177	{

Lines 391-396 Link Here

(-)basctl/source/basicide/baside3.cxx (+7 lines)
391	case OBJ_DLG_PATTERNFIELD: nObj = SVX_SNAP_PATTERNFIELD; break;	391	case OBJ_DLG_PATTERNFIELD: nObj = SVX_SNAP_PATTERNFIELD; break;
392	case OBJ_DLG_FILECONTROL: nObj = SVX_SNAP_FILECONTROL; break;	392	case OBJ_DLG_FILECONTROL: nObj = SVX_SNAP_FILECONTROL; break;
393	case OBJ_DLG_TREECONTROL: nObj = SVX_SNAP_TREECONTROL; break;	393	case OBJ_DLG_TREECONTROL: nObj = SVX_SNAP_TREECONTROL; break;
		394	case OBJ_DLG_GRIDCONTROL: nObj = SVX_SNAP_GRIDCONTROL; break;
394	default: nObj = 0;	395	default: nObj = 0;
395	}	396	}
396	#ifdef DBG_UTIL	397	#ifdef DBG_UTIL
Lines 598-603 Link Here
598	GetEditor()->SetInsertObj( OBJ_DLG_TREECONTROL );	599	GetEditor()->SetInsertObj( OBJ_DLG_TREECONTROL );
599	}	600	}
600	break;	601	break;
		602	case SVX_SNAP_GRIDCONTROL:
		603	{
		604	GetEditor()->SetMode( DLGED_INSERT );
		605	GetEditor()->SetInsertObj( OBJ_DLG_GRIDCONTROL );
		606	}
		607	break;
601		608
602	case SVX_SNAP_SELECT:	609	case SVX_SNAP_SELECT:
603	{	610	{

Lines 62-65 Link Here

(-)basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml (+1 lines)
62	<toolbar:toolbaritem xlink:href=".uno:InsertFileControl" toolbar:style="radio"/>	62	<toolbar:toolbaritem xlink:href=".uno:InsertFileControl" toolbar:style="radio"/>
63	<toolbar:toolbaritem xlink:href=".uno:InsertTreeControl" toolbar:style="radio"/>	63	<toolbar:toolbaritem xlink:href=".uno:InsertTreeControl" toolbar:style="radio"/>
64	<toolbar:toolbarbreak/>	64	<toolbar:toolbarbreak/>
		65	<toolbar:toolbaritem xlink:href=".uno:InsertGridControl" toolbar:style="radio"/>
65	</toolbar:toolbar>	66	</toolbar:toolbar>

Lines 1257-1262 Link Here

(-)svx/inc/svx/svxids.hrc (+1 lines)
1257	#define SID_TRANSLITERATE_SENTENCE_CASE (SID_SVX_START+1102)	1257	#define SID_TRANSLITERATE_SENTENCE_CASE (SID_SVX_START+1102)
1258	#define SID_TRANSLITERATE_TITLE_CASE (SID_SVX_START+1103)	1258	#define SID_TRANSLITERATE_TITLE_CASE (SID_SVX_START+1103)
1259	#define SID_TRANSLITERATE_TOGGLE_CASE (SID_SVX_START+1104)	1259	#define SID_TRANSLITERATE_TOGGLE_CASE (SID_SVX_START+1104)
		1260	#define SID_INSERT_GRIDCONTROL (SID_SVX_START+1105)
1260		1261
1261	// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id	1262	// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
1262	#define SID_SVX_FIRSTFREE (SID_TRANSLITERATE_TOGGLE_CASE + 1)	1263	#define SID_SVX_FIRSTFREE (SID_TRANSLITERATE_TOGGLE_CASE + 1)

Lines 596-600 Link Here

(-)svx/inc/svx/svxcommands.h (+1 lines)
596	#define CMD_SID_RECHECK_DOCUMENT ".uno:RecheckDocument"	596	#define CMD_SID_RECHECK_DOCUMENT ".uno:RecheckDocument"
597	#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"	597	#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"
598	#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"	598	#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
		599	#define CMD_SID_INSERT_GRIDCONTROL ".uno:InsertGridControl"
599		600
600	#endif	601	#endif




    GroupId = GID_EXPLORER;
]

//--------------------------------------------------------------------------

SfxBoolItem InsertGridControl SID_INSERT_GRIDCONTROL

[
	/* flags: */
	AutoUpdate = TRUE,
	Cachable = Cachable,
	FastCall = FALSE,
	HasCoreId = FALSE,
	HasDialog = FALSE,
	ReadOnlyDoc = FALSE,
	Toggle = FALSE,
	Container = FALSE,
	RecordAbsolute = FALSE,
	RecordPerSet;
	Synchron;

	Readonly = FALSE,

	/* config: */
	AccelConfig = TRUE,
	MenuConfig = TRUE,
	StatusBarConfig = FALSE,
	ToolBoxConfig = TRUE,
	GroupId = GID_CONTROLS;
]

//--------------------------------------------------------------------------

Lines 3413-3418 Link Here

(-)officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu (+8 lines)
3413	<value>1</value>	3413	<value>1</value>
3414	</prop>	3414	</prop>
3415	</node>	3415	</node>
		3416	<node oor:name=".uno:InsertGridControl" oor:op="replace">
		3417	<prop oor:name="Label" oor:type="xs:string">
		3418	<value xml:lang="en-US">Table Control</value>
		3419	</prop>
		3420	<prop oor:name="Properties" oor:type="xs:int">
		3421	<value>1</value>
		3422	</prop>
		3423	</node>
3416	<node oor:name=".uno:InsertVideo" oor:op="replace">	3424	<node oor:name=".uno:InsertVideo" oor:op="replace">
3417	<prop oor:name="Label" oor:type="xs:string">	3425	<prop oor:name="Label" oor:type="xs:string">
3418	<value xml:lang="en-US">Video...</value>	3426	<value xml:lang="en-US">Video...</value>




                     dlg:formattedfield|
                     dlg:fixedline|
                     dlg:progressmeter|
                     dlg:scrollbar|
                     dlg:table
                    )">

<!ELEMENT dlg:window (dlg:styles*, (%event;)*, dlg:bulletinboard*)>

                            dlg:value-min %numeric; #IMPLIED
                            dlg:value-max %numeric; #IMPLIED
                            >

<!ELEMENT dlg:table ((%event;)*)>
<!ATTLIST dlg:table %default-attributes;
                    dlg:showcolumnheader %boolean; #IMPLIED
                    dlg:showrowheader %boolean; #IMPLIED
                    dlg:gridline-color %numeric; #IMPLIED
                    dlg:usegridlines %boolean; #IMPLIED
                    dlg:headerbackground-color %numeric; #IMPLIED
                    dlg:headertext-color %numeric; #IMPLIED
                    dlg:activeselectionbackground-color %numeric; #IMPLIED
                    dlg:activeselectiontext-color %numeric; #IMPLIED
                    dlg:inactiveselectionbackground-color %numeric; #IMPLIED
                    dlg:inactiveselectiontext-color %numeric; #IMPLIED
                    dlg:selectiontype CDATA #IMPLIED
                    dlg:valign (top|center|bottom) #IMPLIED
                    dlg:tabstop %boolean; #IMPLIED
                    >




    #define PROPERTY_ID_WHEEL_BEHAVIOR              200
    #define PROPERTY_ID_TEXT_ANCHOR_TYPE            201
    #define PROPERTY_ID_SHEET_ANCHOR_TYPE           202
    #define PROPERTY_ID_SELECTIONMODEL              203
    #define PROPERTY_ID_USEGRIDLINE                 204
    #define PROPERTY_ID_GRIDLINECOLOR               205
    #define PROPERTY_ID_SHOWCOLUMNHEADER            206
    #define PROPERTY_ID_SHOWROWHEADER               207
    #define PROPERTY_ID_HEADERBACKGROUNDCOLOR       208
    #define PROPERTY_ID_HEADERTEXTCOLOR             209
    #define PROPERTY_ID_ACTIVESELECTIONBACKGROUNDCOLOR 210
    #define PROPERTY_ID_ACTIVESELECTIONTEXTCOLOR    211
    #define PROPERTY_ID_INACTIVESELECTIONBACKGROUNDCOLOR 212
    #define PROPERTY_ID_INACTIVESELECTIONTEXTCOLOR  213

//............................................................................
} // namespace pcr




    PCR_CONSTASCII_STRING( PROPERTY_TEXTTYPE,               "TextType");
    PCR_CONSTASCII_STRING( PROPERTY_RICHTEXT,               "RichText");
    PCR_CONSTASCII_STRING( PROPERTY_ROWSET,                 "RowSet");
    
    PCR_CONSTASCII_STRING( PROPERTY_SELECTIONMODEL,         "SelectionModel");
    PCR_CONSTASCII_STRING( PROPERTY_USEGRIDLINE,            "UseGridLines");
    PCR_CONSTASCII_STRING( PROPERTY_GRIDLINECOLOR,          "GridLineColor");
    PCR_CONSTASCII_STRING( PROPERTY_SHOWCOLUMNHEADER,       "ShowColumnHeader");
    PCR_CONSTASCII_STRING( PROPERTY_SHOWROWHEADER,          "ShowRowHeader");
    PCR_CONSTASCII_STRING( PROPERTY_HEADERBACKGROUNDCOLOR,  "HeaderBackgroundColor");
    PCR_CONSTASCII_STRING( PROPERTY_HEADERTEXTCOLOR,        "HeaderTextColor");
    PCR_CONSTASCII_STRING( PROPERTY_ACTIVESELECTIONBACKGROUNDCOLOR, "ActiveSelectionBackgroundColor");
    PCR_CONSTASCII_STRING( PROPERTY_ACTIVESELECTIONTEXTCOLOR, "ActiveSelectionTextColor");
    PCR_CONSTASCII_STRING( PROPERTY_INACTIVESELECTIONBACKGROUNDCOLOR, "InactiveSelectionBackgroundColor");
    PCR_CONSTASCII_STRING( PROPERTY_INACTIVESELECTIONTEXTCOLOR, "InactiveSelectionTextColor");

	// services
	PCR_CONSTASCII_STRING( SERVICE_COMPONENT_GROUPBOX,		"com.sun.star.form.component.GroupBox" );




		DEF_INFO_2( EDITABLE,          EDITABLE,           EDITABLE,						DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, DIALOG_VISIBLE, COMPOSEABLE ),
        DEF_INFO_2( DECORATION,        DECORATION,         DECORATION,                      DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( NOLABEL,           NOLABEL,            NOLABEL,                         DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_3( SELECTIONMODEL,    SELECTIONMODEL,     SELECTIONMODEL,                  DIALOG_VISIBLE, ENUM, COMPOSEABLE ),
		DEF_INFO_2( USEGRIDLINE,       USEGRIDLINE,        USEGRIDLINE,                     DIALOG_VISIBLE, COMPOSEABLE ), 
		DEF_INFO_2( GRIDLINECOLOR,     GRIDLINECOLOR,      GRIDLINECOLOR,                   DIALOG_VISIBLE, COMPOSEABLE ), 
		DEF_INFO_2( SHOWCOLUMNHEADER,  SHOWCOLUMNHEADER,   SHOWCOLUMNHEADER,                DIALOG_VISIBLE, COMPOSEABLE ), 
		DEF_INFO_2( SHOWROWHEADER,     SHOWROWHEADER,      SHOWROWHEADER,                   DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( HEADERBACKGROUNDCOLOR, HEADERBACKGROUNDCOLOR, HEADERBACKGROUNDCOLOR,    DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( HEADERTEXTCOLOR,   HEADERTEXTCOLOR,    HEADERTEXTCOLOR,                 DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( ACTIVESELECTIONBACKGROUNDCOLOR,   ACTIVESELECTIONBACKGROUNDCOLOR,   ACTIVESELECTIONBACKGROUNDCOLOR,   DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( ACTIVESELECTIONTEXTCOLOR,         ACTIVESELECTIONTEXTCOLOR,         ACTIVESELECTIONTEXTCOLOR,         DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( INACTIVESELECTIONBACKGROUNDCOLOR, INACTIVESELECTIONBACKGROUNDCOLOR, INACTIVESELECTIONBACKGROUNDCOLOR, DIALOG_VISIBLE, COMPOSEABLE ),
		DEF_INFO_2( INACTIVESELECTIONTEXTCOLOR,       INACTIVESELECTIONTEXTCOLOR,       INACTIVESELECTIONTEXTCOLOR,       DIALOG_VISIBLE, COMPOSEABLE )
		};

		s_pPropertyInfos = aPropertyInfos;

                nStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING;
                break;
            case PROPERTY_ID_SELECTION_TYPE:
            case PROPERTY_ID_SELECTIONMODEL:
                nStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE;
                break;
            case PROPERTY_ID_SCALE_MODE:




#define RID_STR_FONTSTYLE_ITALIC            ( RID_FORMBROWSER_START + 253 )
#define RID_STR_FONTSTYLE_BOLD              ( RID_FORMBROWSER_START + 254 )
#define RID_STR_FONT_DEFAULT                ( RID_FORMBROWSER_START + 255 )
#define RID_STR_SELECTIONMODEL              ( RID_FORMBROWSER_START + 256 )
#define RID_STR_USEGRIDLINE                 ( RID_FORMBROWSER_START + 257 )
#define RID_STR_GRIDLINECOLOR               ( RID_FORMBROWSER_START + 258 )
#define RID_STR_SHOWCOLUMNHEADER            ( RID_FORMBROWSER_START + 259 )
#define RID_STR_SHOWROWHEADER               ( RID_FORMBROWSER_START + 260 )
#define RID_STR_HEADERBACKGROUNDCOLOR       ( RID_FORMBROWSER_START + 261 )
#define RID_STR_HEADERTEXTCOLOR             ( RID_FORMBROWSER_START + 262 )
#define RID_STR_ACTIVESELECTIONBACKGROUNDCOLOR ( RID_FORMBROWSER_START + 263 )
#define RID_STR_ACTIVESELECTIONTEXTCOLOR    ( RID_FORMBROWSER_START + 264 )
#define RID_STR_INACTIVESELECTIONBACKGROUNDCOLOR ( RID_FORMBROWSER_START + 265 )
#define RID_STR_INACTIVESELECTIONTEXTCOLOR  ( RID_FORMBROWSER_START + 266 )


// -----------------------------------------------------------------------
// - message strings





{
	Text [ en-US ] = "Frame" ;
};
String RID_STR_SELECTIONMODEL
{
    Text [ en-US ] = "Selection type";
};
String RID_STR_USEGRIDLINE
{
    Text [ en-US ] = "Use grid line";
};
String RID_STR_GRIDLINECOLOR
{
    Text [ en-US ] = "Grid line color";
};
String RID_STR_SHOWCOLUMNHEADER
{
    Text [ en-US ] = "Show column header";
};
String RID_STR_SHOWROWHEADER
{
    Text [ en-US ] = "Show row header";
};
String RID_STR_HEADERBACKGROUNDCOLOR
{
    Text [ en-US ] = "Header background color";
};
String RID_STR_HEADERTEXTCOLOR
{
    Text [ en-US ] = "Header text color";
};
String RID_STR_ACTIVESELECTIONBACKGROUNDCOLOR
{
    Text [ en-US ] = "Active selection background color";
};
String RID_STR_ACTIVESELECTIONTEXTCOLOR
{
    Text [ en-US ] = "Active selection text color";
};
String RID_STR_INACTIVESELECTIONBACKGROUNDCOLOR
{
    Text [ en-US ] = "Inactive selection background color";
};
String RID_STR_INACTIVESELECTIONTEXTCOLOR
{
    Text [ en-US ] = "Inactive selection text color";
};


Resource RID_RSC_ENUM_BORDER_TYPE
{
    String 1




#define HID_FM_PROPDLG_TAB_DATA                         "EXTENSIONS_HID_FM_PROPDLG_TAB_DATA"
#define HID_FM_PROPDLG_TAB_EVT                          "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT"

#define HID_PROP_SELECTIONMODEL                         "EXTENSIONS_HID_PROP_SELECTIONMODEL"
#define HID_PROP_USEGRIDLINE                            "EXTENSIONS_HID_PROP_USEGRIDLINE"
#define HID_PROP_GRIDLINECOLOR                          "EXTENSIONS_HID_PROP_GRIDLINECOLOR"
#define HID_PROP_SHOWCOLUMNHEADER                       "EXTENSIONS_HID_PROP_SHOWCOLUMNHEADER"
#define HID_PROP_SHOWROWHEADER                          "EXTENSIONS_HID_PROP_SHOWROWHEADER"
#define HID_PROP_HEADERBACKGROUNDCOLOR                  "EXTENSIONS_HID_PROP_HEADERBACKGROUNDCOLOR"
#define HID_PROP_HEADERTEXTCOLOR                        "EXTENSIONS_HID_PROP_HEADERTEXTCOLOR"
#define HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR         "EXTENSIONS_HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR"
#define HID_PROP_ACTIVESELECTIONTEXTCOLOR               "EXTENSIONS_HID_PROP_ACTIVESELECTIONTEXTCOLOR"
#define HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR       "EXTENSIONS_HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR"
#define HID_PROP_INACTIVESELECTIONTEXTCOLOR             "EXTENSIONS_HID_PROP_INACTIVESELECTIONTEXTCOLOR"

#endif // EXTENSIONS_PROPCTRLR_HRC




hidspecial HID_FM_PROPDLG_TAB_GENERAL           { HelpId = HID_FM_PROPDLG_TAB_GENERAL; }
hidspecial HID_FM_PROPDLG_TAB_DATA              { HelpId = HID_FM_PROPDLG_TAB_DATA; }
hidspecial HID_FM_PROPDLG_TAB_EVT               { HelpId = HID_FM_PROPDLG_TAB_EVT; }
hidspecial HID_PROP_SELECTIONMODEL              { HelpId = HID_PROP_SELECTIONMODEL; }
hidspecial HID_PROP_USEGRIDLINE                 { HelpId = HID_PROP_USEGRIDLINE; }
hidspecial HID_PROP_GRIDLINECOLOR               { HelpId = HID_PROP_GRIDLINECOLOR; }
hidspecial HID_PROP_SHOWCOLUMNHEADER            { HelpId = HID_PROP_SHOWCOLUMNHEADER; }
hidspecial HID_PROP_SHOWROWHEADER               { HelpId = HID_PROP_SHOWROWHEADER; }
hidspecial HID_PROP_HEADERBACKGROUNDCOLOR       { HelpId = HID_PROPS_HEADERBACKGROUNDCOLOR; }
hidspecial HID_PROP_HEADERTEXTCOLOR             { HelpId = HEADERTEXTCOLOR; }
hidspecial HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR { HelpId = ACTIVESELECTIONBACKGROUNDCOLOR; }
hidspecial HID_PROP_ACTIVESELECTIONTEXTCOLOR    { HelpId = ACTIVESELECTIONTEXTCOLOR; }
hidspecial HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR { HelpId = INACTIVESELECTIONBACKGROUNDCOLOR; }
hidspecial HID_PROP_INACTIVESELECTIONTEXTCOLOR  { HelpId = INACTIVESELECTIONTEXTCOLOR; }


Lines 1072-1077 Link Here

(-)extensions/source/propctrlr/formcomponenthandler.cxx (+28 lines)
1072	case PROPERTY_ID_FILLCOLOR:	1072	case PROPERTY_ID_FILLCOLOR:
1073	case PROPERTY_ID_SYMBOLCOLOR:	1073	case PROPERTY_ID_SYMBOLCOLOR:
1074	case PROPERTY_ID_BORDERCOLOR:	1074	case PROPERTY_ID_BORDERCOLOR:
		1075	case PROPERTY_ID_GRIDLINECOLOR:
		1076	case PROPERTY_ID_HEADERBACKGROUNDCOLOR:
		1077	case PROPERTY_ID_HEADERTEXTCOLOR:
		1078	case PROPERTY_ID_ACTIVESELECTIONBACKGROUNDCOLOR:
		1079	case PROPERTY_ID_ACTIVESELECTIONTEXTCOLOR:
		1080	case PROPERTY_ID_INACTIVESELECTIONBACKGROUNDCOLOR:
		1081	case PROPERTY_ID_INACTIVESELECTIONTEXTCOLOR:
1075	nControlType = PropertyControlType::ColorListBox;	1082	nControlType = PropertyControlType::ColorListBox;
1076		1083
1077	switch( nPropId )	1084	switch( nPropId )
Lines 1084-1089 Link Here
1084	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break;	1091	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break;
1085	case PROPERTY_ID_BORDERCOLOR:	1092	case PROPERTY_ID_BORDERCOLOR:
1086	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break;	1093	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break;
		1094	case PROPERTY_ID_GRIDLINECOLOR:
		1095	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(HID_PROP_GRIDLINECOLOR); break;
		1096	case PROPERTY_ID_HEADERBACKGROUNDCOLOR:
		1097	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(HID_PROP_HEADERBACKGROUNDCOLOR); break;
		1098	case PROPERTY_ID_HEADERTEXTCOLOR:
		1099	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(HID_PROP_HEADERTEXTCOLOR); break;
		1100	case PROPERTY_ID_ACTIVESELECTIONBACKGROUNDCOLOR:
		1101	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR); break;
		1102	case PROPERTY_ID_ACTIVESELECTIONTEXTCOLOR:
		1103	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(HID_PROP_ACTIVESELECTIONTEXTCOLOR); break;
		1104	case PROPERTY_ID_INACTIVESELECTIONBACKGROUNDCOLOR:
		1105	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR); break;
		1106	case PROPERTY_ID_INACTIVESELECTIONTEXTCOLOR:
		1107	aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(HID_PROP_INACTIVESELECTIONTEXTCOLOR); break;
1087	}	1108	}
1088	break;	1109	break;
1089		1110
Lines 1487-1492 Link Here
1487	case PROPERTY_ID_FILLCOLOR:	1508	case PROPERTY_ID_FILLCOLOR:
1488	case PROPERTY_ID_SYMBOLCOLOR:	1509	case PROPERTY_ID_SYMBOLCOLOR:
1489	case PROPERTY_ID_BORDERCOLOR:	1510	case PROPERTY_ID_BORDERCOLOR:
		1511	case PROPERTY_ID_GRIDLINECOLOR:
		1512	case PROPERTY_ID_HEADERBACKGROUNDCOLOR:
		1513	case PROPERTY_ID_HEADERTEXTCOLOR:
		1514	case PROPERTY_ID_ACTIVESELECTIONBACKGROUNDCOLOR:
		1515	case PROPERTY_ID_ACTIVESELECTIONTEXTCOLOR:
		1516	case PROPERTY_ID_INACTIVESELECTIONBACKGROUNDCOLOR:
		1517	case PROPERTY_ID_INACTIVESELECTIONTEXTCOLOR:
1490	if ( impl_dialogColorChooser_throw( nPropId, _rData, aGuard ) )	1518	if ( impl_dialogColorChooser_throw( nPropId, _rData, aGuard ) )
1491	eResult = InteractiveSelectionResult_ObtainedValue;	1519	eResult = InteractiveSelectionResult_ObtainedValue;
1492	break;	1520	break;




<paragraph role="paragraph" id="par_id9961851" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a tree control that can show a hierarchical list. You can populate the list by your program, using API calls (XtreeControl).</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertGridControl" id="bm_id1552784" localize="false"/><paragraph role="heading" id="hd_id11904" xml-lang="en-US" level="2" l10n="NEW">Table Control</paragraph>
<table id="">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id7511524" xml-lang="en-US" l10n="NEW">
<image id="Graphic2" src="res/commandimagelist/sc_insertgridcontrol.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">Table control icon</alt>
	</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id9961854" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a table control that can show a table data. You can populate the data by your program, using API calls.</ahelp></paragraph>
</tablecell>
</tablerow>
</table></body>
</helpdocument>




        {}
};

//==============================================================================
class GridControlElement
    : public ControlElement
{
public:
    virtual css::uno::Reference< css::xml::input::XElement >
    SAL_CALL startChildElement(
        sal_Int32 nUid, ::rtl::OUString const & rLocalName, 
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
    virtual void SAL_CALL endElement()
        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
    
    inline GridControlElement(
        ::rtl::OUString const & rLocalName, 
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, 
        ElementBase * pParent, DialogImport * pImport )
        SAL_THROW( () )
        : ControlElement( rLocalName, xAttributes, pParent, pImport )
        {}
};

}





//##################################################################################################

// table
//__________________________________________________________________________________________________
Reference< xml::input::XElement > GridControlElement::startChildElement(
	sal_Int32 nUid, OUString const & rLocalName,
	Reference< xml::input::XAttributes > const & xAttributes )
	throw (xml::sax::SAXException, RuntimeException)
{
	// event
    if (_pImport->isEventElement( nUid, rLocalName ))
	{
		return new EventElement( nUid, rLocalName, xAttributes, this, _pImport );
	}
	else
	{
		throw xml::sax::SAXException(
			OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
			Reference< XInterface >(), Any() );
	}
}

//__________________________________________________________________________________________________
void GridControlElement::endElement()
	throw (xml::sax::SAXException, RuntimeException)
{
	ControlImportContext ctx(
		_pImport, getControlId( _xAttributes ),
		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.UnoControlGridModel") ) );
	
	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
	if (xStyle.is())
	{
		StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
		pStyle->importBackgroundColorStyle( xControlModel );
        pStyle->importBorderStyle( xControlModel );
		pStyle->importTextColorStyle( xControlModel );
		pStyle->importTextLineColorStyle( xControlModel );
		pStyle->importFontStyle( xControlModel );
	}
	
	ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
    ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
							   OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
                               _xAttributes );
    ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
                                     OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ),
                                     _xAttributes );
    ctx.importSelectionTypeProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectionModel") ),
                                     OUString( RTL_CONSTASCII_USTRINGPARAM("selectiontype") ),
                                     _xAttributes );
    ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowColumnHeader") ),
							   OUString( RTL_CONSTASCII_USTRINGPARAM("showcolumnheader") ),
                               _xAttributes );
    ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowRowHeader") ),
							   OUString( RTL_CONSTASCII_USTRINGPARAM("showrowheader") ),
                               _xAttributes );
    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GridLineColor") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("gridline-color") ),
                               _xAttributes );
    ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("UseGridLines") ),
							   OUString( RTL_CONSTASCII_USTRINGPARAM("usegridlines") ),
                               _xAttributes );
    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBackgroundColor") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("headerbackground-color") ),
                               _xAttributes );
    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextColor") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("headertext-color") ),
                               _xAttributes );
    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionBackgroundColor") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("activeselectionbackground-color") ),
                               _xAttributes );
    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionTextColor") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("activeselectiontext-color") ),
                               _xAttributes );
    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionBackgroundColor") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("inactiveselectionbackground-color") ),
                               _xAttributes );
    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionTextColor") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("inactiveselectiontext-color") ),
                               _xAttributes );
    
    ctx.importEvents( _events );
    // avoid ring-reference:
    // vector< event elements > holding event elements holding this (via _pParent)
    _events.clear();
}

//##################################################################################################

// bulletinboard
//__________________________________________________________________________________________________
Reference< xml::input::XElement > BulletinBoardElement::startChildElement(

	{
		return new ProgressBarElement( rLocalName, xAttributes, this, _pImport );
	}
    // table
    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("table") ))
    {
        return new GridControlElement( rLocalName, xAttributes, this, _pImport );
    }
	// bulletinboard
	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
	{

Lines 209-214 Link Here

(-)xmlscript/source/xmldlg_imexp/exp_share.hxx (+2 lines)
209	SAL_THROW( (css::uno::Exception) );	209	SAL_THROW( (css::uno::Exception) );
210	void readFixedHyperLinkModel( StyleBag * all_styles )	210	void readFixedHyperLinkModel( StyleBag * all_styles )
211	SAL_THROW( (css::uno::Exception) );	211	SAL_THROW( (css::uno::Exception) );
		212	void readGridControlModel( StyleBag * all_styles )
		213	SAL_THROW( (css::uno::Exception) );
212	};	214	};
213		215
214	template<typename T>	216	template<typename T>




    readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readGridControlModel( StyleBag * all_styles )
    SAL_THROW( (Exception) )
{
    // collect styles
    Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
        aStyle._set |= 0x1;
    if (readBorderProps( this, aStyle ))
        aStyle._set |= 0x4;
    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
        aStyle._set |= 0x2;
    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
        aStyle._set |= 0x20;
    if (readFontProps( this, aStyle ))
        aStyle._set |= 0x8;
    if (aStyle._set)
    {
        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
                      all_styles->getStyleId( aStyle ) );
    }
    
    // collect elements
    readDefaults();
    
    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
    readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
                           OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
    readSelectionTypeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectionModel") ),
                           OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":selectiontype") ) );
    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowColumnHeader") ), 
                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":showcolumnheader") ) );
    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowRowHeader") ), 
                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":showrowheader") ) );
    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("GridLineColor") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":gridline-color") ) );
    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("UseGridLines") ),
                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":usegridlines") ) );
    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBackgroundColor") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":headerbackground-color") ) );
    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextColor") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":headertext-color") ) );
    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionBackgroundColor") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":activeselectionbackground-color") ) );
    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionTextColor") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":activeselectiontext-color") ) );
    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionBackgroundColor") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":inactiveselectionbackground-color") ) );
    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionTextColor") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":inactiveselectiontext-color") ) );
    readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readDialogModel( StyleBag * all_styles )
    SAL_THROW( (Exception) )
{

Lines 1537-1542 Link Here

(-)xmlscript/source/xmldlg_imexp/xmldlg_export.cxx (+8 lines)
1537	xElem = static_cast< xml::sax::XAttributeList * >( pElem );	1537	xElem = static_cast< xml::sax::XAttributeList * >( pElem );
1538	pElem->readProgressBarModel( &all_styles );	1538	pElem->readProgressBarModel( &all_styles );
1539	}	1539	}
		1540	else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.UnoControlGridModel") ) ) )
		1541	{
		1542	pElem = new ElementDescriptor(
		1543	xProps, xPropState,
		1544	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":table") ) );
		1545	xElem = static_cast< xml::sax::XAttributeList * >( pElem );
		1546	pElem->readGridControlModel( &all_styles );
		1547	}
1540	//	1548	//
1541		1549
1542	OSL_ASSERT( xElem.is() );	1550	OSL_ASSERT( xElem.is() );

Return to issue 120066

Lines 15132-15134 Link Here

(-)svx/sdi/svx.sdi (+29 lines)
15132	GroupId = GID_EXPLORER;	15132	GroupId = GID_EXPLORER;
15133	]	15133	]
15134		15134
		15135	//--------------------------------------------------------------------------
		15136
		15137	SfxBoolItem InsertGridControl SID_INSERT_GRIDCONTROL
		15138
		15139	[
		15140	/* flags: */
		15141	AutoUpdate = TRUE,
		15142	Cachable = Cachable,
		15143	FastCall = FALSE,
		15144	HasCoreId = FALSE,
		15145	HasDialog = FALSE,
		15146	ReadOnlyDoc = FALSE,
		15147	Toggle = FALSE,
		15148	Container = FALSE,
		15149	RecordAbsolute = FALSE,
		15150	RecordPerSet;
		15151	Synchron;
		15152
		15153	Readonly = FALSE,
		15154
		15155	/* config: */
		15156	AccelConfig = TRUE,
		15157	MenuConfig = TRUE,
		15158	StatusBarConfig = FALSE,
		15159	ToolBoxConfig = TRUE,
		15160	GroupId = GID_CONTROLS;
		15161	]
		15162
		15163	//--------------------------------------------------------------------------

Lines 274-279 Link Here

(-)extensions/source/propctrlr/formstrings.hxx (+12 lines)
274	PCR_CONSTASCII_STRING( PROPERTY_TEXTTYPE, "TextType");	274	PCR_CONSTASCII_STRING( PROPERTY_TEXTTYPE, "TextType");
275	PCR_CONSTASCII_STRING( PROPERTY_RICHTEXT, "RichText");	275	PCR_CONSTASCII_STRING( PROPERTY_RICHTEXT, "RichText");
276	PCR_CONSTASCII_STRING( PROPERTY_ROWSET, "RowSet");	276	PCR_CONSTASCII_STRING( PROPERTY_ROWSET, "RowSet");
		277
		278	PCR_CONSTASCII_STRING( PROPERTY_SELECTIONMODEL, "SelectionModel");
		279	PCR_CONSTASCII_STRING( PROPERTY_USEGRIDLINE, "UseGridLines");
		280	PCR_CONSTASCII_STRING( PROPERTY_GRIDLINECOLOR, "GridLineColor");
		281	PCR_CONSTASCII_STRING( PROPERTY_SHOWCOLUMNHEADER, "ShowColumnHeader");
		282	PCR_CONSTASCII_STRING( PROPERTY_SHOWROWHEADER, "ShowRowHeader");
		283	PCR_CONSTASCII_STRING( PROPERTY_HEADERBACKGROUNDCOLOR, "HeaderBackgroundColor");
		284	PCR_CONSTASCII_STRING( PROPERTY_HEADERTEXTCOLOR, "HeaderTextColor");
		285	PCR_CONSTASCII_STRING( PROPERTY_ACTIVESELECTIONBACKGROUNDCOLOR, "ActiveSelectionBackgroundColor");
		286	PCR_CONSTASCII_STRING( PROPERTY_ACTIVESELECTIONTEXTCOLOR, "ActiveSelectionTextColor");
		287	PCR_CONSTASCII_STRING( PROPERTY_INACTIVESELECTIONBACKGROUNDCOLOR, "InactiveSelectionBackgroundColor");
		288	PCR_CONSTASCII_STRING( PROPERTY_INACTIVESELECTIONTEXTCOLOR, "InactiveSelectionTextColor");
277		289
278	// services	290	// services
279	PCR_CONSTASCII_STRING( SERVICE_COMPONENT_GROUPBOX, "com.sun.star.form.component.GroupBox" );	291	PCR_CONSTASCII_STRING( SERVICE_COMPONENT_GROUPBOX, "com.sun.star.form.component.GroupBox" );

Lines 278-285 Link Here

(-)extensions/source/propctrlr/formresid.hrc (-1 / +11 lines)
278	#define RID_STR_FONTSTYLE_ITALIC ( RID_FORMBROWSER_START + 253 )	278	#define RID_STR_FONTSTYLE_ITALIC ( RID_FORMBROWSER_START + 253 )
279	#define RID_STR_FONTSTYLE_BOLD ( RID_FORMBROWSER_START + 254 )	279	#define RID_STR_FONTSTYLE_BOLD ( RID_FORMBROWSER_START + 254 )
280	#define RID_STR_FONT_DEFAULT ( RID_FORMBROWSER_START + 255 )	280	#define RID_STR_FONT_DEFAULT ( RID_FORMBROWSER_START + 255 )
		281	#define RID_STR_SELECTIONMODEL ( RID_FORMBROWSER_START + 256 )
		282	#define RID_STR_USEGRIDLINE ( RID_FORMBROWSER_START + 257 )
		283	#define RID_STR_GRIDLINECOLOR ( RID_FORMBROWSER_START + 258 )
		284	#define RID_STR_SHOWCOLUMNHEADER ( RID_FORMBROWSER_START + 259 )
		285	#define RID_STR_SHOWROWHEADER ( RID_FORMBROWSER_START + 260 )
		286	#define RID_STR_HEADERBACKGROUNDCOLOR ( RID_FORMBROWSER_START + 261 )
		287	#define RID_STR_HEADERTEXTCOLOR ( RID_FORMBROWSER_START + 262 )
		288	#define RID_STR_ACTIVESELECTIONBACKGROUNDCOLOR ( RID_FORMBROWSER_START + 263 )
		289	#define RID_STR_ACTIVESELECTIONTEXTCOLOR ( RID_FORMBROWSER_START + 264 )
		290	#define RID_STR_INACTIVESELECTIONBACKGROUNDCOLOR ( RID_FORMBROWSER_START + 265 )
		291	#define RID_STR_INACTIVESELECTIONTEXTCOLOR ( RID_FORMBROWSER_START + 266 )
281		292
282
283	// -----------------------------------------------------------------------	293	// -----------------------------------------------------------------------
284	// - message strings	294	// - message strings
285		295

Lines 324-327 Link Here

(-)extensions/inc/propctrlr.hrc (+12 lines)
324	#define HID_FM_PROPDLG_TAB_DATA "EXTENSIONS_HID_FM_PROPDLG_TAB_DATA"	324	#define HID_FM_PROPDLG_TAB_DATA "EXTENSIONS_HID_FM_PROPDLG_TAB_DATA"
325	#define HID_FM_PROPDLG_TAB_EVT "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT"	325	#define HID_FM_PROPDLG_TAB_EVT "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT"
326		326
		327	#define HID_PROP_SELECTIONMODEL "EXTENSIONS_HID_PROP_SELECTIONMODEL"
		328	#define HID_PROP_USEGRIDLINE "EXTENSIONS_HID_PROP_USEGRIDLINE"
		329	#define HID_PROP_GRIDLINECOLOR "EXTENSIONS_HID_PROP_GRIDLINECOLOR"
		330	#define HID_PROP_SHOWCOLUMNHEADER "EXTENSIONS_HID_PROP_SHOWCOLUMNHEADER"
		331	#define HID_PROP_SHOWROWHEADER "EXTENSIONS_HID_PROP_SHOWROWHEADER"
		332	#define HID_PROP_HEADERBACKGROUNDCOLOR "EXTENSIONS_HID_PROP_HEADERBACKGROUNDCOLOR"
		333	#define HID_PROP_HEADERTEXTCOLOR "EXTENSIONS_HID_PROP_HEADERTEXTCOLOR"
		334	#define HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR "EXTENSIONS_HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR"
		335	#define HID_PROP_ACTIVESELECTIONTEXTCOLOR "EXTENSIONS_HID_PROP_ACTIVESELECTIONTEXTCOLOR"
		336	#define HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR "EXTENSIONS_HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR"
		337	#define HID_PROP_INACTIVESELECTIONTEXTCOLOR "EXTENSIONS_HID_PROP_INACTIVESELECTIONTEXTCOLOR"
		338
327	#endif // EXTENSIONS_PROPCTRLR_HRC	339	#endif // EXTENSIONS_PROPCTRLR_HRC

Lines 1013-1016 Link Here

(-)xmlscript/source/xmldlg_imexp/imp_share.hxx (+22 lines)
1013	{}	1013	{}
1014	};	1014	};
1015		1015
		1016	//==============================================================================
		1017	class GridControlElement
		1018	: public ControlElement
		1019	{
		1020	public:
		1021	virtual css::uno::Reference< css::xml::input::XElement >
		1022	SAL_CALL startChildElement(
		1023	sal_Int32 nUid, ::rtl::OUString const & rLocalName,
		1024	css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
		1025	throw (css::xml::sax::SAXException, css::uno::RuntimeException);
		1026	virtual void SAL_CALL endElement()
		1027	throw (css::xml::sax::SAXException, css::uno::RuntimeException);
		1028
		1029	inline GridControlElement(
		1030	::rtl::OUString const & rLocalName,
		1031	css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
		1032	ElementBase * pParent, DialogImport * pImport )
		1033	SAL_THROW( () )
		1034	: ControlElement( rLocalName, xAttributes, pParent, pImport )
		1035	{}
		1036	};
		1037
1016	}	1038	}

Lines 64-70 Link Here

(-)xmlscript/dtd/dialog.dtd (-1 / +19 lines)
64	dlg:formattedfield\|	64	dlg:formattedfield\|
65	dlg:fixedline\|	65	dlg:fixedline\|
66	dlg:progressmeter\|	66	dlg:progressmeter\|
67	dlg:scrollbar	67	dlg:scrollbar\|
		68	dlg:table
68	)">	69	)">
69		70
70	<!ELEMENT dlg:window (dlg:styles, (%event;), dlg:bulletinboard*)>	71	<!ELEMENT dlg:window (dlg:styles, (%event;), dlg:bulletinboard*)>
Lines 399-401 Link Here
399	dlg:value-min %numeric; #IMPLIED	400	dlg:value-min %numeric; #IMPLIED
400	dlg:value-max %numeric; #IMPLIED	401	dlg:value-max %numeric; #IMPLIED
401	>	402	>
		403
		404	<!ELEMENT dlg:table ((%event;)*)>
		405	<!ATTLIST dlg:table %default-attributes;
		406	dlg:showcolumnheader %boolean; #IMPLIED
		407	dlg:showrowheader %boolean; #IMPLIED
		408	dlg:gridline-color %numeric; #IMPLIED
		409	dlg:usegridlines %boolean; #IMPLIED
		410	dlg:headerbackground-color %numeric; #IMPLIED
		411	dlg:headertext-color %numeric; #IMPLIED
		412	dlg:activeselectionbackground-color %numeric; #IMPLIED
		413	dlg:activeselectiontext-color %numeric; #IMPLIED
		414	dlg:inactiveselectionbackground-color %numeric; #IMPLIED
		415	dlg:inactiveselectiontext-color %numeric; #IMPLIED
		416	dlg:selectiontype CDATA #IMPLIED
		417	dlg:valign (top\|center\|bottom) #IMPLIED
		418	dlg:tabstop %boolean; #IMPLIED
		419	>

Lines 337-342 Link Here

(-)extensions/source/propctrlr/formmetadata.hxx (+11 lines)
337	#define PROPERTY_ID_WHEEL_BEHAVIOR 200	337	#define PROPERTY_ID_WHEEL_BEHAVIOR 200
338	#define PROPERTY_ID_TEXT_ANCHOR_TYPE 201	338	#define PROPERTY_ID_TEXT_ANCHOR_TYPE 201
339	#define PROPERTY_ID_SHEET_ANCHOR_TYPE 202	339	#define PROPERTY_ID_SHEET_ANCHOR_TYPE 202
		340	#define PROPERTY_ID_SELECTIONMODEL 203
		341	#define PROPERTY_ID_USEGRIDLINE 204
		342	#define PROPERTY_ID_GRIDLINECOLOR 205
		343	#define PROPERTY_ID_SHOWCOLUMNHEADER 206
		344	#define PROPERTY_ID_SHOWROWHEADER 207
		345	#define PROPERTY_ID_HEADERBACKGROUNDCOLOR 208
		346	#define PROPERTY_ID_HEADERTEXTCOLOR 209
		347	#define PROPERTY_ID_ACTIVESELECTIONBACKGROUNDCOLOR 210
		348	#define PROPERTY_ID_ACTIVESELECTIONTEXTCOLOR 211
		349	#define PROPERTY_ID_INACTIVESELECTIONBACKGROUNDCOLOR 212
		350	#define PROPERTY_ID_INACTIVESELECTIONTEXTCOLOR 213
340		351
341	//............................................................................	352	//............................................................................
342	} // namespace pcr	353	} // namespace pcr

Lines 354-360 Link Here

(-)extensions/source/propctrlr/formmetadata.cxx (-1 / +13 lines)
354	DEF_INFO_2( EDITABLE, EDITABLE, EDITABLE, DIALOG_VISIBLE, COMPOSEABLE ),	354	DEF_INFO_2( EDITABLE, EDITABLE, EDITABLE, DIALOG_VISIBLE, COMPOSEABLE ),
355	DEF_INFO_2( INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, DIALOG_VISIBLE, COMPOSEABLE ),	355	DEF_INFO_2( INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, DIALOG_VISIBLE, COMPOSEABLE ),
356	DEF_INFO_2( DECORATION, DECORATION, DECORATION, DIALOG_VISIBLE, COMPOSEABLE ),	356	DEF_INFO_2( DECORATION, DECORATION, DECORATION, DIALOG_VISIBLE, COMPOSEABLE ),
357	DEF_INFO_2( NOLABEL, NOLABEL, NOLABEL, DIALOG_VISIBLE, COMPOSEABLE )	357	DEF_INFO_2( NOLABEL, NOLABEL, NOLABEL, DIALOG_VISIBLE, COMPOSEABLE ),
		358	DEF_INFO_3( SELECTIONMODEL, SELECTIONMODEL, SELECTIONMODEL, DIALOG_VISIBLE, ENUM, COMPOSEABLE ),
		359	DEF_INFO_2( USEGRIDLINE, USEGRIDLINE, USEGRIDLINE, DIALOG_VISIBLE, COMPOSEABLE ),
		360	DEF_INFO_2( GRIDLINECOLOR, GRIDLINECOLOR, GRIDLINECOLOR, DIALOG_VISIBLE, COMPOSEABLE ),
		361	DEF_INFO_2( SHOWCOLUMNHEADER, SHOWCOLUMNHEADER, SHOWCOLUMNHEADER, DIALOG_VISIBLE, COMPOSEABLE ),
		362	DEF_INFO_2( SHOWROWHEADER, SHOWROWHEADER, SHOWROWHEADER, DIALOG_VISIBLE, COMPOSEABLE ),
		363	DEF_INFO_2( HEADERBACKGROUNDCOLOR, HEADERBACKGROUNDCOLOR, HEADERBACKGROUNDCOLOR, DIALOG_VISIBLE, COMPOSEABLE ),
		364	DEF_INFO_2( HEADERTEXTCOLOR, HEADERTEXTCOLOR, HEADERTEXTCOLOR, DIALOG_VISIBLE, COMPOSEABLE ),
		365	DEF_INFO_2( ACTIVESELECTIONBACKGROUNDCOLOR, ACTIVESELECTIONBACKGROUNDCOLOR, ACTIVESELECTIONBACKGROUNDCOLOR, DIALOG_VISIBLE, COMPOSEABLE ),
		366	DEF_INFO_2( ACTIVESELECTIONTEXTCOLOR, ACTIVESELECTIONTEXTCOLOR, ACTIVESELECTIONTEXTCOLOR, DIALOG_VISIBLE, COMPOSEABLE ),
		367	DEF_INFO_2( INACTIVESELECTIONBACKGROUNDCOLOR, INACTIVESELECTIONBACKGROUNDCOLOR, INACTIVESELECTIONBACKGROUNDCOLOR, DIALOG_VISIBLE, COMPOSEABLE ),
		368	DEF_INFO_2( INACTIVESELECTIONTEXTCOLOR, INACTIVESELECTIONTEXTCOLOR, INACTIVESELECTIONTEXTCOLOR, DIALOG_VISIBLE, COMPOSEABLE )
358	};	369	};
359		370
360	s_pPropertyInfos = aPropertyInfos;	371	s_pPropertyInfos = aPropertyInfos;
Lines 498-503 Link Here
498	nStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING;	509	nStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING;
499	break;	510	break;
500	case PROPERTY_ID_SELECTION_TYPE:	511	case PROPERTY_ID_SELECTION_TYPE:
		512	case PROPERTY_ID_SELECTIONMODEL:
501	nStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE;	513	nStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE;
502	break;	514	break;
503	case PROPERTY_ID_SCALE_MODE:	515	case PROPERTY_ID_SCALE_MODE:

Lines 455-461 Link Here

(-)extensions/source/propctrlr/formres.src (+45 lines)
455	{	455	{
456	Text [ en-US ] = "Frame" ;	456	Text [ en-US ] = "Frame" ;
457	};	457	};
		458	String RID_STR_SELECTIONMODEL
		459	{
		460	Text [ en-US ] = "Selection type";
		461	};
		462	String RID_STR_USEGRIDLINE
		463	{
		464	Text [ en-US ] = "Use grid line";
		465	};
		466	String RID_STR_GRIDLINECOLOR
		467	{
		468	Text [ en-US ] = "Grid line color";
		469	};
		470	String RID_STR_SHOWCOLUMNHEADER
		471	{
		472	Text [ en-US ] = "Show column header";
		473	};
		474	String RID_STR_SHOWROWHEADER
		475	{
		476	Text [ en-US ] = "Show row header";
		477	};
		478	String RID_STR_HEADERBACKGROUNDCOLOR
		479	{
		480	Text [ en-US ] = "Header background color";
		481	};
		482	String RID_STR_HEADERTEXTCOLOR
		483	{
		484	Text [ en-US ] = "Header text color";
		485	};
		486	String RID_STR_ACTIVESELECTIONBACKGROUNDCOLOR
		487	{
		488	Text [ en-US ] = "Active selection background color";
		489	};
		490	String RID_STR_ACTIVESELECTIONTEXTCOLOR
		491	{
		492	Text [ en-US ] = "Active selection text color";
		493	};
		494	String RID_STR_INACTIVESELECTIONBACKGROUNDCOLOR
		495	{
		496	Text [ en-US ] = "Inactive selection background color";
		497	};
		498	String RID_STR_INACTIVESELECTIONTEXTCOLOR
		499	{
		500	Text [ en-US ] = "Inactive selection text color";
		501	};
458		502
		503
459	Resource RID_RSC_ENUM_BORDER_TYPE	504	Resource RID_RSC_ENUM_BORDER_TYPE
460	{	505	{
461	String 1	506	String 1

Lines 421-423 Link Here

(-)extensions/util/hidother.src (+12 lines)
421	hidspecial HID_FM_PROPDLG_TAB_GENERAL { HelpId = HID_FM_PROPDLG_TAB_GENERAL; }	421	hidspecial HID_FM_PROPDLG_TAB_GENERAL { HelpId = HID_FM_PROPDLG_TAB_GENERAL; }
422	hidspecial HID_FM_PROPDLG_TAB_DATA { HelpId = HID_FM_PROPDLG_TAB_DATA; }	422	hidspecial HID_FM_PROPDLG_TAB_DATA { HelpId = HID_FM_PROPDLG_TAB_DATA; }
423	hidspecial HID_FM_PROPDLG_TAB_EVT { HelpId = HID_FM_PROPDLG_TAB_EVT; }	423	hidspecial HID_FM_PROPDLG_TAB_EVT { HelpId = HID_FM_PROPDLG_TAB_EVT; }
		424	hidspecial HID_PROP_SELECTIONMODEL { HelpId = HID_PROP_SELECTIONMODEL; }
		425	hidspecial HID_PROP_USEGRIDLINE { HelpId = HID_PROP_USEGRIDLINE; }
		426	hidspecial HID_PROP_GRIDLINECOLOR { HelpId = HID_PROP_GRIDLINECOLOR; }
		427	hidspecial HID_PROP_SHOWCOLUMNHEADER { HelpId = HID_PROP_SHOWCOLUMNHEADER; }
		428	hidspecial HID_PROP_SHOWROWHEADER { HelpId = HID_PROP_SHOWROWHEADER; }
		429	hidspecial HID_PROP_HEADERBACKGROUNDCOLOR { HelpId = HID_PROPS_HEADERBACKGROUNDCOLOR; }
		430	hidspecial HID_PROP_HEADERTEXTCOLOR { HelpId = HEADERTEXTCOLOR; }
		431	hidspecial HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR { HelpId = ACTIVESELECTIONBACKGROUNDCOLOR; }
		432	hidspecial HID_PROP_ACTIVESELECTIONTEXTCOLOR { HelpId = ACTIVESELECTIONTEXTCOLOR; }
		433	hidspecial HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR { HelpId = INACTIVESELECTIONBACKGROUNDCOLOR; }
		434	hidspecial HID_PROP_INACTIVESELECTIONTEXTCOLOR { HelpId = INACTIVESELECTIONTEXTCOLOR; }
		435

Lines 434-438 Link Here

(-)helpcontent2/source/text/sbasic/shared/02/20000000.xhp (+13 lines)
434	<paragraph role="paragraph" id="par_id9961851" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a tree control that can show a hierarchical list. You can populate the list by your program, using API calls (XtreeControl).</ahelp></paragraph>	434	<paragraph role="paragraph" id="par_id9961851" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a tree control that can show a hierarchical list. You can populate the list by your program, using API calls (XtreeControl).</ahelp></paragraph>
435	</tablecell>	435	</tablecell>
436	</tablerow>	436	</tablerow>
		437	</table>
		438	<bookmark xml-lang="en-US" branch="hid/.uno:InsertGridControl" id="bm_id1552784" localize="false"/><paragraph role="heading" id="hd_id11904" xml-lang="en-US" level="2" l10n="NEW">Table Control</paragraph>
		439	<table id="">
		440	<tablerow>
		441	<tablecell colspan="" rowspan="">
		442	<paragraph role="paragraph" id="par_id7511524" xml-lang="en-US" l10n="NEW">
		443	<image id="Graphic2" src="res/commandimagelist/sc_insertgridcontrol.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">Table control icon</alt>
		444	</image></paragraph>
		445	</tablecell>
		446	<tablecell colspan="" rowspan="">
		447	<paragraph role="paragraph" id="par_id9961854" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a table control that can show a table data. You can populate the data by your program, using API calls.</ahelp></paragraph>
		448	</tablecell>
		449	</tablerow>
437	</table></body>	450	</table></body>
438	</helpdocument>	451	</helpdocument>

Lines 1980-1985 Link Here

(-)xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx (+94 lines)
1980		1980
1981	//##################################################################################################	1981	//##################################################################################################
1982		1982
		1983	// table
		1984	//__________________________________________________________________________________________________
		1985	Reference< xml::input::XElement > GridControlElement::startChildElement(
		1986	sal_Int32 nUid, OUString const & rLocalName,
		1987	Reference< xml::input::XAttributes > const & xAttributes )
		1988	throw (xml::sax::SAXException, RuntimeException)
		1989	{
		1990	// event
		1991	if (_pImport->isEventElement( nUid, rLocalName ))
		1992	{
		1993	return new EventElement( nUid, rLocalName, xAttributes, this, _pImport );
		1994	}
		1995	else
		1996	{
		1997	throw xml::sax::SAXException(
		1998	OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
		1999	Reference< XInterface >(), Any() );
		2000	}
		2001	}
		2002
		2003	//__________________________________________________________________________________________________
		2004	void GridControlElement::endElement()
		2005	throw (xml::sax::SAXException, RuntimeException)
		2006	{
		2007	ControlImportContext ctx(
		2008	_pImport, getControlId( _xAttributes ),
		2009	OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.UnoControlGridModel") ) );
		2010
		2011	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
		2012	if (xStyle.is())
		2013	{
		2014	StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
		2015	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
		2016	pStyle->importBackgroundColorStyle( xControlModel );
		2017	pStyle->importBorderStyle( xControlModel );
		2018	pStyle->importTextColorStyle( xControlModel );
		2019	pStyle->importTextLineColorStyle( xControlModel );
		2020	pStyle->importFontStyle( xControlModel );
		2021	}
		2022
		2023	ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
		2024	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
		2025	OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
		2026	_xAttributes );
		2027	ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
		2028	OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ),
		2029	_xAttributes );
		2030	ctx.importSelectionTypeProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectionModel") ),
		2031	OUString( RTL_CONSTASCII_USTRINGPARAM("selectiontype") ),
		2032	_xAttributes );
		2033	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowColumnHeader") ),
		2034	OUString( RTL_CONSTASCII_USTRINGPARAM("showcolumnheader") ),
		2035	_xAttributes );
		2036	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowRowHeader") ),
		2037	OUString( RTL_CONSTASCII_USTRINGPARAM("showrowheader") ),
		2038	_xAttributes );
		2039	ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GridLineColor") ),
		2040	OUString( RTL_CONSTASCII_USTRINGPARAM("gridline-color") ),
		2041	_xAttributes );
		2042	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("UseGridLines") ),
		2043	OUString( RTL_CONSTASCII_USTRINGPARAM("usegridlines") ),
		2044	_xAttributes );
		2045	ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBackgroundColor") ),
		2046	OUString( RTL_CONSTASCII_USTRINGPARAM("headerbackground-color") ),
2047	_xAttributes );
2048	ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextColor") ),
2049	OUString( RTL_CONSTASCII_USTRINGPARAM("headertext-color") ),
2050	_xAttributes );
2051	ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionBackgroundColor") ),
2052	OUString( RTL_CONSTASCII_USTRINGPARAM("activeselectionbackground-color") ),
2053	_xAttributes );
2054	ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionTextColor") ),
2055	OUString( RTL_CONSTASCII_USTRINGPARAM("activeselectiontext-color") ),
2056	_xAttributes );
2057	ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionBackgroundColor") ),
2058	OUString( RTL_CONSTASCII_USTRINGPARAM("inactiveselectionbackground-color") ),
2059	_xAttributes );
2060	ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionTextColor") ),
2061	OUString( RTL_CONSTASCII_USTRINGPARAM("inactiveselectiontext-color") ),
2062	_xAttributes );
2063
2064	ctx.importEvents( _events );
2065	// avoid ring-reference:
2066	// vector< event elements > holding event elements holding this (via _pParent)
2067	_events.clear();
2068	}
2069
2070	//##################################################################################################
2071
1983	// bulletinboard	2072	// bulletinboard
1984	//__________________________________________________________________________________________________	2073	//__________________________________________________________________________________________________
1985	Reference< xml::input::XElement > BulletinBoardElement::startChildElement(	2074	Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
Lines 2097-2102 Link Here
2097	{	2186	{
2098	return new ProgressBarElement( rLocalName, xAttributes, this, _pImport );	2187	return new ProgressBarElement( rLocalName, xAttributes, this, _pImport );
2099	}	2188	}
		2189	// table
		2190	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("table") ))
		2191	{
		2192	return new GridControlElement( rLocalName, xAttributes, this, _pImport );
		2193	}
2100	// bulletinboard	2194	// bulletinboard
2101	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))	2195	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
2102	{	2196	{

Lines 1110-1115 Link Here

(-)xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx (+53 lines)
1110	readEvents();	1110	readEvents();
1111	}	1111	}
1112	//__________________________________________________________________________________________________	1112	//__________________________________________________________________________________________________
		1113	void ElementDescriptor::readGridControlModel( StyleBag * all_styles )
		1114	SAL_THROW( (Exception) )
		1115	{
		1116	// collect styles
		1117	Style aStyle( 0x1 \| 0x2 \| 0x4 \| 0x8 \| 0x20 );
		1118	if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
		1119	aStyle._set \|= 0x1;
		1120	if (readBorderProps( this, aStyle ))
		1121	aStyle._set \|= 0x4;
		1122	if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
		1123	aStyle._set \|= 0x2;
		1124	if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
		1125	aStyle._set \|= 0x20;
		1126	if (readFontProps( this, aStyle ))
		1127	aStyle._set \|= 0x8;
		1128	if (aStyle._set)
		1129	{
		1130	addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
		1131	all_styles->getStyleId( aStyle ) );
		1132	}
		1133
		1134	// collect elements
		1135	readDefaults();
		1136
		1137	readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
		1138	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
		1139	readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
		1140	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
		1141	readSelectionTypeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectionModel") ),
		1142	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":selectiontype") ) );
		1143	readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowColumnHeader") ),
		1144	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":showcolumnheader") ) );
		1145	readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowRowHeader") ),
		1146	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":showrowheader") ) );
		1147	readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("GridLineColor") ),
		1148	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":gridline-color") ) );
		1149	readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("UseGridLines") ),
		1150	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":usegridlines") ) );
		1151	readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBackgroundColor") ),
		1152	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":headerbackground-color") ) );
		1153	readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextColor") ),
		1154	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":headertext-color") ) );
		1155	readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionBackgroundColor") ),
		1156	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":activeselectionbackground-color") ) );
		1157	readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveSelectionTextColor") ),
		1158	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":activeselectiontext-color") ) );
		1159	readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionBackgroundColor") ),
		1160	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":inactiveselectionbackground-color") ) );
		1161	readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("InactiveSelectionTextColor") ),
		1162	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":inactiveselectiontext-color") ) );
		1163	readEvents();
		1164	}
		1165	//__________________________________________________________________________________________________
1113	void ElementDescriptor::readDialogModel( StyleBag * all_styles )	1166	void ElementDescriptor::readDialogModel( StyleBag * all_styles )
1114	SAL_THROW( (Exception) )	1167	SAL_THROW( (Exception) )
1115	{	1168	{