|
 |
f0633d |
From 9ac100fc1eaea06ebd80c4009ac7ebc3aee6fd50 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Date: Thu, 2 Jan 2014 21:53:36 +0100
|
|
|
f0633d |
Subject: [PATCH 099/109] added "EEK" and "LVL" to EUROCONVERT(), "EUR" to
|
|
|
f0633d |
[*-LV] locale data fdo#73239
|
|
|
f0633d |
MIME-Version: 1.0
|
|
|
f0633d |
Content-Type: text/plain; charset=UTF-8
|
|
|
f0633d |
Content-Transfer-Encoding: 8bit
|
|
|
f0633d |
|
|
|
f0633d |
This is a combination of 3 commits.
|
|
|
f0633d |
|
|
|
f0633d |
added Estonian "EEK" to EUROCONVERT(), fdo#73239
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit 127f863c727c07f1da40005fe638d97e89baaccf)
|
|
|
f0633d |
|
|
|
f0633d |
Conflicts:
|
|
|
f0633d |
sc/source/core/tool/interpr2.cxx
|
|
|
f0633d |
|
|
|
f0633d |
added EUR as default currency to Latvia [*-LV] locale data, fdo#73239
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit c32996987354d045523beaa98b5d227d161f72fb)
|
|
|
f0633d |
|
|
|
f0633d |
added Latvian "LVL" to EUROCONVERT(), fdo#73239
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit cc1b6535e01db62688a7bee50852d33e4ee50761)
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I82085b6661c954b2afbf22b8b8ed5bd8c48cc50e
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7263
|
|
|
f0633d |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
i18npool/source/localedata/data/ltg_LV.xml | 9 ++++++++-
|
|
|
f0633d |
i18npool/source/localedata/data/lv_LV.xml | 9 ++++++++-
|
|
|
f0633d |
sc/source/core/tool/interpr2.cxx | 11 ++++++++---
|
|
|
f0633d |
3 files changed, 24 insertions(+), 5 deletions(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/i18npool/source/localedata/data/ltg_LV.xml b/i18npool/source/localedata/data/ltg_LV.xml
|
|
|
f0633d |
index 12fe4b0..6765077 100644
|
|
|
f0633d |
--- a/i18npool/source/localedata/data/ltg_LV.xml
|
|
|
f0633d |
+++ b/i18npool/source/localedata/data/ltg_LV.xml
|
|
|
f0633d |
@@ -331,7 +331,14 @@
|
|
|
f0633d |
</Calendar>
|
|
|
f0633d |
</LC_CALENDAR>
|
|
|
f0633d |
<LC_CURRENCY>
|
|
|
f0633d |
- <Currency default="true" usedInCompatibleFormatCodes="true">
|
|
|
f0633d |
+ <Currency default="true" usedInCompatibleFormatCodes="false">
|
|
|
f0633d |
+ <CurrencyID>EUR</CurrencyID>
|
|
|
f0633d |
+ <CurrencySymbol>€</CurrencySymbol>
|
|
|
f0633d |
+ <BankSymbol>EUR</BankSymbol>
|
|
|
f0633d |
+ <CurrencyName>Euro</CurrencyName>
|
|
|
f0633d |
+ <DecimalPlaces>2</DecimalPlaces>
|
|
|
f0633d |
+ </Currency>
|
|
|
f0633d |
+ <Currency default="false" usedInCompatibleFormatCodes="true">
|
|
|
f0633d |
<CurrencyID>LVL</CurrencyID>
|
|
|
f0633d |
<CurrencySymbol>Ls</CurrencySymbol>
|
|
|
f0633d |
<BankSymbol>LVL</BankSymbol>
|
|
|
f0633d |
diff --git a/i18npool/source/localedata/data/lv_LV.xml b/i18npool/source/localedata/data/lv_LV.xml
|
|
|
f0633d |
index 456214d..68483e5 100644
|
|
|
f0633d |
--- a/i18npool/source/localedata/data/lv_LV.xml
|
|
|
f0633d |
+++ b/i18npool/source/localedata/data/lv_LV.xml
|
|
|
f0633d |
@@ -331,7 +331,14 @@
|
|
|
f0633d |
</Calendar>
|
|
|
f0633d |
</LC_CALENDAR>
|
|
|
f0633d |
<LC_CURRENCY>
|
|
|
f0633d |
- <Currency default="true" usedInCompatibleFormatCodes="true">
|
|
|
f0633d |
+ <Currency default="true" usedInCompatibleFormatCodes="false">
|
|
|
f0633d |
+ <CurrencyID>EUR</CurrencyID>
|
|
|
f0633d |
+ <CurrencySymbol>€</CurrencySymbol>
|
|
|
f0633d |
+ <BankSymbol>EUR</BankSymbol>
|
|
|
f0633d |
+ <CurrencyName>Euro</CurrencyName>
|
|
|
f0633d |
+ <DecimalPlaces>2</DecimalPlaces>
|
|
|
f0633d |
+ </Currency>
|
|
|
f0633d |
+ <Currency default="false" usedInCompatibleFormatCodes="true">
|
|
|
f0633d |
<CurrencyID>LVL</CurrencyID>
|
|
|
f0633d |
<CurrencySymbol>Ls</CurrencySymbol>
|
|
|
f0633d |
<BankSymbol>LVL</BankSymbol>
|
|
|
f0633d |
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
|
|
|
f0633d |
index a0f270d..14bba4f 100644
|
|
|
f0633d |
--- a/sc/source/core/tool/interpr2.cxx
|
|
|
f0633d |
+++ b/sc/source/core/tool/interpr2.cxx
|
|
|
f0633d |
@@ -2625,8 +2625,11 @@ void ScInterpreter::ScHyperLink()
|
|
|
f0633d |
}
|
|
|
f0633d |
}
|
|
|
f0633d |
|
|
|
f0633d |
-
|
|
|
f0633d |
-bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
|
|
|
f0633d |
+/** Resources at the website of the European Commission:
|
|
|
f0633d |
+ http://ec.europa.eu/economy_finance/euro/adoption/conversion/
|
|
|
f0633d |
+ http://ec.europa.eu/economy_finance/euro/countries/
|
|
|
f0633d |
+ */
|
|
|
f0633d |
+static bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
|
|
|
f0633d |
{
|
|
|
f0633d |
struct ConvertInfo
|
|
|
f0633d |
{
|
|
|
f0633d |
@@ -2651,7 +2654,9 @@ bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
|
|
|
f0633d |
{ "SIT", 239.640, 2 },
|
|
|
f0633d |
{ "MTL", 0.429300, 2 },
|
|
|
f0633d |
{ "CYP", 0.585274, 2 },
|
|
|
f0633d |
- { "SKK", 30.1260, 2 }
|
|
|
f0633d |
+ { "SKK", 30.1260, 2 },
|
|
|
f0633d |
+ { "EEK", 15.6466, 2 },
|
|
|
f0633d |
+ { "LVL", 0.702804, 2 }
|
|
|
f0633d |
};
|
|
|
f0633d |
|
|
|
f0633d |
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|