diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 12:33:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 12:33:43 +0000 |
| commit | bbeca7e746a58d839653e6f3a4cdb73f9a5a6ca9 (patch) | |
| tree | 58f7349cf450a00d3ebd47352bca2f7cca530140 /sc/source/ui/miscdlgs/solvrdlg.cxx | |
| parent | f154e35c7c11f88b643fd9d5138037c2d849d266 (diff) | |
INTEGRATION: CWS calcwarnings (1.10.110); FILE MERGED
2006/12/12 17:03:18 nn 1.10.110.2: #i69284# warning-free: ui, unxlngi6
2006/12/01 08:53:36 nn 1.10.110.1: #i69284# warning-free: ui, wntmsci10
Diffstat (limited to 'sc/source/ui/miscdlgs/solvrdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 35b67717334e..c113b809d082 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: solvrdlg.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2006-07-21 14:10:28 $ + * last change: $Author: vg $ $Date: 2007-02-27 13:33:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,6 +70,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ), // + aFlVariables ( this, ScResId( FL_VARIABLES ) ), aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ), aEdFormulaCell ( this, ScResId( ED_FORMULACELL ) ), aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell ), @@ -78,21 +79,20 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aFtVariableCell ( this, ScResId( FT_VARCELL ) ), aEdVariableCell ( this, ScResId( ED_VARCELL ) ), aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell ), - aFlVariables ( this, ScResId( FL_VARIABLES ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) ), - errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), - errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), - errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), // - pDoc ( pDocument ), theFormulaCell ( aCursorPos ), theVariableCell ( aCursorPos ), + pDoc ( pDocument ), nCurTab ( aCursorPos.Tab() ), pEdActive ( NULL ), - bDlgLostFocus ( FALSE ) + bDlgLostFocus ( FALSE ), + errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), + errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), + errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), + errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) ) { Init(); FreeResource(); @@ -159,7 +159,7 @@ void ScSolverDlg::SetActive() //---------------------------------------------------------------------------- -void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) +void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if( pEdActive ) { @@ -172,7 +172,7 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) ? SCA_ABS : SCA_ABS_3D; - aAdr.Format( aStr, nFmt, pDoc ); + aAdr.Format( aStr, nFmt, pDocP ); pEdActive->SetRefString( aStr ); if ( pEdActive == &aEdFormulaCell ) @@ -309,7 +309,7 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScSolverDlg, LoseFocusHdl, Control*, pCtrl ) +IMPL_LINK( ScSolverDlg, LoseFocusHdl, Control*, EMPTYARG ) { bDlgLostFocus = !IsActive(); return 0; |