diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-03-05 08:00:32 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-03-05 08:00:32 +0000 |
commit | 119dc65dabbfc637923153da67efd6efad015555 (patch) | |
tree | 831ec39a734f47488f66ade0dc4a5288799170d0 /sc/source | |
parent | CWS-TOOLING: integrate CWS cmcfixes54 (diff) | |
download | core-119dc65dabbfc637923153da67efd6efad015555.tar.gz core-119dc65dabbfc637923153da67efd6efad015555.zip |
CWS-TOOLING: integrate CWS calc48
2009-02-06 17:11:50 +0100 nn r267478 : #i98978# enableInput(TRUE) in ScFormulaReferenceHelper dtor
2009-02-04 11:54:45 +0100 nn r267359 : #i98861# abort on failure, not on success
2009-02-02 19:10:10 +0100 nn r267293 : #i98747# use FormulaListBox for keyboard handling
2009-02-02 18:00:26 +0100 nn r267287 : #i98738# handle non-existing recent functions
2009-02-02 18:00:14 +0100 nn r267286 : #i98738# handle non-existing recent functions
2009-02-02 14:16:15 +0100 nn r267265 : #i98657# #i98737# move clean-up code from ScAnyRefDlg dtor to ScFormulaReferenceHelper dtor
2009-01-30 19:46:54 +0100 nn r267231 : #i98658# use ctor with IControlReferenceHandler for RefEdit controls
2009-01-30 19:12:43 +0100 nn r267225 : #i98656# IsRefInputMode: false if no function is edited
2009-01-30 18:48:12 +0100 nn r267224 : #i98655# show function description in description area
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/condfrmt.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/dbgui/consdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/pvlaydlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/sfiltdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/filtdlg.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/anyrefdg.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/crnrdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/highred.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/optsolver.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/simpref.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/tabopdlg.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/namedlg/namedlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/areasdlg.cxx | 6 |
18 files changed, 42 insertions, 39 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 78a8783bb1d5..2f05b7c5d960 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -975,6 +975,7 @@ void ScInputHandler::UseFormulaData() nNextFStart = aHelper.GetFunctionStart( aFormula, nLeftParentPos, TRUE); if( aHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) ) { + if( ppFDesc->getFunctionName().getLength() ) { nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 ); nArgs = static_cast<USHORT>(ppFDesc->getParameterCount()); diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index e97b13405af0..21cb4e069b93 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -65,10 +65,10 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aCbxCond1 ( this, ScResId( CBX_COND1 ) ), aLbCond11 ( this, ScResId( LB_COND1_1 ) ), aLbCond12 ( this, ScResId( LB_COND1_2 ) ), - aEdtCond11 ( this, ScResId( EDT_COND1_1 ) ), + aEdtCond11 ( this, this, ScResId( EDT_COND1_1 ) ), aRbCond11 ( this, ScResId( RB_COND1_1 ), &aEdtCond11,this ), aFtCond1And ( this, ScResId( FT_COND1_AND ) ), - aEdtCond12 ( this, ScResId( EDT_COND1_2 ) ), + aEdtCond12 ( this, this, ScResId( EDT_COND1_2 ) ), aRbCond12 ( this, ScResId( RB_COND1_2 ), &aEdtCond12,this ), aFtCond1Template ( this, ScResId( FT_COND1_TEMPLATE ) ), aLbCond1Template ( this, ScResId( LB_COND1_TEMPLATE ) ), @@ -77,10 +77,10 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aCbxCond2 ( this, ScResId( CBX_COND2 ) ), aLbCond21 ( this, ScResId( LB_COND2_1 ) ), aLbCond22 ( this, ScResId( LB_COND2_2 ) ), - aEdtCond21 ( this, ScResId( EDT_COND2_1 ) ), + aEdtCond21 ( this, this, ScResId( EDT_COND2_1 ) ), aRbCond21 ( this, ScResId( RB_COND2_1 ), &aEdtCond21,this ), aFtCond2And ( this, ScResId( FT_COND2_AND ) ), - aEdtCond22 ( this, ScResId( EDT_COND2_2 ) ), + aEdtCond22 ( this, this, ScResId( EDT_COND2_2 ) ), aRbCond22 ( this, ScResId( RB_COND2_2 ), &aEdtCond22,this ), aFtCond2Template ( this, ScResId( FT_COND2_TEMPLATE ) ), aLbCond2Template ( this, ScResId( LB_COND2_TEMPLATE ) ), @@ -89,10 +89,10 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aCbxCond3 ( this, ScResId( CBX_COND3 ) ), aLbCond31 ( this, ScResId( LB_COND3_1 ) ), aLbCond32 ( this, ScResId( LB_COND3_2 ) ), - aEdtCond31 ( this, ScResId( EDT_COND3_1 ) ), + aEdtCond31 ( this, this, ScResId( EDT_COND3_1 ) ), aRbCond31 ( this, ScResId( RB_COND3_1 ), &aEdtCond31,this ), aFtCond3And ( this, ScResId( FT_COND3_AND ) ), - aEdtCond32 ( this, ScResId( EDT_COND3_2 ) ), + aEdtCond32 ( this, this, ScResId( EDT_COND3_2 ) ), aRbCond32 ( this, ScResId( RB_COND3_2 ), &aEdtCond32,this ), aFtCond3Template ( this, ScResId( FT_COND3_TEMPLATE ) ), aLbCond3Template ( this, ScResId( LB_COND3_TEMPLATE ) ), diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index d0a0ff55a307..e4f53c5129fd 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -97,12 +97,12 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window aLbDataArea ( this, ScResId( LB_DATA_AREA ) ), aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), - aEdDataArea ( this, ScResId( ED_DATA_AREA ) ), + aEdDataArea ( this, this, ScResId( ED_DATA_AREA ) ), aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ), aLbDestArea ( this, ScResId( LB_DEST_AREA ) ), aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), - aEdDestArea ( this, ScResId( ED_DEST_AREA ) ), + aEdDestArea ( this, this, ScResId( ED_DEST_AREA ) ), aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this), aFlConsBy ( this, ScResId( FL_CONSBY ) ), diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 66f270213ce4..6fae453a9f52 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -147,7 +147,7 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aEdName ( this, ScResId( ED_NAME ) ), aFlAssign ( this, ScResId( FL_ASSIGN ) ), - aEdAssign ( this, ScResId( ED_DBAREA ) ), + aEdAssign ( this, this, ScResId( ED_DBAREA ) ), aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index fba9846e331f..7573b6841220 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -122,7 +122,7 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar aFlAreas ( this, ScResId( FL_OUTPUT ) ), aLbOutPos ( this, ScResId( LB_OUTAREA ) ), aFtOutArea ( this, ScResId( FT_OUTAREA ) ), - aEdOutPos ( this, ScResId( ED_OUTAREA ) ), + aEdOutPos ( this, this, ScResId( ED_OUTAREA ) ), aRbOutPos ( this, ScResId( RB_OUTAREA ), &aEdOutPos, this ), aBtnIgnEmptyRows( this, ScResId( BTN_IGNEMPTYROWS ) ), aBtnDetectCat ( this, ScResId( BTN_DETECTCAT ) ), diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index dbff3c6dabab..b0d82e7bf14e 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -75,7 +75,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi // aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ), - aEdFilterArea ( this, ScResId( ED_CRITERIA_AREA ) ), + aEdFilterArea ( this, this, ScResId( ED_CRITERIA_AREA ) ), aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ), // _INIT_COMMON_FILTER_RSCOBJS diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 281bc54946b4..ee1d3f676167 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1814,7 +1814,7 @@ BOOL ScImportExport::Dif2Doc( SvStream& rStrm ) BOOL ScImportExport::RTF2Doc( SvStream& rStrm, const String& rBaseURL ) { ScEEAbsImport *pImp = ScFormatFilter::Get().CreateRTFImport( pDoc, aRange ); - if (pImp) + if (!pImp) return false; pImp->Read( rStrm, rBaseURL ); aRange = pImp->GetRange(); @@ -1835,7 +1835,7 @@ BOOL ScImportExport::RTF2Doc( SvStream& rStrm, const String& rBaseURL ) BOOL ScImportExport::HTML2Doc( SvStream& rStrm, const String& rBaseURL ) { ScEEAbsImport *pImp = ScFormatFilter::Get().CreateHTMLImport( pDoc, rBaseURL, aRange, TRUE); - if (pImp) + if (!pImp) return false; pImp->Read( rStrm, rBaseURL ); aRange = pImp->GetRange(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 87f0b3915282..4544c1ca0792 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -470,7 +470,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) BOOL ScFormulaDlg::IsRefInputMode() const { const IFunctionDescription* pDesc = getCurrentFunctionDescription(); - BOOL bRef = (!pDesc || (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL); + BOOL bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL); return bRef; } diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 7b99c5d580a9..6bc29b67e441 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -88,7 +88,7 @@ class TypedScStrCollection; aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \ - aEdCopyArea ( this, ScResId( ED_COPY_AREA ) ), \ + aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), \ aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \ aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \ aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \ diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 0b410d4cc8d6..874236075d9f 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -85,6 +85,15 @@ ScFormulaReferenceHelper::~ScFormulaReferenceHelper() { if (bAccInserted) Application::RemoveAccel( pAccel.get() ); + + // common cleanup for ScAnyRefDlg and ScFormulaDlg is done here + + HideReference(); + enableInput( TRUE ); + + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); + if ( pInputHdl ) + pInputHdl->ResetDelayTimer(); // stop the timer for disabling the input line } // ----------------------------------------------------------------------------- void ScFormulaReferenceHelper::enableInput( BOOL bEnable ) @@ -737,10 +746,8 @@ ScAnyRefDlg::ScAnyRefDlg( SfxBindings* pB, SfxChildWindow* pCW, ScAnyRefDlg::~ScAnyRefDlg() { - HideReference(); lcl_HideAllReferences(); - m_aHelper.enableInput( TRUE ); SetModalInputMode(FALSE); SetDispatcherLock( FALSE ); //! here and in DoClose ? @@ -748,11 +755,6 @@ ScAnyRefDlg::~ScAnyRefDlg() if( pScViewShell ) pScViewShell->UpdateInputHandler(TRUE); - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); - - if ( pInputHdl ) //@BugID 54702 Da der Timer fuers Disablen - pInputHdl->ResetDelayTimer(); // noch laufen koennte, Reset ausloesen. - //SFX_APPWINDOW->Enable(TRUE,TRUE); lcl_InvalidateWindows(); } diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 8ec33d49b874..b3b521dfa704 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -93,12 +93,12 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, aFlAssign ( this, ScResId( FL_ASSIGN ) ), aLbRange ( this, ScResId( LB_RANGE ) ), - aEdAssign ( this, ScResId( ED_AREA ) ), + aEdAssign ( this, this, ScResId( ED_AREA ) ), aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ), aBtnColHead ( this, ScResId( BTN_COLHEAD ) ), aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ), aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ), - aEdAssign2 ( this, ScResId( ED_DATA ) ), + aEdAssign2 ( this, this, ScResId( ED_DATA ) ), aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ), aBtnOk ( this, ScResId( BTN_OK ) ), diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 01755bb86fbf..74514940127c 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -87,7 +87,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind aOkButton ( this, ScResId( BTN_OK ) ), aCancelButton ( this, ScResId( BTN_CANCEL ) ), aHelpButton ( this, ScResId( BTN_HELP ) ), - aEdAssign ( this, ScResId( ED_ASSIGN ) ), + aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), // pViewData ( ptrViewData ), diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 6fa5ba1d7098..97cc29ac3e54 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -134,7 +134,7 @@ ScSolverSuccessDialog::~ScSolverSuccessDialog() //---------------------------------------------------------------------------- ScCursorRefEdit::ScCursorRefEdit( ScAnyRefDlg* pParent, const ResId& rResId ) : - formula::RefEdit( pParent, rResId ) + formula::RefEdit( pParent, pParent, rResId ) { } @@ -189,16 +189,16 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_OPTSOLVER ), // maFtObjectiveCell ( this, ScResId( FT_OBJECTIVECELL ) ), - maEdObjectiveCell ( this, ScResId( ED_OBJECTIVECELL ) ), + maEdObjectiveCell ( this, this, ScResId( ED_OBJECTIVECELL ) ), maRBObjectiveCell ( this, ScResId( IB_OBJECTIVECELL ), &maEdObjectiveCell, this ), maFtDirection ( this, ScResId( FT_DIRECTION ) ), maRbMax ( this, ScResId( RB_MAX ) ), maRbMin ( this, ScResId( RB_MIN ) ), maRbValue ( this, ScResId( RB_VALUE ) ), - maEdTargetValue ( this, ScResId( ED_TARGET ) ), + maEdTargetValue ( this, this, ScResId( ED_TARGET ) ), maRBTargetValue ( this, ScResId( IB_TARGET ), &maEdTargetValue, this ), maFtVariableCells ( this, ScResId( FT_VARIABLECELLS ) ), - maEdVariableCells ( this, ScResId( ED_VARIABLECELLS ) ), + maEdVariableCells ( this, this, ScResId( ED_VARIABLECELLS ) ), maRBVariableCells ( this, ScResId( IB_VARIABLECELLS ), &maEdVariableCells, this), maFlConditions ( this, ScResId( FL_CONDITIONS ) ), maFtCellRef ( this, ScResId( FT_CELLREF ) ), diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index a18f8646b75e..416a4b1e7015 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -73,7 +73,7 @@ ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ), // aFtAssign ( this, ScResId( FT_ASSIGN ) ), - aEdAssign ( this, ScResId( ED_ASSIGN ) ), + aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), aBtnOk ( this, ScResId( BTN_OK ) ), diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 8e3803623972..b5fc7d8d322a 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -67,12 +67,12 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, // aFlVariables ( this, ScResId( FL_VARIABLES ) ), aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ), - aEdFormulaCell ( this, ScResId( ED_FORMULACELL ) ), + aEdFormulaCell ( this, this, ScResId( ED_FORMULACELL ) ), aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, this ), aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ), aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ), aFtVariableCell ( this, ScResId( FT_VARCELL ) ), - aEdVariableCell ( this, ScResId( ED_VARCELL ) ), + aEdVariableCell ( this, this, ScResId( ED_VARCELL ) ), aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 0409f94c3d35..9d144a257ff3 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -63,13 +63,13 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, // aFlVariables ( this, ScResId( FL_VARIABLES ) ), aFtFormulaRange ( this, ScResId( FT_FORMULARANGE ) ), - aEdFormulaRange ( this, ScResId( ED_FORMULARANGE ) ), + aEdFormulaRange ( this, this, ScResId( ED_FORMULARANGE ) ), aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), aFtRowCell ( this, ScResId( FT_ROWCELL ) ), - aEdRowCell ( this, ScResId( ED_ROWCELL ) ), + aEdRowCell ( this, this, ScResId( ED_ROWCELL ) ), aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), aFtColCell ( this, ScResId( FT_COLCELL ) ), - aEdColCell ( this, ScResId( ED_COLCELL ) ), + aEdColCell ( this, this, ScResId( ED_COLCELL ) ), aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index dabc36222df1..54b6c42926c3 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -128,7 +128,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aEdName ( this, ScResId( ED_NAME ) ), // aFlAssign ( this, ScResId( FL_ASSIGN ) ), - aEdAssign ( this, ScResId( ED_ASSIGN ) ), + aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), // aFlType ( this, ScResId( FL_TYPE ) ), diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 2f7ac75019e0..17c00948d3bd 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -117,17 +117,17 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* // aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), aFlPrintArea ( this, ScResId( FL_PRINTAREA ) ), - aEdPrintArea ( this, ScResId( ED_PRINTAREA ) ), + aEdPrintArea ( this, this, ScResId( ED_PRINTAREA ) ), aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ), // aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), aFlRepeatRow ( this, ScResId( FL_REPEATROW ) ), - aEdRepeatRow ( this, ScResId( ED_REPEATROW ) ), + aEdRepeatRow ( this, this, ScResId( ED_REPEATROW ) ), aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ), // aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), aFlRepeatCol ( this, ScResId( FL_REPEATCOL ) ), - aEdRepeatCol ( this, ScResId( ED_REPEATCOL ) ), + aEdRepeatCol ( this, this, ScResId( ED_REPEATCOL ) ), aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ), // aBtnOk ( this, ScResId( BTN_OK ) ), |