[Libreoffice-commits] core.git: formula/source include/formula

[Caolán McNamara]

 formula/source/ui/dlg/funcutl.cxx |   35 ++++++++++++++++++++++++++++++++++-
 include/formula/funcutl.hxx       |    4 ++++
 2 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit c842486ab0b9e1f8d51e0af23622ac88ea048124
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jun 17 20:49:14 2014 +0100

    restore these for the moment, still in use in sc
    
    Change-Id: I6967a3c871338d1801d913d9bb54eba50a7660ca

diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index 62ca955..f833bf8 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -466,6 +466,16 @@ RefEdit::RefEdit( Window* _pParent, Window* 
pShrinkModeLabel, WinBits nStyle )
     aTimer.SetTimeout( SC_ENABLE_TIME );
 }
 
+RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent,
+    Window* pShrinkModeLabel, const ResId& rResId )
+    : Edit( _pParent, rResId )
+    , pAnyRefDlg( pParent )
+    , pLabelWidget(pShrinkModeLabel)
+{
+    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, NULL, WB_BORDER);
@@ -561,7 +571,6 @@ IMPL_LINK_NOARG(RefEdit, UpdateHdl)
 }
 
 //class RefButton
-
 RefButton::RefButton( Window* _pParent, WinBits nStyle ) :
     ImageButton( _pParent, nStyle ),
     aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
@@ -574,6 +583,30 @@ RefButton::RefButton( Window* _pParent, WinBits nStyle ) :
     SetStartImage();
 }
 
+RefButton::RefButton( Window* _pParent, const ResId& rResId) :
+    ImageButton( _pParent, rResId ),
+    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();
+}
+
+RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, 
IControlReferenceHandler* _pDlg ) :
+    ImageButton( _pParent, rResId ),
+    aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
+    aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
+    aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ),
+    aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ),
+    pAnyRefDlg( _pDlg ),
+    pRefEdit( pEdit )
+{
+    SetStartImage();
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefButton(Window 
*pParent, VclBuilder::stringmap &)
 {
     return new RefButton(pParent, 0);
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index a8d5af0..18e94ab 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -44,6 +44,7 @@ protected:
     virtual void LoseFocus() SAL_OVERRIDE;
 
 public:
+    RefEdit( Window* _pParent,IControlReferenceHandler* pParent, Window* 
pShrinkModeLabel, const ResId& rResId );
     RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle = 
WB_BORDER );
 
     virtual ~RefEdit();
@@ -94,7 +95,10 @@ protected:
     virtual void LoseFocus() SAL_OVERRIDE;
 
 public:
+    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 );
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits