diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-12 10:47:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-02-14 14:15:01 +0200 |
| commit | 11cea9af959f6f39c863310b8ba8cdb3dff4a8cd (patch) | |
| tree | 31020459e5db1b40d779d55ee5a7c184b57719a6 | |
| parent | f5c4fd14a8b36e565f3c43158197f2906027f3f0 (diff) | |
sal_Bool->bool
Change-Id: I42f3e248cc368a8cea47ff8ff124df654d445879
| -rw-r--r-- | sc/inc/paramisc.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/global2.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx index b5545a9ab38d..e97ca3800b04 100644 --- a/sc/inc/paramisc.hxx +++ b/sc/inc/paramisc.hxx @@ -37,7 +37,7 @@ struct ScSolveParam ~ScSolveParam(); ScSolveParam& operator= ( const ScSolveParam& r ); - sal_Bool operator== ( const ScSolveParam& r ) const; + bool operator== ( const ScSolveParam& r ) const; }; /** diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index db1a66400420..324b1c0d2be1 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -273,15 +273,15 @@ ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r ) //------------------------------------------------------------------------ -sal_Bool ScSolveParam::operator==( const ScSolveParam& r ) const +bool ScSolveParam::operator==( const ScSolveParam& r ) const { - sal_Bool bEqual = (aRefFormulaCell == r.aRefFormulaCell) + bool bEqual = (aRefFormulaCell == r.aRefFormulaCell) && (aRefVariableCell == r.aRefVariableCell); if ( bEqual ) { if ( !pStrTargetVal && !r.pStrTargetVal ) - bEqual = sal_True; + bEqual = true; else if ( !pStrTargetVal || !r.pStrTargetVal ) bEqual = false; else if ( pStrTargetVal && r.pStrTargetVal ) |