diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-26 21:24:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-26 21:24:29 +0200 |
| commit | 43c00bc48978a2c148d6f0622f40d3b40a93eb6c (patch) | |
| tree | d0b308203578d3b99cd31aa9136978e50edb14b1 /svx | |
| parent | a7e273755095e4b97c05a63ab39aa09f8aa755a4 (diff) | |
Clean up aEmptyStr
Change-Id: I5befe9deac917a28e80ed193b67ff29b5ba35149
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index b4289afa7c0d..13006279d21f 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -113,9 +113,8 @@ NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>& } const sal_Unicode cLocalPrefix = pNew->sPrefix.getLength() ? pNew->sPrefix[0] : 0; const sal_Unicode cLocalSuffix = pNew->sSuffix.getLength() ? pNew->sSuffix[0] : 0; - OUString aEmptyStr; - if( cLocalPrefix == ' ') pNew->sPrefix=aEmptyStr; - if( cLocalSuffix == ' ') pNew->sSuffix=aEmptyStr; + if( cLocalPrefix == ' ') pNew->sPrefix.clear(); + if( cLocalSuffix == ' ') pNew->sSuffix.clear(); return pNew; } @@ -431,9 +430,8 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 aFmt.SetBulletFont(&rActBulletFont); aFmt.SetBulletChar(cChar ); aFmt.SetCharFormatName(sBulletCharFormatName); - OUString aEmptyStr; - aFmt.SetPrefix( aEmptyStr ); - aFmt.SetSuffix( aEmptyStr ); + aFmt.SetPrefix( "" ); + aFmt.SetSuffix( "" ); if (isResetSize) aFmt.SetBulletRelSize(45); aNum.SetLevel(i, aFmt); } @@ -675,7 +673,6 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s sGrfName= pEntry->sGrfName; sal_uInt16 nMask = 1; - OUString aEmptyStr; sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP; OUString sNumCharFmtName = GetBulCharFmtName(); for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) @@ -684,8 +681,8 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s { SvxNumberFormat aFmt(aNum.GetLevel(i)); aFmt.SetNumberingType(nSetNumberingType); - aFmt.SetPrefix( aEmptyStr ); - aFmt.SetSuffix( aEmptyStr ); + aFmt.SetPrefix( "" ); + aFmt.SetSuffix( "" ); aFmt.SetCharFormatName( sNumCharFmtName ); Graphic aGraphic; @@ -1160,9 +1157,8 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI aFmt.SetBulletFont(&rActBulletFont); aFmt.SetBulletChar(cChar ); aFmt.SetCharFormatName(sBulletCharFormatName); - OUString aEmptyStr; - aFmt.SetPrefix( aEmptyStr ); - aFmt.SetSuffix( aEmptyStr ); + aFmt.SetPrefix( "" ); + aFmt.SetSuffix( "" ); if (isResetSize) aFmt.SetBulletRelSize(45); aNum.SetLevel(i, aFmt); } @@ -1175,7 +1171,6 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI sGrfName= pEntry->sGrfName; sal_uInt16 nMask = 1; - OUString aEmptyStr; sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP; OUString sNumCharFmtName = GetBulCharFmtName(); for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) @@ -1185,8 +1180,8 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI SvxNumberFormat aFmt(aNum.GetLevel(i)); if (SVX_NUM_BITMAP !=aFmt.GetNumberingType()) isResetSize=true; aFmt.SetNumberingType(nSetNumberingType); - aFmt.SetPrefix( aEmptyStr ); - aFmt.SetSuffix( aEmptyStr ); + aFmt.SetPrefix( "" ); + aFmt.SetSuffix( "" ); aFmt.SetCharFormatName( sNumCharFmtName ); if ( pCurrentBullets->nIndexDefault == (sal_uInt16)0xFFFF && pEntry->pGrfObj ) { |