Attachment #77941 for issue #119731

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

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_HYPERLINKCONTROL (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 154-159 Link Here

(-)svx/inc/svx/svxcommands.h (+1 lines)
154	#define CMD_SID_FM_FILECONTROL ".uno:FileControl"	154	#define CMD_SID_FM_FILECONTROL ".uno:FileControl"
155	#define CMD_SID_INSERT_FILECONTROL ".uno:InsertFileControl"	155	#define CMD_SID_INSERT_FILECONTROL ".uno:InsertFileControl"
156	#define CMD_SID_INSERT_TREECONTROL ".uno:InsertTreeControl"	156	#define CMD_SID_INSERT_TREECONTROL ".uno:InsertTreeControl"
		157	#define CMD_SID_INSERT_HYPERLINKCONTROL ".uno:InsertHyperlinkControl"
157	#define CMD_SID_ATTR_FILL_BITMAP ".uno:FillBitmap"	158	#define CMD_SID_ATTR_FILL_BITMAP ".uno:FillBitmap"
158	#define CMD_SID_ATTR_FILL_COLOR ".uno:FillColor"	159	#define CMD_SID_ATTR_FILL_COLOR ".uno:FillColor"
159	#define CMD_SID_ATTR_FILL_GRADIENT ".uno:FillGradient"	160	#define CMD_SID_ATTR_FILL_GRADIENT ".uno:FillGradient"






//--------------------------------------------------------------------------
SfxBoolItem InsertHyperlinkControl SID_INSERT_HYPERLINKCONTROL

[
	/* 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;
]

//--------------------------------------------------------------------------
XFillBitmapItem FillBitmap SID_ATTR_FILL_BITMAP

[

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_HYPERLINKCONTROL
84	}	85	}
85	item SvxChooseControlEnum SvxChooseControlItem;	86	item SvxChooseControlEnum SvxChooseControlItem;
86		87

Lines 2556-2561 Link Here

(-)officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu (+8 lines)
2556	<value>1</value>	2556	<value>1</value>
2557	</prop>	2557	</prop>
2558	</node>	2558	</node>
		2559	<node oor:name=".uno:InsertHyperlinkControl" oor:op="replace">
		2560	<prop oor:name="Label" oor:type="xs:string">
		2561	<value xml:lang="en-US">Hyperlink Control</value>
		2562	</prop>
		2563	<prop oor:name="Properties" oor:type="xs:int">
		2564	<value>1</value>
		2565	</prop>
		2566	</node>
2559	<node oor:name=".uno:ShowPropBrowser" oor:op="replace">	2567	<node oor:name=".uno:ShowPropBrowser" oor:op="replace">
2560	<prop oor:name="Label" oor:type="xs:string">	2568	<prop oor:name="Label" oor:type="xs:string">
2561	<value xml:lang="en-US">Properties</value>	2569	<value xml:lang="en-US">Properties</value>

Lines 57-63 Link Here

(-)basctl/source/inc/dlgeddef.hxx (+2 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_HYPERLINKCONTROL ((sal_uInt16)25)
60		61
		62
61	// control properties	63	// control properties
62	#define DLGED_PROP_BACKGROUNDCOLOR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )	64	#define DLGED_PROP_BACKGROUNDCOLOR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )
63	#define DLGED_PROP_DROPDOWN ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Dropdown" ) )	65	#define DLGED_PROP_DROPDOWN ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Dropdown" ) )

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_HYPERLINKCONTROL ( 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 (-1 / +10 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.UnoControlFixedHyperlinkModel" ) )
		799	{
		800	nResId = RID_STR_CLASS_HYPERLINKCONTROL;
		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.UnoControlFixedHyperlinkModel" ))
		933	{
		934	return OBJ_DLG_HYPERLINKCONTROL;
		935	}
928	else	936	else
929	{	937	{
930	return OBJ_DLG_CONTROL;	938	return OBJ_DLG_CONTROL;
Lines 1085-1091 Link Here
1085	supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) \|\|	1093	supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) \|\|
1086	supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) \|\|	1094	supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) \|\|
1087	supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) \|\|	1095	supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) \|\|
1088	supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )	1096	supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) \|\|
		1097	supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ))
1089	{	1098	{
1090	xPSet->setPropertyValue( DLGED_PROP_LABEL, aUniqueName );	1099	xPSet->setPropertyValue( DLGED_PROP_LABEL, aUniqueName );
1091	}	1100	}

Lines 113-118 Link Here

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




	
	if( (pObjFactory->nInventor == DlgInventor) &&
		(pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) &&
		(pObjFactory->nIdentifier <= OBJ_DLG_HYPERLINKCONTROL)    )
	{
		switch( pObjFactory->nIdentifier )
		{

				 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact );
				 break;            
			case OBJ_DLG_TREECONTROL:
				 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );
				 pObjFactory->pNewObj = pNew;
				 /*
				 try
				 {
					uno::Reference< beans::XPropertySet >  xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
					if (xPSet.is())
					{
						// first create a data model for our tree control
						Reference< XComponentContext > xComponentContext;

						Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
						xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;

						// gets the service manager from the office
						Reference< XMultiComponentFactory > xMultiComponentFactoryServer( xComponentContext->getServiceManager() );

						
						// gets the TreeDataModel
						Reference< XMutableTreeDataModel > xTreeDataModel;

						xTreeDataModel = Reference< XMutableTreeDataModel >(
 						xMultiComponentFactoryServer->createInstanceWithContext( 
						OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ), xComponentContext ), UNO_QUERY_THROW );

						// now fill it with some sample data
						const OUString sRoot( RTL_CONSTASCII_USTRINGPARAM( "Root" ) );

						Reference< XMutableTreeNode > xNode( mxTreeDataModel->createNode( sRoot, false ), UNO_QUERY_THROW );
						xNode->setDataValue( sRoot );
						xNode->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
						xNode->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );

						const OUString sNode_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1" ) );

						Reference< XMutableTreeNode > xChildNode_1( mxTreeDataModel->createNode( sNode_1, true ), UNO_QUERY_THROW );
						xChildNode_1->setDataValue( sNode_1 );
						xChildNode_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
						xChildNode_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
						
						xNode->appendChild( xChildNode_1 );

						const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1_1" ) );

						Reference< XMutableTreeNode > xChildNode_1_1( mxTreeDataModel->createNode( sNode_1_1, false ), UNO_QUERY_THROW );
						xChildNode_1_1->setDataValue( sNode_1_1 );
						xChildNode_1_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
						xChildNode_1_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
						
						xChildNode_1->appendChild( xChildNode_1_1 );

						const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_2" ) );

						Reference< XMutableTreeNode > xChildNode_2( mxTreeDataModel->createNode( sNode_2, false ), UNO_QUERY_THROW );
						xChildNode_2->setDataValue( sNode_2 );
						xChildNode_2->setNodeGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM("private:graphicrepository/sw/imglst/nc20010.png") ) );
						xNode->appendChild( xChildNode_2 );
							
						xTreeDataModel->setRoot( xNode );
						
						
						const OUString sDataModel( RTL_CONSTASCII_USTRINGPARAM( "DataModel" ) );

						xPSet->setPropertyValue( sDataModel, xTreeDataModel );
					}
				 }
				 catch(...)
				 {
				 }*/
				 break;            
			case OBJ_DLG_HYPERLINKCONTROL:
				 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedHyperlinkModel"), xDialogSFact );
				 break;
		}
	}


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.UnoControlFixedHyperlinkModel" ) ) ) )
		492	{
		493	nResId = RID_STR_CLASS_HYPERLINKCONTROL;
		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_HYPERLINKCONTROL
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_HYPERLINKCONTROL: nTemp = SID_INSERT_HYPERLINKCONTROL; 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_HYPERLINKCONTROL: nObj = SVX_SNAP_HYPERLINKCONTROL; 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_HYPERLINKCONTROL:
		603	{
		604	GetEditor()->SetMode( DLGED_INSERT );
		605	GetEditor()->SetInsertObj( OBJ_DLG_HYPERLINKCONTROL );
		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:helpid="helpid:10942" toolbar:style="radio" />	62	<toolbar:toolbaritem xlink:href=".uno:InsertFileControl" toolbar:helpid="helpid:10942" 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:InsertHyperlinkControl" toolbar:style="radio" />
65	</toolbar:toolbar>	66	</toolbar:toolbar>




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

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

                   dlg:tabstop %boolean; #IMPLIED
                   >

<!ELEMENT dlg:linklabel ((%event;)*)>
<!ATTLIST dlg:linklabel %default-attributes;
                   dlg:value CDATA #IMPLIED
                   dlg:url CDATA #IMPLIED
                   dlg:align (left|center|right) #IMPLIED
                   dlg:valign (top|center|bottom) #IMPLIED
                   dlg:multiline %boolean; #IMPLIED
                   dlg:tabstop %boolean; #IMPLIED
                   >

<!ELEMENT dlg:textfield ((%event;)*)>
<!ATTLIST dlg:textfield %default-attributes;
                        dlg:tabstop %boolean; #IMPLIED

Lines 502-509 Link Here

(-)xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx (-2 / +2 lines)
502	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );	502	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
503	readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("URL") ),	503	readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("URL") ),
504	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":url") ) );	504	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":url") ) );
505	readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Description") ),	505	//readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Description") ),
506	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":description") ) );	506	// OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":description") ) );
507	readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),	507	readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
508	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );	508	OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
509	readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),	509	readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),

