diff options
| -rw-r--r-- | extras/source/glade/libreoffice-catalog.xml | 7 | ||||
| -rw-r--r-- | formula/inc/formula/funcutl.hxx | 6 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 31 |
3 files changed, 42 insertions, 2 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml index e3a00b1597bf..ab011a751619 100644 --- a/extras/source/glade/libreoffice-catalog.xml +++ b/extras/source/glade/libreoffice-catalog.xml @@ -109,6 +109,13 @@ generic-name="ComboBoxNumeric" parent="VclComboBoxText" icon-name="widget-gtk-comboboxtext"/> + <glade-widget-class title="Reference Button" name="foruilo-RefButton" + generic-name="Reference Button" parent="GtkButton" + icon-name="widget-gtk-button"/> + + <glade-widget-class title="Reference Edit" name="foruilo-RefEdit" + generic-name="Reference Edit" parent="GtkEntry" + icon-name="widget-gtk-textentry"/> </glade-widget-classes> </glade-catalog> diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index 7144350ae149..1dc10e88c062 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -44,6 +44,7 @@ protected: public: RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ); + RefEdit( Window* _pParent, WinBits nStyle = WB_BORDER ); virtual ~RefEdit(); void SetRefString( const XubString& rStr ); @@ -84,8 +85,9 @@ protected: virtual void LoseFocus(); public: - RefButton( Window* _pParent, const ResId& rResId); - RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit ,IControlReferenceHandler* pDlg); + RefButton(Window* _pParent, const ResId& rResId); + RefButton(Window* _pParent, WinBits nStyle = 0); + RefButton(Window* _pParent, const ResId& rResId, RefEdit* pEdit ,IControlReferenceHandler* pDlg); void SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 489e6718ac17..4b047d31185c 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/builder.hxx> #include <vcl/svapp.hxx> #include <vcl/scrbar.hxx> @@ -854,6 +855,19 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI aTimer.SetTimeout( SC_ENABLE_TIME ); } +RefEdit::RefEdit( Window* _pParent, WinBits nStyle ) : + Edit( _pParent, nStyle ), + pAnyRefDlg( NULL ) +{ + aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); + aTimer.SetTimeout( SC_ENABLE_TIME ); +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefEdit(Window *pParent, VclBuilder::stringmap &) +{ + return new RefEdit(pParent, WB_BORDER); +} + RefEdit::~RefEdit() { aTimer.SetTimeoutHdl( Link() ); @@ -958,6 +972,23 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) : SetStartImage(); } +RefButton::RefButton( Window* _pParent, WinBits nStyle ) : + ImageButton( _pParent, nStyle ), + aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), + aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), + aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), + aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), + pAnyRefDlg( NULL ), + pRefEdit( NULL ) +{ + SetStartImage(); +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefButton(Window *pParent, VclBuilder::stringmap &) +{ + return new RefButton(pParent, 0); +} + RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, IControlReferenceHandler* _pDlg ) : ImageButton( _pParent, rResId ), aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), |