Resolves: tdf#150011 Add HRK Croatian Kuna conversion to EUR Euro

TODO: switch defaults before 2023-01-01 in
i18npool/source/localedata/data/hr_HR.xml

Change-Id: Ifc62aefbc8c9fe8bbf044f61ae4fd6eeff692185
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137371
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Gbp-Pq: Name hrk-euro.diff

diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml
index 0c493131e16bfa32842dd9c5f1dd217e2fecc540..4de83e5535cd4f93f570b600733c242326e11f6f 100644 (file)
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -421,6 +421,14 @@
       <CurrencyName>Hrvatska Kuna</CurrencyName>
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
+    <!-- TODO: switch defaults before 2023-01-01 -->
+    <Currency default="false" usedInCompatibleFormatCodes="false">
+      <CurrencyID>EUR</CurrencyID>
+      <CurrencySymbol>€</CurrencySymbol>
+      <BankSymbol>EUR</BankSymbol>
+      <CurrencyName>Euro</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
   </LC_CURRENCY>
   <LC_TRANSLITERATION>
     <Transliteration unoid="SENTENCE_CASE"/>

diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index a62d0651270473d0b6892c4935121b35d9f82a5f..eda60fe6c4340a1becced21942f7de88e89b7ac4 100644 (file)
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -228,6 +228,17 @@
         <value>3.45280</value>
       </prop>
     </node>
+    <node oor:name="CR20" oor:op="replace">
+      <prop oor:name="FromUnit">
+        <value>EUR</value>
+      </prop>
+      <prop oor:name="ToUnit">
+        <value>HRK</value>
+      </prop>
+      <prop oor:name="Factor">
+        <value>7.53450</value>
+      </prop>
+    </node>
   </node>
   <node oor:name="Calculate">
     <node oor:name="Other">

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index f50aafb588106dbe33c8eab5b6daa76974fbe679..4e732ae8846b38c9c2049d1fd1162bd808f59a21 100644 (file)
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3306,7 +3306,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& r
         { "SKK", 30.1260,  2 },
         { "EEK", 15.6466,  2 },
         { "LVL", 0.702804, 2 },
-        { "LTL", 3.45280,  2 }
+        { "LTL", 3.45280,  2 },
+        { "HRK", 7.53450,  2 }
     };
 
     for (const auto & i : aConvertTable)

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 623a0a53be46c486e49831df185020a5f4d275c9..9f56c503a347e24ecc801c5e979a7332d4252859 100644 (file)
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -89,6 +89,7 @@ Public sCurrSLOVAK as String
 Public sCurrESTONIAN as String
 Public sCurrLATVIAN as String
 Public sCurrLITHUANIAN as String
+Public sCurrCROATIAN as String
 
 Public sPrgsRETRIEVAL as String
 Public sPrgsCONVERTING as String
@@ -214,6 +215,7 @@ Dim LocWorkPath as String
                sCurrESTONIAN = GetResText("CURRENCIES_16")
                sCurrLATVIAN = GetResText("CURRENCIES_17")
                sCurrLITHUANIAN = GetResText("CURRENCIES_18")
+               sCurrCROATIAN = GetResText("CURRENCIES_19")
                .cmdCancel.Label =  sCANCEL
                .cmdHelp.Label =  sHELP
                .cmdBack.Label =  GetResText("STEP_ZERO_2")
@@ -393,6 +395,11 @@ Sub InitializeLanguages()
     LangIDValue(18,0,1) = "LT"
     LangIDValue(18,0,2) = "-427"
 
+' CURRENCIES_CROATIAN
+    LangIDValue(19,0,0) = "hr"
+    LangIDValue(19,0,1) = "HR"
+    LangIDValue(19,0,2) = "-41A"
+
 End Sub
 
 
@@ -572,6 +579,15 @@ Dim i as Integer
        CurrValue(18,4) = "Lt"
        CurrValue(18,5) = "LTL"
 
+       CurrValue(19,0) = sCurrCROATIAN
+       ' real conversion rate
+       CurrValue(19,1) = 7.53450
+       ' rounded conversion rate
+       CurrValue(19,2) = 7.5
+       CurrValue(19,3) = "kn"
+       CurrValue(19,4) = "kn"
+       CurrValue(19,5) = "HRK"
+
        i = -1
        CurrSymbolList(0) = ""
        CurrSymbolList(1) = ""

diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
index b87e6aaa7d2767eddd579dda113220a9e90914fb..6cf891a85dad7930b0ad46be5fba0cb509347e31 100644 (file)
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -448,6 +448,7 @@ CURRENCIES_15=Slovak Koruna
 CURRENCIES_16=Estonian Kroon
 CURRENCIES_17=Latvian Lats
 CURRENCIES_18=Lithuanian Litas
+CURRENCIES_19=Croatian Kuna
 STEP_LASTPAGE_0=Progress
 STEP_LASTPAGE_1=Retrieving the relevant documents...
 STEP_LASTPAGE_2=Converting the documents...