diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 14:58:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 15:00:54 +0100 |
| commit | bbd9668d5f70d8ff00a7b10915e7a16ceadb8443 (patch) | |
| tree | 4e65b4d58e6a4298219b1909f524b710677606d9 /sc | |
| parent | 4eda1a0293a869bf804056f1e9e04c984c69454d (diff) | |
bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)
Change-Id: I9869d9709f28b68ef7b518527175589d80644668
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/excel/excform8.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/excel/excrecds.cxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 0273ddd84e9d..458ebcd9eb1a 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -214,7 +214,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s sal_Int16 nINT16; double fDouble; OUString aString; - sal_Bool bError = false; + bool bError = false; sal_Bool bArrayFormula = false; TokenId nMerk0; const sal_Bool bRangeName = eFT == FT_RangeName; @@ -848,7 +848,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s }//END in current Workbook } break; - default: bError = sal_True; + default: bError = true; } bError |= !aIn.IsValid(); } @@ -903,7 +903,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal sal_Size nIgnore; sal_uInt16 nUINT16; sal_uInt8 nByte; - sal_Bool bError = false; + bool bError = false; const sal_Bool bRangeName = eFT == FT_RangeName; const sal_Bool bSharedFormula = eFT == FT_SharedFormula; const sal_Bool bRNorSF = bRangeName || bSharedFormula; @@ -1286,7 +1286,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal case 0x3D: // Deleted 3-D Area Reference [ 277] nIgnore = 20; break; - default: bError = sal_True; + default: bError = true; } bError |= !aIn.IsValid(); diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 9cc81da49fc2..8ec49043fea3 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -144,7 +144,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_uInt16 nUINT16; double fDouble; OUString aString; - sal_Bool bError = false; + bool bError = false; sal_Bool bArrayFormula = false; TokenId nMerk0; const bool bCondFormat = eFT == FT_CondFormat; @@ -881,7 +881,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, } } break; - default: bError = sal_True; + default: bError = true; } bError |= !aIn.IsValid(); } @@ -927,7 +927,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa SCsTAB nTab, const FORMULA_TYPE eFT ) { sal_uInt8 nOp, nLen; - sal_Bool bError = false; + bool bError = false; const bool bCondFormat = eFT == FT_CondFormat; const bool bRangeName = eFT == FT_RangeName || bCondFormat; const bool bSharedFormula = eFT == FT_SharedFormula; @@ -1234,7 +1234,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa aIn.Ignore( 10 ); break; default: - bError = sal_True; + bError = true; } bError |= !aIn.IsValid(); } diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 9be9bfe530fc..977d638cf482 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -952,7 +952,7 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : { sal_Bool bConflict = false; sal_Bool bContLoop = sal_True; - sal_Bool bHasOr = false; + bool bHasOr = false; SCCOLROW nFirstField = aParam.GetEntry( 0 ).nField; // create AUTOFILTER records for filtered columns |