diff options
author | László Németh <nemeth@numbertext.org> | 2022-11-04 10:10:00 +0100 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2022-11-04 14:29:19 +0100 |
commit | 21c6547302580c3fd77b85fda68bb0239b8c560a (patch) | |
tree | 0bd26c7e9d83081aa95ed917f5431b966daf9a74 /svl | |
parent | 00f7fae71f95bdbe9fc44a00a0f93924c04948cb (diff) |
tdf#115007 svl: clean-up "add NatNum12 number format list items"
As suggested by Eike Rathke:
– call getCurrBankSymbol() via rLoc();
- remove CCC support with NatNum12:
"This old CCC automatic format code never was used with
NatNum12 and shouldn't be introduced, it also isn't
offered in the number format dialog if a legacy document
doesn't already use it."
Follow-up to commit 2a1d2d42af7f365330479f4032ddfdd9eeba7c1d
"tdf#115007 add NatNum12 number format list items, fix title case".
Change-Id: Ia298d62221b1ce220724bdd7cfe627913ee1afc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142269
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/numbers/zformat.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 54f3ce6276d2..dfe5f16096e2 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -966,10 +966,7 @@ SvNumberformat::SvNumberformat(OUString& rString, sParams = "cardinal"; // default NatNum12 format is "cardinal" else if (sParams.indexOf("CURRENCY") >= 0) sParams = sParams.replaceAll("CURRENCY", - GetFormatter().GetLocaleData()->getCurrBankSymbol()); - // compatible (old) currency format - else if (sParams.indexOf("CCC") >= 0) - sParams = sParams.replaceAll("CCC", rScan.GetCurAbbrev()); + rLoc().getCurrBankSymbol()); NumFor[nIndex].SetNatNumParams(sParams); sStr += " " + sParams; } |