[Libreoffice-commits] core.git: 3 commits - wizards/source

[Eike Rathke]

 wizards/source/euro/Init.xba |    6 +-----
 wizards/source/euro/euro.src |   10 ----------
 2 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit dfb48f77ba011661e03b6eb942234adb4e6630d7
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Aug 26 23:50:04 2014 +0200

    increment SBCOUNTRYCOUNT again, we have 19 currencies 0..18
    
    Apparently this seems to have been forgotten at one occasion.
    
    Change-Id: I1436e412c1308f451d9d953f432a9887cfc99b59

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index a70948f..ccd63b7 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -97,7 +97,7 @@ Public sPrgsCONVERTING as String
 Public sPrgsUNPROTECT as String
 Public sInclusiveSubDir as String
 
-Public Const SBCOUNTRYCOUNT = 18
+Public Const SBCOUNTRYCOUNT = 19
 Public CurMimeType as String
 Public CurCellCount as Long
 Public oSheets as Object
commit 99e1b398f28ee8eb2fc2d6bf5db8362170f32e69
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Aug 26 23:10:31 2014 +0200

    ditch unused sCurrUNKNOWN and sCurrSYSUNKNOWN strings
    
    Apart from that they weren't currencies and only in the way when adding
    a new currency.
    
    Change-Id: If8ca3ab3b37f3617c3f73a01428c0c30dd3481d7

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 6a5fd50..a70948f 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -91,8 +91,6 @@ Public sCurrSLOVAK as String
 Public sCurrESTONIAN as String
 Public sCurrLATVIAN as String
 Public sCurrLITHUANIAN as String
-Public sCurrUNKNOWN as String
-Public sCurrSYSUNKNOWN as String
 
 Public sPrgsRETRIEVAL as String
 Public sPrgsCONVERTING as String
@@ -218,8 +216,6 @@ Dim LocWorkPath as String
 		sCurrESTONIAN = GetResText(1516)
 		sCurrLATVIAN = GetResText(1517)
 		sCurrLITHUANIAN = GetResText(1518)
-		sCurrUNKNOWN = GetResText(1519)
-		sCurrSYSUNKNOWN = GetResText(1520)
 		.cmdCancel.Label =  sCANCEL
 		.cmdHelp.Label =  sHELP
 		.cmdBack.Label =  GetResText(1002)
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 2280b75..0f1b44b 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -415,16 +415,6 @@ String CURRENCIES + 18
 Text [ en-US ] = "Lithuanian Litas";
 };
 
-String CURRENCIES + 19
-{
-Text [ en-US ] = "The currency set for the document is not a European currency!";
-};
-
-String CURRENCIES + 20
-{
-Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union.";
-};
-
 String STEP_LASTPAGE
 {
 Text [ en-US ] = "Progress";
commit 375228c2c811412b516fe29bf263a520f4e9be1a
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Aug 26 22:52:22 2014 +0200

    adapt SBCOUNTRYCOUNT
    
    Change-Id: Iadf4ae9a569388528f1083c22d6ff197d6479ba9

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 69226ed..6a5fd50 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -99,7 +99,7 @@ Public sPrgsCONVERTING as String
 Public sPrgsUNPROTECT as String
 Public sInclusiveSubDir as String
 
-Public Const SBCOUNTRYCOUNT = 17
+Public Const SBCOUNTRYCOUNT = 18
 Public CurMimeType as String
 Public CurCellCount as Long
 Public oSheets as Object