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

[Eike Rathke]

 i18npool/source/localedata/data/ltg_LV.xml |    9 ++++++++-
 i18npool/source/localedata/data/lv_LV.xml  |    9 ++++++++-
 sc/source/core/tool/interpr2.cxx           |   11 ++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 9ac100fc1eaea06ebd80c4009ac7ebc3aee6fd50
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jan 2 21:53:36 2014 +0100

    added "EEK" and "LVL" to EUROCONVERT(), "EUR" to [*-LV] locale data fdo#73239
    
    This is a combination of 3 commits.
    
    added Estonian "EEK" to EUROCONVERT(), fdo#73239
    
    (cherry picked from commit 127f863c727c07f1da40005fe638d97e89baaccf)
    
    Conflicts:
    	sc/source/core/tool/interpr2.cxx
    
    added EUR as default currency to Latvia [*-LV] locale data, fdo#73239
    
    (cherry picked from commit c32996987354d045523beaa98b5d227d161f72fb)
    
    added Latvian "LVL" to EUROCONVERT(), fdo#73239
    
    (cherry picked from commit cc1b6535e01db62688a7bee50852d33e4ee50761)
    
    Change-Id: I82085b6661c954b2afbf22b8b8ed5bd8c48cc50e
    Reviewed-on: https://gerrit.libreoffice.org/7263
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/i18npool/source/localedata/data/ltg_LV.xml b/i18npool/source/localedata/data/ltg_LV.xml
index 12fe4b0..6765077 100644
--- a/i18npool/source/localedata/data/ltg_LV.xml
+++ b/i18npool/source/localedata/data/ltg_LV.xml
@@ -331,7 +331,14 @@
     </Calendar>
   </LC_CALENDAR>
   <LC_CURRENCY>
-    <Currency default="true" usedInCompatibleFormatCodes="true">
+    <Currency default="true" usedInCompatibleFormatCodes="false">
+      <CurrencyID>EUR</CurrencyID>
+      <CurrencySymbol>€</CurrencySymbol>
+      <BankSymbol>EUR</BankSymbol>
+      <CurrencyName>Euro</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="true">
       <CurrencyID>LVL</CurrencyID>
       <CurrencySymbol>Ls</CurrencySymbol>
       <BankSymbol>LVL</BankSymbol>
diff --git a/i18npool/source/localedata/data/lv_LV.xml b/i18npool/source/localedata/data/lv_LV.xml
index 456214d..68483e5 100644
--- a/i18npool/source/localedata/data/lv_LV.xml
+++ b/i18npool/source/localedata/data/lv_LV.xml
@@ -331,7 +331,14 @@
     </Calendar>
   </LC_CALENDAR>
   <LC_CURRENCY>
-    <Currency default="true" usedInCompatibleFormatCodes="true">
+    <Currency default="true" usedInCompatibleFormatCodes="false">
+      <CurrencyID>EUR</CurrencyID>
+      <CurrencySymbol>€</CurrencySymbol>
+      <BankSymbol>EUR</BankSymbol>
+      <CurrencyName>Euro</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="true">
       <CurrencyID>LVL</CurrencyID>
       <CurrencySymbol>Ls</CurrencySymbol>
       <BankSymbol>LVL</BankSymbol>
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index a0f270d..14bba4f 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2625,8 +2625,11 @@ void ScInterpreter::ScHyperLink()
     }
 }
 
-
-bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
+/** Resources at the website of the European Commission:
+    http://ec.europa.eu/economy_finance/euro/adoption/conversion/
+    http://ec.europa.eu/economy_finance/euro/countries/
+ */
+static bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
 {
     struct ConvertInfo
     {
@@ -2651,7 +2654,9 @@ bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
         { "SIT", 239.640,  2 },
         { "MTL", 0.429300, 2 },
         { "CYP", 0.585274, 2 },
-        { "SKK", 30.1260,  2 }
+        { "SKK", 30.1260,  2 },
+        { "EEK", 15.6466,  2 },
+        { "LVL", 0.702804, 2 }
     };
 
     const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );