From: Eike Rathke <erack@redhat.com>
Date: Fri, 22 Jul 2022 20:12:02 +0000 (+0200)
Subject: Resolves: tdf#150011 Add HRK Croatian Kuna conversion to EUR Euro
X-Git-Tag: archive/raspbian/1%7.0.4-4+rpi1+deb11u13^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d51823b19f552977f462ec8fbceefc7c58ebfc4c;p=libreoffice.git

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 0c493131e16..4de83e5535c 100644
--- 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 a62d0651270..eda60fe6c43 100644
--- 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 f50aafb5881..4e732ae8846 100644
--- 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 623a0a53be4..9f56c503a34 100644
--- 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(&quot;CURRENCIES_16&quot;)
 		sCurrLATVIAN = GetResText(&quot;CURRENCIES_17&quot;)
 		sCurrLITHUANIAN = GetResText(&quot;CURRENCIES_18&quot;)
+		sCurrCROATIAN = GetResText(&quot;CURRENCIES_19&quot;)
 		.cmdCancel.Label =  sCANCEL
 		.cmdHelp.Label =  sHELP
 		.cmdBack.Label =  GetResText(&quot;STEP_ZERO_2&quot;)
@@ -393,6 +395,11 @@ Sub InitializeLanguages()
     LangIDValue(18,0,1) = &quot;LT&quot;
     LangIDValue(18,0,2) = &quot;-427&quot;
 
+&apos; CURRENCIES_CROATIAN
+    LangIDValue(19,0,0) = &quot;hr&quot;
+    LangIDValue(19,0,1) = &quot;HR&quot;
+    LangIDValue(19,0,2) = &quot;-41A&quot;
+
 End Sub
 
 
@@ -572,6 +579,15 @@ Dim i as Integer
 	CurrValue(18,4) = &quot;Lt&quot;
 	CurrValue(18,5) = &quot;LTL&quot;
 
+	CurrValue(19,0) = sCurrCROATIAN
+	&apos; real conversion rate
+	CurrValue(19,1) = 7.53450
+	&apos; rounded conversion rate
+	CurrValue(19,2) = 7.5
+	CurrValue(19,3) = &quot;kn&quot;
+	CurrValue(19,4) = &quot;kn&quot;
+	CurrValue(19,5) = &quot;HRK&quot;
+
 	i = -1
 	CurrSymbolList(0) = &quot;&quot;
 	CurrSymbolList(1) = &quot;&quot;
diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
index b87e6aaa7d2..6cf891a85da 100644
--- 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...