summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-10-02 00:40:34 +0200
committerEike Rathke <erack@redhat.com>2018-10-02 02:23:56 +0200
commit52cb73911e661fb636085337374e09845f07783b (patch)
treea61c460a890d276e2b6b8678535112dd3bfdd840 /svx/source/items
parentf780a64a4f62bb7884d9dcfd984dc96ab737b34e (diff)
Omit deprecated old currency entries for ALL category unless used
These €0 instead of [$€-407]0 and CCC switching with system instead of [$EUR] They can't even be imported anymore since binfilter is gone, but still could be manually entered. Just don't offer that nonsense. Change-Id: I193eb3a864e192d4d420ac5178bf03296d697761 Reviewed-on: https://gerrit.libreoffice.org/61224 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'svx/source/items')
-rw-r--r--svx/source/items/numfmtsh.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 673ed349e4a3..e99e6ec9712c 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -773,6 +773,11 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>& rL
{
nNFEntry=pFormatter->GetFormatIndex(static_cast<NfIndexTableOffset>(nIndex),eCurLanguage);
+ if (nCurCategory == SvNumFormatType::ALL && nNFEntry != nCurFormatKey)
+ // Deprecated old currency entries, for ALL add only if used as
+ // current format key.
+ continue;
+
const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry);
if(pNumEntry==nullptr) continue;