Kaydet (Commit) b3c77e46 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused aLocale from SvxNumRule

and fix usage site, regression from

    commit 41956321
    Date:   Sat Nov 24 18:54:09 2012 +0100
    get rid of Svx...Locale...() double conversion nonsense

Change-Id: Ic70abf5f52dce1db9cffd9c819e57f1a6c2a3df3
üst fe7032a3
......@@ -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;
}
......
......@@ -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,
......
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