diff options
Diffstat (limited to 'svx/source/sidebar/nbdtmg.cxx')
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index aa690a5d7be6..5144e4023bea 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -187,7 +187,6 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version { xIStm->ReadInt32( nNumIndex ); - sal_uInt16 nLevel = 0x1; while (nNumIndex>=0 && nNumIndex<DEFAULT_NUM_VALUSET_COUNT) { SvxNumRule aNum(*xIStm); //bullet color in font properties is not stored correctly. Need set tranparency bits manually @@ -203,7 +202,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) aNum.SetLevel(i, aFmt); } } - RelplaceNumRule(aNum,nNumIndex,nLevel); + RelplaceNumRule(aNum,nNumIndex,0x1/*nLevel*/); xIStm->ReadInt32( nNumIndex ); } } @@ -230,9 +229,8 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename) SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::SYMBOL_ALIGNMENT, 10, false, SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT); - sal_uInt16 nLevel = 0x1; xOStm->WriteInt32( nItem ); - ApplyNumRule(aDefNumRule,nItem,nLevel,false,true); + ApplyNumRule(aDefNumRule,nItem,0x1/*nLevel*/,false,true); aDefNumRule.Store(*xOStm); } } @@ -628,7 +626,7 @@ void OutlineTypeMgr::Init() sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*mLevel*/,sal_uInt16 nFromIndex) { - sal_uInt16 nLength = SAL_N_ELEMENTS(pOutlineSettingsArrs); + sal_uInt16 const nLength = SAL_N_ELEMENTS(pOutlineSettingsArrs); for(sal_uInt16 iDex = nFromIndex; iDex < nLength; iDex++) { bool bNotMatch = false; @@ -702,7 +700,7 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) { - sal_uInt16 nLength = SAL_N_ELEMENTS(pOutlineSettingsArrs); + sal_uInt16 const nLength = SAL_N_ELEMENTS(pOutlineSettingsArrs); if ( nIndex >= nLength ) return; @@ -878,9 +876,8 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex, bool isDefault) { OUString sRet; - sal_uInt16 nLength = SAL_N_ELEMENTS(pOutlineSettingsArrs); - if ( nIndex >= nLength ) + if ( nIndex >= SAL_N_ELEMENTS(pOutlineSettingsArrs) ) return sRet; else { @@ -898,9 +895,7 @@ bool OutlineTypeMgr::IsCustomized(sal_uInt16 nIndex) { bool bRet = false; - sal_uInt16 nLength = SAL_N_ELEMENTS(pOutlineSettingsArrs); - - if ( nIndex >= nLength ) + if ( nIndex >= SAL_N_ELEMENTS(pOutlineSettingsArrs) ) return bRet; else { |