diff options
author | Shubham Goyal <22shubh22@gmail.com> | 2019-03-09 06:10:58 +0530 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-03-11 15:51:16 +0100 |
commit | 4c4ccdf724dedebce23cc9abd7b74bee43f184d7 (patch) | |
tree | d21b1de3b1b6f125117d690627c50cc10d9941a6 /basctl | |
parent | 50d91e7294700ea38fc4933b0636a19d4684eede (diff) |
i#119731 Hyperlink Control on dialog Editor
Change-Id: I34132931eba103aec5f9622be9c3bf2dd4de237d
Reviewed-on: https://gerrit.libreoffice.org/69001
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/inc/strings.hxx | 1 | ||||
-rw-r--r-- | basctl/sdi/baside.sdi | 6 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/basides1.cxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 1 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedfac.cxx | 3 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 8 | ||||
-rw-r--r-- | basctl/source/dlged/propbrw.cxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/dlgeddef.hxx | 15 | ||||
-rw-r--r-- | basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml | 1 |
10 files changed, 37 insertions, 7 deletions
diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx index 506886afc3e3..fe12c7c0125b 100644 --- a/basctl/inc/strings.hxx +++ b/basctl/inc/strings.hxx @@ -36,6 +36,7 @@ #define RID_STR_CLASS_TREECONTROL "TreeControl" #define RID_STR_CLASS_GRIDCONTROL "GridControl" #define RID_STR_CLASS_SPINCONTROL "SpinButton" +#define RID_STR_CLASS_HYPERLINKCONTROL "HyperlinkControl" #endif diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi index 61ecb19cf6df..447e5ad6fd71 100644 --- a/basctl/sdi/baside.sdi +++ b/basctl/sdi/baside.sdi @@ -547,6 +547,12 @@ shell basctl_Shell StateMethod = GetState; ] + SID_INSERT_HYPERLINKCONTROL + [ + ExecMethod = ExecuteDialog; + StateMethod = GetState; + ] + SID_EXPORT_DIALOG [ ExecMethod = ExecuteDialog; diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 264bdc202116..ca885f3ca67e 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -357,6 +357,7 @@ void DialogWindow::GetState( SfxItemSet& rSet ) case SID_INSERT_FILECONTROL: case SID_INSERT_SPINBUTTON: case SID_INSERT_GRIDCONTROL: + case SID_INSERT_HYPERLINKCONTROL: case SID_INSERT_TREECONTROL: { if ( IsReadOnly() ) @@ -508,6 +509,9 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq ) case SID_INSERT_GRIDCONTROL: nInsertObj = OBJ_DLG_GRIDCONTROL; break; + case SID_INSERT_HYPERLINKCONTROL: + nInsertObj = OBJ_DLG_HYPERLINKCONTROL; + break; case SID_INSERT_TREECONTROL: nInsertObj = OBJ_DLG_TREECONTROL; break; diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 1ab4d275dcb3..54c750716630 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -898,6 +898,7 @@ void Shell::GetState(SfxItemSet &rSet) case SID_INSERT_FILECONTROL: case SID_INSERT_SPINBUTTON: case SID_INSERT_GRIDCONTROL: + case SID_INSERT_HYPERLINKCONTROL: case SID_INSERT_TREECONTROL: case SID_INSERT_FORM_RADIO: case SID_INSERT_FORM_CHECK: diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 4fd29d359337..c21aa3039584 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -893,6 +893,7 @@ void Shell::InvalidateControlSlots() pBindings->Invalidate( SID_INSERT_FILECONTROL ); pBindings->Invalidate( SID_INSERT_SPINBUTTON ); pBindings->Invalidate( SID_INSERT_GRIDCONTROL ); + pBindings->Invalidate( SID_INSERT_HYPERLINKCONTROL ); pBindings->Invalidate( SID_INSERT_TREECONTROL ); pBindings->Invalidate( SID_CHOOSE_CONTROLS ); } diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index b69856c3cf23..ec003586e090 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -219,6 +219,9 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) case OBJ_DLG_GRIDCONTROL: pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.grid.UnoControlGridModel", xDialogSFact ); break; + case OBJ_DLG_HYPERLINKCONTROL: + pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel", xDialogSFact ); + break; } } diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 81eb13a4fa6e..45a642fa116c 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -723,6 +723,10 @@ OUString DlgEdObj::GetDefaultName() const { sResId = RID_STR_CLASS_GRIDCONTROL; } + else if ( supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ) ) + { + sResId = RID_STR_CLASS_HYPERLINKCONTROL; + } else if ( supportsService( "com.sun.star.awt.UnoControlSpinButtonModel" ) ) { sResId = RID_STR_CLASS_SPINCONTROL; @@ -852,6 +856,10 @@ sal_uInt16 DlgEdObj::GetObjIdentifier() const { return OBJ_DLG_GRIDCONTROL; } + else if ( supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" )) + { + return OBJ_DLG_HYPERLINKCONTROL; + } else { return OBJ_DLG_CONTROL; diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 1f4a02c82f5c..955b87783d8c 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -407,6 +407,10 @@ OUString PropBrw::GetHeadlineName( const Reference< XPropertySet >& _rxObject ) { sResId = RID_STR_CLASS_GRIDCONTROL; } + else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ) ) + { + sResId = RID_STR_CLASS_HYPERLINKCONTROL; + } else { sResId = RID_STR_CLASS_CONTROL; diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx index 74e73a894fd0..1aa627abddff 100644 --- a/basctl/source/inc/dlgeddef.hxx +++ b/basctl/source/inc/dlgeddef.hxx @@ -53,14 +53,15 @@ enum OBJ_DLG_TREECONTROL = 24, OBJ_DLG_SPINBUTTON = 25, OBJ_DLG_GRIDCONTROL = 26, + OBJ_DLG_HYPERLINKCONTROL = 27, - OBJ_DLG_FORMRADIO = 27, - OBJ_DLG_FORMCHECK = 28, - OBJ_DLG_FORMLIST = 29, - OBJ_DLG_FORMCOMBO = 30, - OBJ_DLG_FORMSPIN = 31, - OBJ_DLG_FORMVSCROLL = 32, - OBJ_DLG_FORMHSCROLL = 33, + OBJ_DLG_FORMRADIO = 28, + OBJ_DLG_FORMCHECK = 29, + OBJ_DLG_FORMLIST = 30, + OBJ_DLG_FORMCOMBO = 31, + OBJ_DLG_FORMSPIN = 32, + OBJ_DLG_FORMVSCROLL = 33, + OBJ_DLG_FORMHSCROLL = 34, }; diff --git a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml index 9ad39ef9da64..cdd0ae7a0f5b 100644 --- a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml +++ b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml @@ -58,5 +58,6 @@ <toolbar:toolbaritem xlink:href=".uno:InsertTreeControl"/> <toolbar:toolbarbreak/> <toolbar:toolbaritem xlink:href=".uno:InsertGridControl"/> + <toolbar:toolbaritem xlink:href=".uno:InsertHyperlinkControl"/> <toolbar:toolbaritem xlink:href=".uno:SpinButton"/> </toolbar:toolbar> |