Lines 1124-1132 Link Here

(-)xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx (-3 / +4 lines)
1124	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("URL") ),	1124	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("URL") ),
1125	OUString( RTL_CONSTASCII_USTRINGPARAM("url") ),	1125	OUString( RTL_CONSTASCII_USTRINGPARAM("url") ),
1126	_xAttributes );	1126	_xAttributes );
1127	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Description") ),	1127	// no Description defined in IDL and not implemented by imple
1128	OUString( RTL_CONSTASCII_USTRINGPARAM("description") ),	1128	//ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Description") ),
1129	_xAttributes );	1129	// OUString( RTL_CONSTASCII_USTRINGPARAM("description") ),
		1130	// _xAttributes );
1130		1131
1131	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),	1132	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
1132	OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),	1133	OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),

Lines 323-327 Link Here

(-)extensions/inc/propctrlr.hrc (+1 lines)
323	#define HID_FM_PROPDLG_TAB_GENERAL "EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL"	323	#define HID_FM_PROPDLG_TAB_GENERAL "EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL"
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	#define HID_PROP_URL "EXTENSIONS_HID_PROP_URL"
326		327
327	#endif // EXTENSIONS_PROPCTRLR_HRC	328	#endif // EXTENSIONS_PROPCTRLR_HRC

Lines 334-339 Link Here

