diff options
| author | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
|---|---|---|
| committer | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
| commit | 4ae1df265823cbdc93dddc010fcb93aef729642e (patch) | |
| tree | d1773d10eee319a586765756100186879a3da175 /sc/source/ui/miscdlgs/solvrdlg.cxx | |
| parent | c9fa5def7645d8dbea676bc88c086e0b493337e5 (diff) | |
| parent | d0ce561b856d43b13d5884b5aa5106f7889ea929 (diff) | |
accfixes: merged to m100
Diffstat (limited to 'sc/source/ui/miscdlgs/solvrdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 1a0e8c14da3d..e3e58b8f75ad 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -80,7 +80,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, pDoc ( pDocument ), nCurTab ( aCursorPos.Tab() ), pEdActive ( NULL ), - bDlgLostFocus ( FALSE ), + bDlgLostFocus ( sal_False ), errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), @@ -130,7 +130,7 @@ void __EXPORT ScSolverDlg::Init() //---------------------------------------------------------------------------- -BOOL __EXPORT ScSolverDlg::Close() +sal_Bool __EXPORT ScSolverDlg::Close() { return DoClose( ScSolverDlgWrapper::GetChildWindowId() ); } @@ -141,7 +141,7 @@ void ScSolverDlg::SetActive() { if ( bDlgLostFocus ) { - bDlgLostFocus = FALSE; + bDlgLostFocus = sal_False; if( pEdActive ) pEdActive->GrabFocus(); } @@ -163,7 +163,7 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) String aStr; ScAddress aAdr = rRef.aStart; - USHORT nFmt = ( aAdr.Tab() == nCurTab ) + sal_uInt16 nFmt = ( aAdr.Tab() == nCurTab ) ? SCA_ABS : SCA_ABS_3D; @@ -207,14 +207,14 @@ void ScSolverDlg::RaiseError( ScSolverErr eError ) //---------------------------------------------------------------------------- -BOOL ScSolverDlg::IsRefInputMode() const +sal_Bool ScSolverDlg::IsRefInputMode() const { return pEdActive != NULL; } //---------------------------------------------------------------------------- -BOOL __EXPORT ScSolverDlg::CheckTargetValue( String& rStrVal ) +sal_Bool __EXPORT ScSolverDlg::CheckTargetValue( String& rStrVal ) { sal_uInt32 n1 = 0; double n2; @@ -237,8 +237,8 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) // 3. wurde ein korrekter Zielwert eingegeben const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); - USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); + sal_uInt16 nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); + sal_uInt16 nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); if ( SCA_VALID == ( nRes1 & SCA_VALID ) ) { @@ -259,7 +259,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) theTargetValStr ); ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam ); - SetDispatcherLock( FALSE ); + SetDispatcherLock( sal_False ); SwitchToDocument(); GetBindings().GetDispatcher()->Execute( SID_SOLVE, |