Resolves: tdf#105209 CHF currency symbol is CHF instead of SFr.

Change-Id: Ic216c7b901bf6da779e161f35e5143739267b066
(cherry picked from commit 28a0737f8c21e5c9f789af328348e51b6044c28c)
Reviewed-on: https://gerrit.libreoffice.org/32966
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

4 files changed, 48 insertions, 20 deletions

diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml
index 7e6eb88351a9..5b2ac1f8e9c7 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -87,22 +87,22 @@
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
-      <FormatCode>[$SFr.-807] #'##0;[$SFr.-807] -#'##0</FormatCode>
+      <FormatCode>[$CHF-807] #'##0;[$CHF-807] -#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
-      <FormatCode>[$SFr.-807] #'##0.00;[$SFr.-807] -#'##0.00</FormatCode>
+      <FormatCode>[$CHF-807] #'##0.00;[$CHF-807] -#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
-      <FormatCode>[$SFr.-807] #'##0;[RED][$SFr.-807] -#'##0</FormatCode>
+      <FormatCode>[$CHF-807] #'##0;[RED][$CHF-807] -#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
-      <FormatCode>[$SFr.-807] #'##0.00;[RED][$SFr.-807] -#'##0.00</FormatCode>
+      <FormatCode>[$CHF-807] #'##0.00;[RED][$CHF-807] -#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
       <FormatCode>#'##0.00 CCC</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
-      <FormatCode>[$SFr.-807] #'##0.--;[RED][$SFr.-807] -#'##0.--</FormatCode>
+      <FormatCode>[$CHF-807] #'##0.--;[RED][$CHF-807] -#'##0.--</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>T.MM.JJ</FormatCode>
@@ -203,6 +203,13 @@
   <LC_CURRENCY>
     <Currency default="true" usedInCompatibleFormatCodes="true">
       <CurrencyID>CHF</CurrencyID>
+      <CurrencySymbol>CHF</CurrencySymbol>
+      <BankSymbol>CHF</BankSymbol>
+      <CurrencyName>Schweizer Franken</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+      <CurrencyID>CHF</CurrencyID>
       <CurrencySymbol>SFr.</CurrencySymbol>
       <BankSymbol>CHF</BankSymbol>
       <CurrencyName>Schweizer Franken</CurrencyName>
diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml
index 7247669449e3..d368c0589bcd 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -87,22 +87,22 @@
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
-      <FormatCode>[$SFr.-1407] #'##0;[$SFr.-1407]-#'##0</FormatCode>
+      <FormatCode>[$CHF-1407] #'##0;[$CHF-1407]-#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
-      <FormatCode>[$SFr.-1407] #'##0.00;[$SFr.-1407]-#'##0.00</FormatCode>
+      <FormatCode>[$CHF-1407] #'##0.00;[$CHF-1407]-#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
-      <FormatCode>[$SFr.-1407] #'##0;[ROT][$SFr.-1407]-#'##0</FormatCode>
+      <FormatCode>[$CHF-1407] #'##0;[ROT][$CHF-1407]-#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
-      <FormatCode>[$SFr.-1407] #'##0.00;[ROT][$SFr.-1407]-#'##0.00</FormatCode>
+      <FormatCode>[$CHF-1407] #'##0.00;[ROT][$CHF-1407]-#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
       <FormatCode>#'##0.00 CCC</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
-      <FormatCode>[$SFr.-1407] #'##0.--;[ROT][$SFr.-1407]-#'##0.--</FormatCode>
+      <FormatCode>[$CHF-1407] #'##0.--;[ROT][$CHF-1407]-#'##0.--</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>TT.MM.JJ</FormatCode>
@@ -203,6 +203,13 @@
   <LC_CURRENCY>
     <Currency default="true" usedInCompatibleFormatCodes="true">
       <CurrencyID>CHF</CurrencyID>
+      <CurrencySymbol>CHF</CurrencySymbol>
+      <BankSymbol>CHF</BankSymbol>
+      <CurrencyName>Schweizer Franken</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+      <CurrencyID>CHF</CurrencyID>
       <CurrencySymbol>SFr.</CurrencySymbol>
       <BankSymbol>CHF</BankSymbol>
       <CurrencyName>Schweizer Franken</CurrencyName>
diff --git a/i18npool/source/localedata/data/fr_CH.xml b/i18npool/source/localedata/data/fr_CH.xml
index 907d5171774b..a2a51fca38c1 100644
--- a/i18npool/source/localedata/data/fr_CH.xml
+++ b/i18npool/source/localedata/data/fr_CH.xml
@@ -88,22 +88,22 @@
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
-      <FormatCode>[$sFr.-100C] #'##0;[$sFr.-100C] -#'##0</FormatCode>
+      <FormatCode>[$CHF-100C] #'##0;[$CHF-100C] -#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
-      <FormatCode>[$sFr.-100C] #'##0.00;[$sFr.-100C] -#'##0.00</FormatCode>
+      <FormatCode>[$CHF-100C] #'##0.00;[$CHF-100C] -#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
-      <FormatCode>[$sFr.-100C] #'##0;[RED][$sFr.-100C] -#'##0</FormatCode>
+      <FormatCode>[$CHF-100C] #'##0;[RED][$CHF-100C] -#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
-      <FormatCode>[$sFr.-100C] #'##0.00;[RED][$sFr.-100C] -#'##0.00</FormatCode>
+      <FormatCode>[$CHF-100C] #'##0.00;[RED][$CHF-100C] -#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
       <FormatCode>#'##0.00 CCC</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
-      <FormatCode>[$sFr.-100C] #'##0.--;[RED][$sFr.-100C] -#'##0.--</FormatCode>
+      <FormatCode>[$CHF-100C] #'##0.--;[RED][$CHF-100C] -#'##0.--</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>J.MM.AA</FormatCode>
@@ -204,6 +204,13 @@
   <LC_CURRENCY>
     <Currency default="true" usedInCompatibleFormatCodes="true">
       <CurrencyID>CHF</CurrencyID>
+      <CurrencySymbol>CHF</CurrencySymbol>
+      <BankSymbol>CHF</BankSymbol>
+      <CurrencyName>franc suisse</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+      <CurrencyID>CHF</CurrencyID>
       <CurrencySymbol>sFr.</CurrencySymbol>
       <BankSymbol>CHF</BankSymbol>
       <CurrencyName>franc suisse</CurrencyName>
diff --git a/i18npool/source/localedata/data/it_CH.xml b/i18npool/source/localedata/data/it_CH.xml
index a71019ca8496..1514c671a367 100644
--- a/i18npool/source/localedata/data/it_CH.xml
+++ b/i18npool/source/localedata/data/it_CH.xml
@@ -87,22 +87,22 @@
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
-      <FormatCode>[$SFr.-810] #'##0;[$SFr.-810] -#'##0</FormatCode>
+      <FormatCode>[$CHF-810] #'##0;[$CHF-810] -#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
-      <FormatCode>[$SFr.-810] #'##0.00;[$SFr.-810] -#'##0.00</FormatCode>
+      <FormatCode>[$CHF-810] #'##0.00;[$CHF-810] -#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
-      <FormatCode>[$SFr.-810] #'##0;[RED][$SFr.-810] -#'##0</FormatCode>
+      <FormatCode>[$CHF-810] #'##0;[RED][$CHF-810] -#'##0</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
-      <FormatCode>[$SFr.-810] #'##0.00;[RED][$SFr.-810] -#'##0.00</FormatCode>
+      <FormatCode>[$CHF-810] #'##0.00;[RED][$CHF-810] -#'##0.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
       <FormatCode>#'##0.00 CCC</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
-      <FormatCode>[$SFr.-810] #'##0.--;[RED][$SFr.-810] -#'##0.--</FormatCode>
+      <FormatCode>[$CHF-810] #'##0.--;[RED][$CHF-810] -#'##0.--</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>G.MM.AA</FormatCode>
@@ -203,6 +203,13 @@
   <LC_CURRENCY>
     <Currency default="true" usedInCompatibleFormatCodes="true">
       <CurrencyID>CHF</CurrencyID>
+      <CurrencySymbol>CHF</CurrencySymbol>
+      <BankSymbol>CHF</BankSymbol>
+      <CurrencyName>Franco Svizzero</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+      <CurrencyID>CHF</CurrencyID>
       <CurrencySymbol>SFr.</CurrencySymbol>
       <BankSymbol>CHF</BankSymbol>
       <CurrencyName>Franco Svizzero</CurrencyName>