[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - wizards/source

[Eike Rathke]

 wizards/source/euro/Init.xba |   34 +++++++++++++++++++++++++++-------
 wizards/source/euro/euro.src |    7 ++++++-
 2 files changed, 33 insertions(+), 8 deletions(-)

New commits:
commit 9742a6280e6a96336edce5054833fd83875b3b71
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 3 01:56:43 2014 +0100

    added LVL Latvian Lats to Euro Converter, fdo#73239
    
    Change-Id: Icc6f9c40a39f08bb0bcbed6d25c99f0e67cb608c
    (cherry picked from commit 5bf0a838e800605e95b5b03157bdf0780db497e6)

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index d01d500..33d9eb8 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -89,6 +89,7 @@ Public sCurrCYPRIOT as String
 Public sCurrMALTESE as String
 Public sCurrSLOVAK as String
 Public sCurrESTONIAN as String
+Public sCurrLATVIAN as String
 Public sCurrUNKNOWN as String
 Public sCurrSYSUNKNOWN as String
 
@@ -133,8 +134,8 @@ Public CurExtension(2) as String
 Public Currfactor as Double
 Public CurrSymbolList(2) as String
 Public CurrLanguage as String
-Public CurrValue(16,5)
-Public LangIDValue(16,2,2) as String
+Public CurrValue(17,5)
+Public LangIDValue(17,2,2) as String
 Public PreName as String
 Public Separator as String
 Public BitmapDir as String
@@ -214,8 +215,9 @@ Dim LocWorkPath as String
 		sCurrMALTESE = GetResText(1514)
 		sCurrSLOVAK = GetResText(1515)
 		sCurrESTONIAN = GetResText(1516)
-		sCurrUNKNOWN = GetResText(1517)
-		sCurrSYSUNKNOWN = GetResText(1518)
+		sCurrLATVIAN = GetResText(1517)
+		sCurrUNKNOWN = GetResText(1518)
+		sCurrSYSUNKNOWN = GetResText(1519)
 		.cmdCancel.Label =  sCANCEL
 		.cmdHelp.Label =  sHELP
 		.cmdBack.Label =  GetResText(1002)
@@ -377,9 +379,18 @@ Sub InitializeLanguages()
 	LangIDValue(15,0,2) = "-41B"
 
 ' CURRENCIES_ESTONIAN
-       LangIDValue(16,0,0) = "et"
-       LangIDValue(16,0,1) = "ET"
-       LangIDValue(16,0,2) = "-425"
+    LangIDValue(16,0,0) = "et"
+    LangIDValue(16,0,1) = "ET"
+    LangIDValue(16,0,2) = "-425"
+
+' CURRENCIES_LATVIAN
+    LangIDValue(17,0,0) = "lv"
+    LangIDValue(17,0,1) = "LV"
+    LangIDValue(17,0,2) = "-426"
+    ' and Latgalian
+    LangIDValue(17,1,0) = "ltg"
+    LangIDValue(17,1,1) = "LV"
+    LangIDValue(17,1,2) = "-64B"
 
 End Sub
 
@@ -542,6 +553,15 @@ Dim i as Integer
 	CurrValue(16,4) = "kr"
 	CurrValue(16,5) = "EEK"
 
+	CurrValue(17,0) = sCurrLATVIAN
+	' real conversion rate
+	CurrValue(17,1) = 0.702804
+	' rounded conversion rate
+	CurrValue(17,2) = 0.7
+	CurrValue(17,3) = "Ls"
+	CurrValue(17,4) = "Ls"
+	CurrValue(17,5) = "LVL"
+
 	i = -1
 	CurrSymbolList(0) = ""
 	CurrSymbolList(1) = ""
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 0a42451..9db7204 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -438,11 +438,16 @@ Text [ en-US ] = "Estonian Kroon";
 
 String CURRENCIES + 17
 {
-Text [ en-US ] = "The currency set for the document is not a European currency!";
+Text [ en-US ] = "Latvian Lats";
 };
 
 String CURRENCIES + 18
 {
+Text [ en-US ] = "The currency set for the document is not a European currency!";
+};
+
+String CURRENCIES + 19
+{
 Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union.";
 };