diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-04-03 15:48:02 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-03 15:50:23 +0200 |
commit | 4c16e415d9cc17405256c9c4eebdb6c908308867 (patch) | |
tree | 0ac2deb61c462d184a10e124c06f3734626083ad /sw | |
parent | writerfilter: fix silly init causing trivial STL assertion in test (diff) | |
download | core-4c16e415d9cc17405256c9c4eebdb6c908308867.tar.gz core-4c16e415d9cc17405256c9c4eebdb6c908308867.zip |
sal_Bool -> bool.
Change-Id: Ie23ba9e2635d2dee8ad311df956b30e62e76935e
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 398dd6af23be..95237af5b484 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -4028,8 +4028,8 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt(); SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE ); - sal_Bool bLockModify = sal_True; - sal_Bool bSetNumFmt = sal_False; + bool bLockModify = true; + bool bSetNumberFormat = false; const bool bForceNumberFormat = IsInsTblFormatNum() && IsInsTblChangeNumFormat(); // if the user forced a number format in this cell previously, @@ -4046,17 +4046,17 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) // Current and specified NumFormat match // -> keep old Format nFmtIdx = nOldNumFmt; - bSetNumFmt = sal_True; + bSetNumberFormat = true; } else { // Current and specified NumFormat do not match // -> insert as Text - bLockModify = bSetNumFmt = sal_False; + bLockModify = bSetNumberFormat = false; } } - if( bSetNumFmt || bForceNumberFormat ) + if( bSetNumberFormat || bForceNumberFormat ) { pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt(); @@ -4066,7 +4066,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) // It's not enough to only reset the Formula. // Make sure that the Text is formatted accordingly - if( !bSetNumFmt && !bIsEmptyTxtNd && pNumFmtItem ) + if( !bSetNumberFormat && !bIsEmptyTxtNd && pNumFmtItem ) { // Just resetting Attributes is not enough // Make sure that the Text is formatted accordingly @@ -4077,7 +4077,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ); if( bLockModify ) pBoxFmt->UnlockModify(); - if( bSetNumFmt ) + if( bSetNumberFormat ) pBoxFmt->SetFmtAttr( aBoxSet ); } } |