extras/source/glade/libreoffice-catalog.xml | 7 ++++++
formula/inc/formula/funcutl.hxx | 6 +++--
formula/source/ui/dlg/funcutl.cxx | 31 ++++++++++++++++++++++++++++
sc/source/ui/miscdlgs/anyrefdg.cxx | 5 ----
4 files changed, 43 insertions(+), 6 deletions(-)
New commits:
commit b3876e1dc9b05c7e0e02d7a03c372cc2600c7fad
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Mar 5 14:26:18 2013 +0000
another use of the reverse Unique HelpId Hack
Change-Id: Ic2d84bc20abda1ad2417d4dfdbe8c8fb09a49efd
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index fdffac4..396cf36 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -668,10 +668,7 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings*
pB, bool bBindRef ):
pActiveWin(NULL)
{
m_aHelper.SetWindow(&m_rWindow);
- if(m_rWindow.GetHelpId().isEmpty()) //Hack, da im
SfxModelessDialog die HelpId
- m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen
ModelessDialog entfernt und
- //in eine UniqueId gewandelt wird, machen
- //wir das an dieser Stelle rueckgaengig.
+ reverseUniqueHelpIdHack(m_rWindow);
aTimer.SetTimeout(200);
aTimer.SetTimeoutHdl(LINK( this, ScRefHandler, UpdateFocusHdl));
commit a9b33fc3044c001a652865baf6fb870f04c91a96
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Mar 5 12:53:12 2013 +0000
make formula refButton and refEdit loadable from .ui
Change-Id: I2ad13cd8de2c0f8f5672a30c3c1117708368b05f
diff --git a/extras/source/glade/libreoffice-catalog.xml
b/extras/source/glade/libreoffice-catalog.xml
index e3a00b1..ab011a7 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 7144350..1dc10e8 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 489e671..4b047d3 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 ) ),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
