[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - 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           |   10 ++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 5e5e8f48ac184bb0dd96a74c5bbc2108fd5b44d8
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jan 2 22:14:07 2014 +0100

    added Latvian "LVL" to EUROCONVERT(), fdo#73239
    
    Change-Id: I2041a4a8fa2387a217eac96d4424f8ee511a2e00
    (cherry picked from commit cc1b6535e01db62688a7bee50852d33e4ee50761)

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index cdc2120..d13f1e6 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2562,7 +2562,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& r
         { "MTL", 0.429300, 2 },
         { "CYP", 0.585274, 2 },
         { "SKK", 30.1260,  2 },
-        { "EEK", 15.6466,  2 }
+        { "EEK", 15.6466,  2 },
+        { "LVL", 0.702804, 2 }
     };
 
     const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );
commit aa17477a731496d6b003517e2a9b92c9aac924ac
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jan 2 22:07:24 2014 +0100

    added EUR as default currency to Latvia [*-LV] locale data, fdo#73239
    
    Change-Id: Iee8da90c70589b8053c8c5b696afb4968072f47e
    (cherry picked from commit c32996987354d045523beaa98b5d227d161f72fb)

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>
commit 852cc9597cbe0c0529f9d3187ac935a05f7ed885
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jan 2 21:53:36 2014 +0100

    added Estonian "EEK" to EUROCONVERT(), fdo#73239
    
    Change-Id: Ib4c82992e12758fcec6c667c57849935cd518972
    (cherry picked from commit 127f863c727c07f1da40005fe638d97e89baaccf)

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ab9183a..cdc2120 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2532,7 +2532,11 @@ void ScInterpreter::ScHyperLink()
     }
 }
 
-bool lclConvertMoney( const OUString& 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 OUString& aSearchUnit, double& rfRate, int& rnDec )
 {
     struct ConvertInfo
     {
@@ -2557,7 +2561,8 @@ bool lclConvertMoney( const OUString& 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 }
     };
 
     const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );