diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-12 15:30:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-02-14 14:15:11 +0200 |
| commit | 9eb55c2b32ecfa04ced90105bf43e5d1e9fc609c (patch) | |
| tree | 8305eeac91d73f9ff665c2594c55dba8b106b996 | |
| parent | e5b10c9400b11a6dbf47be6196273b867e0ae34d (diff) | |
sal_Bool->bool
Change-Id: I57a93e4f64be03e8cc3482d1c05acea1f4751840
| -rw-r--r-- | sc/source/filter/inc/rtfparse.hxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/rtf/rtfparse.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index c3cf2643e279..7a3d8b68f361 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -61,16 +61,16 @@ private: ScRTFCellDefault* pInsDefault; ScRTFCellDefault* pActDefault; ScRTFCellDefault* pDefMerge; - sal_uLong nStartAdjust; - sal_uInt16 nLastWidth; - sal_Bool bNewDef; + sal_uLong nStartAdjust; + sal_uInt16 nLastWidth; + bool bNewDef; DECL_LINK( RTFImportHdl, ImportInfo* ); inline void NextRow(); void EntryEnd( ScEEParseEntry*, const ESelection& ); void ProcToken( ImportInfo* ); void ColAdjust(); - sal_Bool SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ); + bool SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ); void NewCellRow( ImportInfo* ); public: diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index 69277d6c028c..ea281c699c0a 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -112,26 +112,26 @@ inline void ScRTFParser::NextRow() } -sal_Bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ) +bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ) { ScRTFColTwips::const_iterator it = pColTwips->find( nTwips ); sal_Bool bFound = it != pColTwips->end(); sal_uInt16 nPos = it - pColTwips->begin(); *pCol = static_cast<SCCOL>(nPos); if ( bFound ) - return sal_True; + return true; sal_uInt16 nCount = pColTwips->size(); if ( !nCount ) return false; SCCOL nCol = *pCol; // nCol is insertion position; the next one higher up is there (or not) if ( nCol < static_cast<SCCOL>(nCount) && (((*pColTwips)[nCol] - SC_RTFTWIPTOL) <= nTwips) ) - return sal_True; + return true; // Not smaller than everything else? Then compare with the next lower one else if ( nCol != 0 && (((*pColTwips)[nCol-1] + SC_RTFTWIPTOL) >= nTwips) ) { (*pCol)--; - return sal_True; + return true; } return false; } @@ -317,7 +317,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) break; case RTF_CELLX: // closes cell default { - bNewDef = sal_True; + bNewDef = true; pInsDefault->nCol = nColCnt; pInsDefault->nTwips = pInfo->nTokenValue; // Right cell border maDefaultList.push_back( pInsDefault ); |