[Libreoffice-commits] .: formula/inc formula/source sc/source

[Libreoffice Gerrit user]

 formula/inc/formula/funcutl.hxx                |    1 -
 formula/source/ui/dlg/funcutl.cxx              |    8 +-------
 sc/source/ui/condformat/condformatdlgentry.cxx |    6 +++---
 sc/source/ui/dbgui/validate.cxx                |    4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 27f1ba57e21df720553b2a8b321c2d0af58bc9f3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Oct 11 06:29:26 2012 +0200

    kill RefEdit constructor that does not initialize the highlighting
    
    Change-Id: I5c277526fdf376bfa96466e25975388edc3c7950

diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index c1e7c8b..24729eb 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -44,7 +44,6 @@ protected:
 
 public:
                         RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId );
-                        RefEdit( Window* pParent, const ResId& rResId );
     virtual             ~RefEdit();
 
     void                SetRefString( const XubString& rStr );
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index d97398d..edbfee0 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -86,7 +86,7 @@ void ValWnd::SetValue( const String& rStrVal )
 //----------------------------------------------------------------------------
 
 ArgEdit::ArgEdit( Window* pParent, const ResId& rResId )
-    :   RefEdit( pParent, rResId ),
+    :   RefEdit( pParent, NULL, rResId ),
         pEdPrev ( NULL ),
         pEdNext ( NULL ),
         pSlider ( NULL ),
@@ -854,12 +854,6 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI
     aTimer.SetTimeout( SC_ENABLE_TIME );
 }
 
-RefEdit::RefEdit( Window* pParent, const ResId& rResId ) :
-    Edit( pParent, rResId ),
-    pAnyRefDlg( NULL )
-{
-}
-
 RefEdit::~RefEdit()
 {
     aTimer.SetTimeoutHdl( Link() );
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index fa47cc0..447e97b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -139,8 +139,8 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit)
 ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ):
     ScCondFrmtEntry( pParent, pDoc, rPos ),
     maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ),
-    maEdVal1( this, ScResId( ED_VAL1 ) ),
-    maEdVal2( this, ScResId( ED_VAL2 ) ),
+    maEdVal1( this, static_cast<ScAnyRefDlg*>(pParent->GetParent()), ScResId( ED_VAL1 ) ),
+    maEdVal2( this, static_cast<ScAnyRefDlg*>(pParent->GetParent()), ScResId( ED_VAL2 ) ),
     maFtStyle( this, ScResId( FT_STYLE ) ),
     maLbStyle( this, ScResId( LB_STYLE ) ),
     maWdPreview( this, ScResId( WD_PREVIEW ) )
@@ -375,7 +375,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, const
     maFtStyle( this, ScResId( FT_STYLE ) ),
     maLbStyle( this, ScResId( LB_STYLE ) ),
     maWdPreview( this, ScResId( WD_PREVIEW ) ),
-    maEdFormula( this, ScResId( ED_FORMULA ) )
+    maEdFormula( this, static_cast<ScAnyRefDlg*>(pParent->GetParent()), ScResId( ED_FORMULA ) )
 {
     Init();
 
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 5fc701a..390ad17 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -323,10 +323,10 @@ ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rAr
     maFtValue ( this, ScResId( FT_VALUE ) ),
     maLbValue ( this, ScResId( LB_VALUE ) ),
     maFtMin   ( this, ScResId( FT_MIN ) ),
-    maEdMin   ( this, ScResId( EDT_MIN ) ),
+    maEdMin   ( this, NULL, ScResId( EDT_MIN ) ),
     maEdList  ( this, ScResId( EDT_LIST ) ),
     maFtMax   ( this, ScResId( FT_MAX ) ),
-    maEdMax   ( this, ScResId( EDT_MAX ) ),
+    maEdMax   ( this, NULL, ScResId( EDT_MAX ) ),
     maFtHint  ( this, ScResId( FT_SOURCEHINT ) ),
     maStrMin  ( ScResId( SCSTR_VALID_MINIMUM ) ),
     maStrMax  ( ScResId( SCSTR_VALID_MAXIMUM ) ),