(-)extensions/util/hidother.src (+1 lines)
334	hidspecial HID_PROP_XSD_REQUIRED { HelpId = HID_PROP_XSD_REQUIRED; }	334	hidspecial HID_PROP_XSD_REQUIRED { HelpId = HID_PROP_XSD_REQUIRED; }
335	hidspecial HID_PROP_XSD_TOTAL_DIGITS { HelpId = HID_PROP_XSD_TOTAL_DIGITS; }	335	hidspecial HID_PROP_XSD_TOTAL_DIGITS { HelpId = HID_PROP_XSD_TOTAL_DIGITS; }
336	hidspecial HID_PROP_XSD_WHITESPACES { HelpId = HID_PROP_XSD_WHITESPACES; }	336	hidspecial HID_PROP_XSD_WHITESPACES { HelpId = HID_PROP_XSD_WHITESPACES; }
		337	hidspecial HID_PROP_URL { HelpId = HID_PROP_URL; }
337		338
338	hidspecial HID_SELECTION_TLB { HelpId = HID_SELECTION_TLB; }	339	hidspecial HID_SELECTION_TLB { HelpId = HID_SELECTION_TLB; }
339		340

Lines 337-342 Link Here

(-)extensions/source/propctrlr/formmetadata.hxx (+1 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_URL 203
340		341
341	//............................................................................	342	//............................................................................
342	} // namespace pcr	343	} // namespace pcr

Lines 1517-1519 Link Here

(-)extensions/source/propctrlr/formres.src (+5 lines)
1517	{	1517	{
1518	Text [ en-US ] = "(Default)";	1518	Text [ en-US ] = "(Default)";
1519	};	1519	};
		1520
		1521	String RID_STR_URL
		1522	{
		1523	Text [ en-US ] = "URL";
		1524	};

Lines 278-283 Link Here

(-)extensions/source/propctrlr/formresid.hrc (+1 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_URL ( RID_FORMBROWSER_START + 256 )
281		282
282		283
283	// -----------------------------------------------------------------------	284	// -----------------------------------------------------------------------

Lines 198-203 Link Here

(-)extensions/source/propctrlr/formstrings.hxx (+1 lines)
198	PCR_CONSTASCII_STRING( PROPERTY_LINEEND_FORMAT, "LineEndFormat");	198	PCR_CONSTASCII_STRING( PROPERTY_LINEEND_FORMAT, "LineEndFormat");
199	PCR_CONSTASCII_STRING( PROPERTY_DECORATION, "Decoration" );	199	PCR_CONSTASCII_STRING( PROPERTY_DECORATION, "Decoration" );
200	PCR_CONSTASCII_STRING( PROPERTY_NOLABEL, "NoLabel" );	200	PCR_CONSTASCII_STRING( PROPERTY_NOLABEL, "NoLabel" );
		201	PCR_CONSTASCII_STRING( PROPERTY_URL, "URL" );
201		202
202	PCR_CONSTASCII_STRING( PROPERTY_SELECTION_TYPE, "SelectionType");	203	PCR_CONSTASCII_STRING( PROPERTY_SELECTION_TYPE, "SelectionType");
203	PCR_CONSTASCII_STRING( PROPERTY_ROOT_DISPLAYED, "RootDisplayed");	204	PCR_CONSTASCII_STRING( PROPERTY_ROOT_DISPLAYED, "RootDisplayed");

Lines 354-360 Link Here

(-)extensions/source/propctrlr/formmetadata.cxx (-1 / +2 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_2( URL, URL, URL, DIALOG_VISIBLE, COMPOSEABLE )
358	};	359	};
359		360
360	s_pPropertyInfos = aPropertyInfos;	361	s_pPropertyInfos = aPropertyInfos;

Lines 1088-1093 Link Here

(-)extensions/source/propctrlr/formcomponenthandler.cxx (+1 lines)
1088	break;	1088	break;
1089		1089
1090	case PROPERTY_ID_LABEL:	1090	case PROPERTY_ID_LABEL:
		1091	case PROPERTY_ID_URL:
1091	nControlType = PropertyControlType::MultiLineTextField;	1092	nControlType = PropertyControlType::MultiLineTextField;
1092	break;	1093	break;
1093		1094

Lines 429-435 Link Here

(-)toolkit/source/controls/controlmodelcontainerbase.cxx (-1 / +2 lines)
429	static Sequence< ::rtl::OUString >* pNamesSeq = NULL;	429	static Sequence< ::rtl::OUString >* pNamesSeq = NULL;
430	if ( !pNamesSeq )	430	if ( !pNamesSeq )
431	{	431	{
432	pNamesSeq = new Sequence< ::rtl::OUString >( 24 );	432	pNamesSeq = new Sequence< ::rtl::OUString >( 25 );
433	::rtl::OUString* pNames = pNamesSeq->getArray();	433	::rtl::OUString* pNames = pNamesSeq->getArray();
434	pNames[0] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEditModel );	434	pNames[0] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEditModel );
435	pNames[1] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel );	435	pNames[1] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel );
Lines 455-460 Link Here
455	pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel );	455	pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel );
456	pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel );	456	pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel );
457	pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel );	457	pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel );
		458	pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlFixedHyperlinkModel );
