sw/source/core/docnode/ndtbl.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit 4c16e415d9cc17405256c9c4eebdb6c908308867 Author: Jan Holesovsky <ke...@suse.cz> Date: Wed Apr 3 15:48:02 2013 +0200 sal_Bool -> bool. Change-Id: Ie23ba9e2635d2dee8ad311df956b30e62e76935e diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 398dd6a..95237af 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 ); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits