Kaydet (Commit) 4c16e415 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

sal_Bool -> bool.

Change-Id: Ie23ba9e2635d2dee8ad311df956b30e62e76935e
üst c2006fb8
...@@ -4028,8 +4028,8 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) ...@@ -4028,8 +4028,8 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate )
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt(); SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE ); SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
sal_Bool bLockModify = sal_True; bool bLockModify = true;
sal_Bool bSetNumFmt = sal_False; bool bSetNumberFormat = false;
const bool bForceNumberFormat = IsInsTblFormatNum() && IsInsTblChangeNumFormat(); const bool bForceNumberFormat = IsInsTblFormatNum() && IsInsTblChangeNumFormat();
// if the user forced a number format in this cell previously, // if the user forced a number format in this cell previously,
...@@ -4046,17 +4046,17 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) ...@@ -4046,17 +4046,17 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate )
// Current and specified NumFormat match // Current and specified NumFormat match
// -> keep old Format // -> keep old Format
nFmtIdx = nOldNumFmt; nFmtIdx = nOldNumFmt;
bSetNumFmt = sal_True; bSetNumberFormat = true;
} }
else else
{ {
// Current and specified NumFormat do not match // Current and specified NumFormat do not match
// -> insert as Text // -> insert as Text
bLockModify = bSetNumFmt = sal_False; bLockModify = bSetNumberFormat = false;
} }
} }
if( bSetNumFmt || bForceNumberFormat ) if( bSetNumberFormat || bForceNumberFormat )
{ {
pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt(); pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
...@@ -4066,7 +4066,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) ...@@ -4066,7 +4066,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate )
// It's not enough to only reset the Formula. // It's not enough to only reset the Formula.
// Make sure that the Text is formatted accordingly // Make sure that the Text is formatted accordingly
if( !bSetNumFmt && !bIsEmptyTxtNd && pNumFmtItem ) if( !bSetNumberFormat && !bIsEmptyTxtNd && pNumFmtItem )
{ {
// Just resetting Attributes is not enough // Just resetting Attributes is not enough
// Make sure that the Text is formatted accordingly // Make sure that the Text is formatted accordingly
...@@ -4077,7 +4077,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate ) ...@@ -4077,7 +4077,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate )
pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ); pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
if( bLockModify ) pBoxFmt->UnlockModify(); if( bLockModify ) pBoxFmt->UnlockModify();
if( bSetNumFmt ) if( bSetNumberFormat )
pBoxFmt->SetFmtAttr( aBoxSet ); pBoxFmt->SetFmtAttr( aBoxSet );
} }
} }
......
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