Kaydet (Commit) 9eb55c2b authored tarafından Noel Grandin's avatar Noel Grandin

sal_Bool->bool

Change-Id: I57a93e4f64be03e8cc3482d1c05acea1f4751840
üst e5b10c94
......@@ -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:
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment