diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-02 10:41:35 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-03 08:21:39 +0200 |
commit | 2537d2dd496c0d05042ca33b99760de79df67682 (patch) | |
tree | 80796bedaf348d58b621df99d167308f7651633b /sc | |
parent | 418c5f7a4911bb2f1a06858556131b1bc4ad54f6 (diff) |
convert some sal_uInt8 fields to bool
Change-Id: Icd5845367157cc0b0c9342c6037b199c49432a76
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/excel/impop.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xipivot.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xltools.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/imp_op.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xltools.hxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index ba281b863a34..4ee35b21637e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -1239,7 +1239,7 @@ void ImportExcel::NewTable( void ) } -const ScTokenArray* ImportExcel::ErrorToFormula( sal_uInt8 bErrOrVal, sal_uInt8 nError, double& rVal ) +const ScTokenArray* ImportExcel::ErrorToFormula( bool bErrOrVal, sal_uInt8 nError, double& rVal ) { return pFormConv->GetBoolErr( XclTools::ErrorToEnum( rVal, bErrOrVal, nError ) ); } diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index ad2ae652fdea..966abdf2f073 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -120,7 +120,7 @@ void XclImpPCItem::WriteToSource( XclImpRoot& rRoot, const ScAddress& rScPos ) c double fValue; sal_uInt8 nErrCode = static_cast< sal_uInt8 >( *pnError ); const ScTokenArray* pScTokArr = rRoot.GetOldFmlaConverter().GetBoolErr( - XclTools::ErrorToEnum( fValue, EXC_BOOLERR_ERROR, nErrCode ) ); + XclTools::ErrorToEnum( fValue, true, nErrCode ) ); ScFormulaCell* pCell = pScTokArr ? new ScFormulaCell(&rDoc.getDoc(), rScPos, *pScTokArr) : new ScFormulaCell(&rDoc.getDoc(), rScPos); pCell->SetHybridDouble( fValue ); rDoc.setFormulaCell(rScPos, pCell); diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index dc81c9403621..01c3b4890102 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -258,7 +258,7 @@ double XclTools::ErrorToDouble( sal_uInt8 nXclError ) return fVal; } -XclBoolError XclTools::ErrorToEnum( double& rfDblValue, sal_uInt8 bErrOrBool, sal_uInt8 nValue ) +XclBoolError XclTools::ErrorToEnum( double& rfDblValue, bool bErrOrBool, sal_uInt8 nValue ) { XclBoolError eType; if( bErrOrBool ) diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 39063ff9c6d9..0587fd0dfb53 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -197,7 +197,7 @@ protected: virtual void EndSheet( void ); void NewTable( void ); - const ScTokenArray* ErrorToFormula( sal_uInt8 bErrOrVal, sal_uInt8 nError, + const ScTokenArray* ErrorToFormula( bool bErrOrVal, sal_uInt8 nError, double& rVal ); virtual void AdjustRowHeight(); diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index df39c3905ba9..0493ca2bd9ba 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -119,7 +119,7 @@ public: @param rfDblValue Returns 0.0 for error codes or the value of a Boolean (0.0 or 1.0). @param bErrorOrBool false = nError is a Boolean value; true = is an error value. @param nValue The error code or Boolean value. */ - static XclBoolError ErrorToEnum( double& rfDblValue, sal_uInt8 bErrOrBool, sal_uInt8 nValue ); + static XclBoolError ErrorToEnum( double& rfDblValue, bool bErrOrBool, sal_uInt8 nValue ); /** Returns the length in twips calculated from a length in inches. */ static sal_uInt16 GetTwipsFromInch( double fInches ); |