458	}	459	}
459	return *pNamesSeq;	460	return *pNamesSeq;
460	}	461	}




<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:InsertHyperlinkControl" id="bm_id1552785" localize="false"/><paragraph role="heading" id="hd_id11905" xml-lang="en-US" level="2" l10n="NEW">Hyperlink Control</paragraph>
<table id="">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id7511525" xml-lang="en-US" l10n="NEW">
<image id="Graphic2" src="res/commandimagelist/sc_inserthyperlinkcontrol.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">Insert hyperlink control icon</alt>
	</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id9961856" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a hyperlink control that can open an address in web browser.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
</body>
</helpdocument>

Return to issue 119731

Lines 3590-3595 Link Here

(-)svx/sdi/svx.sdi (+27 lines)
3590		3590
3591		3591
3592	//--------------------------------------------------------------------------	3592	//--------------------------------------------------------------------------
		3593	SfxBoolItem InsertHyperlinkControl SID_INSERT_HYPERLINKCONTROL
		3594
		3595	[
		3596	/* flags: */
		3597	AutoUpdate = TRUE,
		3598	Cachable = Cachable,
		3599	FastCall = FALSE,
		3600	HasCoreId = FALSE,
		3601	HasDialog = FALSE,
		3602	ReadOnlyDoc = FALSE,
		3603	Toggle = FALSE,
		3604	Container = FALSE,
		3605	RecordAbsolute = FALSE,
		3606	RecordPerSet;
		3607	Synchron;
		3608
		3609	Readonly = FALSE,
		3610
		3611	/* config: */
		3612	AccelConfig = TRUE,
		3613	MenuConfig = TRUE,
		3614	StatusBarConfig = FALSE,
		3615	ToolBoxConfig = TRUE,
		3616	GroupId = GID_CONTROLS;
		3617	]
		3618
		3619	//--------------------------------------------------------------------------
3593	XFillBitmapItem FillBitmap SID_ATTR_FILL_BITMAP	3620	XFillBitmapItem FillBitmap SID_ATTR_FILL_BITMAP
3594		3621
3595	[	3622	[

Lines 70-76 Link Here

(-)basctl/source/dlged/dlgedfac.cxx (-70 / +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_HYPERLINKCONTROL) )
74	{	74	{
75	switch( pObjFactory->nIdentifier )	75	switch( pObjFactory->nIdentifier )
76	{	76	{
Lines 184-259 Link Here
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_TREECONTROL:
187	DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );	187	pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );
188	pObjFactory->pNewObj = pNew;
189	/*
190	try
191	{
192	uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
193	if (xPSet.is())
194	{
195	// first create a data model for our tree control
196	Reference< XComponentContext > xComponentContext;
197
198	Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
199	xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;
200
201	// gets the service manager from the office
202	Reference< XMultiComponentFactory > xMultiComponentFactoryServer( xComponentContext->getServiceManager() );
203
204
205	// gets the TreeDataModel
206	Reference< XMutableTreeDataModel > xTreeDataModel;
207
208	xTreeDataModel = Reference< XMutableTreeDataModel >(
209	xMultiComponentFactoryServer->createInstanceWithContext(
210	OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ), xComponentContext ), UNO_QUERY_THROW );
211
212	// now fill it with some sample data
213	const OUString sRoot( RTL_CONSTASCII_USTRINGPARAM( "Root" ) );
214
215	Reference< XMutableTreeNode > xNode( mxTreeDataModel->createNode( sRoot, false ), UNO_QUERY_THROW );
216	xNode->setDataValue( sRoot );
217	xNode->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
218	xNode->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
219
220	const OUString sNode_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1" ) );
221
222	Reference< XMutableTreeNode > xChildNode_1( mxTreeDataModel->createNode( sNode_1, true ), UNO_QUERY_THROW );
223	xChildNode_1->setDataValue( sNode_1 );
224	xChildNode_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
225	xChildNode_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
226
227	xNode->appendChild( xChildNode_1 );
228
229	const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1_1" ) );
230
231	Reference< XMutableTreeNode > xChildNode_1_1( mxTreeDataModel->createNode( sNode_1_1, false ), UNO_QUERY_THROW );
232	xChildNode_1_1->setDataValue( sNode_1_1 );
233	xChildNode_1_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
234	xChildNode_1_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
235
236	xChildNode_1->appendChild( xChildNode_1_1 );
237
238	const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_2" ) );
239
240	Reference< XMutableTreeNode > xChildNode_2( mxTreeDataModel->createNode( sNode_2, false ), UNO_QUERY_THROW );
241	xChildNode_2->setDataValue( sNode_2 );
242	xChildNode_2->setNodeGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM("private:graphicrepository/sw/imglst/nc20010.png") ) );
243	xNode->appendChild( xChildNode_2 );
244
245	xTreeDataModel->setRoot( xNode );
246
247
248	const OUString sDataModel( RTL_CONSTASCII_USTRINGPARAM( "DataModel" ) );
249
250	xPSet->setPropertyValue( sDataModel, xTreeDataModel );
251	}
252	}
253	catch(...)
254	{
255	}*/
256	break;	188	break;
		189	case OBJ_DLG_HYPERLINKCONTROL:
		190	pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedHyperlinkModel"), xDialogSFact );
		191	break;
257	}	192	}
258	}	193	}
259		194

Lines 64-70 Link Here

(-)xmlscript/dtd/dialog.dtd (-1 / +12 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:linklabel
68	)">	69	)">
69		70
70	<!ELEMENT dlg:window (dlg:styles, (%event;), dlg:bulletinboard*)>	71	<!ELEMENT dlg:window (dlg:styles, (%event;), dlg:bulletinboard*)>
Lines 227-232 Link Here
227	dlg:tabstop %boolean; #IMPLIED	228	dlg:tabstop %boolean; #IMPLIED
228	>	229	>
229		230
		231	<!ELEMENT dlg:linklabel ((%event;)*)>
		232	<!ATTLIST dlg:linklabel %default-attributes;
		233	dlg:value CDATA #IMPLIED
		234	dlg:url CDATA #IMPLIED
		235	dlg:align (left\|center\|right) #IMPLIED
		236	dlg:valign (top\|center\|bottom) #IMPLIED
		237	dlg:multiline %boolean; #IMPLIED
		238	dlg:tabstop %boolean; #IMPLIED
		239	>
		240
230	<!ELEMENT dlg:textfield ((%event;)*)>	241	<!ELEMENT dlg:textfield ((%event;)*)>
231	<!ATTLIST dlg:textfield %default-attributes;	242	<!ATTLIST dlg:textfield %default-attributes;
232	dlg:tabstop %boolean; #IMPLIED	243	dlg:tabstop %boolean; #IMPLIED

Lines 434-438 Link Here

(-)helpcontent2/source/text/sbasic/shared/02/20000000.xhp (-1 / +15 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></body>	437	</table>
		438	<bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlinkControl" id="bm_id1552785" localize="false"/><paragraph role="heading" id="hd_id11905" xml-lang="en-US" level="2" l10n="NEW">Hyperlink Control</paragraph>
		439	<table id="">
		440	<tablerow>
		441	<tablecell colspan="" rowspan="">
		442	<paragraph role="paragraph" id="par_id7511525" xml-lang="en-US" l10n="NEW">
		443	<image id="Graphic2" src="res/commandimagelist/sc_inserthyperlinkcontrol.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">Insert hyperlink control icon</alt>
		444	</image></paragraph>
		445	</tablecell>
		446	<tablecell colspan="" rowspan="">
		447	<paragraph role="paragraph" id="par_id9961856" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a hyperlink control that can open an address in web browser.</ahelp></paragraph>
		448	</tablecell>
		449	</tablerow>
		450	</table>
		451	</body>
438	</helpdocument>	452	</helpdocument>