svx/source/items/numfmtsh.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 52cb73911e661fb636085337374e09845f07783b
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Tue Oct 2 00:40:34 2018 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Oct 2 02:23:56 2018 +0200
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 <er...@redhat.com>
Tested-by: Jenkins
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
