diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-18 13:04:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-18 13:47:29 +0200 |
| commit | b3c77e46e54872ed69e24a7f459b97f8334fcd9c (patch) | |
| tree | f547d9989d174b76be3b3a317a0ac2a89f3e5b6d | |
| parent | fe7032a3da3ec6e2bffd4fbab0810290ac0c8204 (diff) | |
remove unused aLocale from SvxNumRule
and fix usage site, regression from
commit 41956321ceefb5836feb2c119b66de7bb557740f
Date: Sat Nov 24 18:54:09 2012 +0100
get rid of Svx...Locale...() double conversion nonsense
Change-Id: Ic70abf5f52dce1db9cffd9c819e57f1a6c2a3df3
| -rw-r--r-- | editeng/source/items/numitem.cxx | 6 | ||||
| -rw-r--r-- | include/editeng/numitem.hxx | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 2b6a62f1c9a5..24a612f93d4c 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -604,7 +604,6 @@ SvxNumRule::SvxNumRule( SvxNumRuleFlags nFeatures, SvxNumRule::SvxNumRule(const SvxNumRule& rCopy) { ++nRefCount; - aLocale = rCopy.aLocale; nLevelCount = rCopy.nLevelCount ; nFeatureFlags = rCopy.nFeatureFlags ; bContinuousNumbering = rCopy.bContinuousNumbering; @@ -853,7 +852,10 @@ OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum ) const if( rNum.GetLevelVal()[ i ] ) { if(SVX_NUM_BITMAP != rNFmt.GetNumberingType()) - aStr += rNFmt.GetNumStr( rNum.GetLevelVal()[ i ], aLocale ); + { + const LanguageTag& rLang = Application::GetSettings().GetLanguageTag(); + aStr += rNFmt.GetNumStr( rNum.GetLevelVal()[ i ], rLang.getLocale() ); + } else bDot = false; } diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 522ebc01eb34..c898e3dc8045 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -248,7 +248,6 @@ class EDITENG_DLLPUBLIC SvxNumRule final bool aFmtsSet[SVX_MAX_NUM]; // Flags indicating valid levels static sal_Int32 nRefCount; - css::lang::Locale aLocale; public: SvxNumRule( SvxNumRuleFlags nFeatures, sal_uInt16 nLevels, |