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

[Aurimas Fišeras]

 wizards/source/euro/Init.xba |   26 +++++++++++++++++++-------
 wizards/source/euro/euro.src |    7 +------
 2 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 244f4abc04aa6773879f19b38f4aa899689978cc
Author: Aurimas Fišeras <aurimas at members.fsf.org>
Date:   Sat Aug 23 12:12:12 2014 +0300

    added LTL Lithuanian Litas to Euro Converter
    
    Reviewed-on: https://gerrit.libreoffice.org/11090
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>
    (cherry picked from commit 0b3e1d9b222bf045b03746f1c162bf8077a24a1b)
    adapt SBCOUNTRYCOUNT
    (cherry picked from commit 375228c2c811412b516fe29bf263a520f4e9be1a)
    ditch unused sCurrUNKNOWN and sCurrSYSUNKNOWN strings
    (cherry picked from commit 99e1b398f28ee8eb2fc2d6bf5db8362170f32e69)
    increment SBCOUNTRYCOUNT again, we have 19 currencies 0..18
    (cherry picked from commit dfb48f77ba011661e03b6eb942234adb4e6630d7)
    
    Change-Id: Id4eeb42bbbaec979f60b57ddab2794b38f1e3157
    Reviewed-on: https://gerrit.libreoffice.org/12952
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 33d9eb8..ccd63b7 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -90,15 +90,14 @@ Public sCurrMALTESE as String
 Public sCurrSLOVAK as String
 Public sCurrESTONIAN as String
 Public sCurrLATVIAN as String
-Public sCurrUNKNOWN as String
-Public sCurrSYSUNKNOWN as String
+Public sCurrLITHUANIAN as String
 
 Public sPrgsRETRIEVAL as String
 Public sPrgsCONVERTING as String
 Public sPrgsUNPROTECT as String
 Public sInclusiveSubDir as String
 
-Public Const SBCOUNTRYCOUNT = 17
+Public Const SBCOUNTRYCOUNT = 19
 Public CurMimeType as String
 Public CurCellCount as Long
 Public oSheets as Object
@@ -134,8 +133,8 @@ Public CurExtension(2) as String
 Public Currfactor as Double
 Public CurrSymbolList(2) as String
 Public CurrLanguage as String
-Public CurrValue(17,5)
-Public LangIDValue(17,2,2) as String
+Public CurrValue(18,5)
+Public LangIDValue(18,2,2) as String
 Public PreName as String
 Public Separator as String
 Public BitmapDir as String
@@ -216,8 +215,7 @@ Dim LocWorkPath as String
 		sCurrSLOVAK = GetResText(1515)
 		sCurrESTONIAN = GetResText(1516)
 		sCurrLATVIAN = GetResText(1517)
-		sCurrUNKNOWN = GetResText(1518)
-		sCurrSYSUNKNOWN = GetResText(1519)
+		sCurrLITHUANIAN = GetResText(1518)
 		.cmdCancel.Label =  sCANCEL
 		.cmdHelp.Label =  sHELP
 		.cmdBack.Label =  GetResText(1002)
@@ -392,6 +390,11 @@ Sub InitializeLanguages()
     LangIDValue(17,1,1) = "LV"
     LangIDValue(17,1,2) = "-64B"
 
+' CURRENCIES_LITHUANIAN
+    LangIDValue(18,0,0) = "lt"
+    LangIDValue(18,0,1) = "LT"
+    LangIDValue(18,0,2) = "-427"
+
 End Sub
 
 
@@ -562,6 +565,15 @@ Dim i as Integer
 	CurrValue(17,4) = "Ls"
 	CurrValue(17,5) = "LVL"
 
+	CurrValue(18,0) = sCurrLITHUANIAN
+	' real conversion rate
+	CurrValue(18,1) = 3.45280
+	' rounded conversion rate
+	CurrValue(18,2) = 3.5
+	CurrValue(18,3) = "Lt"
+	CurrValue(18,4) = "Lt"
+	CurrValue(18,5) = "LTL"
+
 	i = -1
 	CurrSymbolList(0) = ""
 	CurrSymbolList(1) = ""
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index bf795ba..0f1b44b 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -412,12 +412,7 @@ 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.";
+Text [ en-US ] = "Lithuanian Litas";
 };
 
 String STEP_LASTPAGE