[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - i18npool/source officecfg/registry sc/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/hr_HR.xml              |    8 ++++++++
 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   11 +++++++++++
 sc/source/core/tool/interpr2.cxx                       |    3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 89c7beea208e7d70072cd2b436280c816debc180
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Fri Jul 22 22:12:02 2022 +0200
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 25 17:24:41 2022 +0200

    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 <er...@redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 3bb4d315c1b4a2edf8ddb26142364d3178d42338)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137330
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/i18npool/source/localedata/data/hr_HR.xml 
b/i18npool/source/localedata/data/hr_HR.xml
index 0c493131e16b..4de83e5535cd 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 a62d06512704..eda60fe6c434 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 31c42a4b728a..67fcd9f787f8 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3235,7 +3235,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)