CWS-TOOLING: integrate CWS extras320

2009-09-09 07:44:31 +0200 jsk  r275963 : #i104797# - changed number of currencies from 13 to 16
2009-08-20 10:20:49 +0200 va  r275169 : #i99047# Added Font Hinting
2009-08-18 12:50:42 +0200 va  r275092 : #i99047# Added Font Hinting
2009-08-18 10:44:16 +0200 va  r275083 : #i104220# French Holiday: Added Whit Sunday
2009-08-14 11:46:39 +0200 va  r274973 : #i104220# Corrected French Holidays
2009-08-11 17:51:29 +0200 va  r274872 : #i98254# Button for Logfile expanded.
2009-08-11 17:28:09 +0200 va  r274870 : #i103011# Added latest 3 Euro Countries
2009-08-11 17:27:48 +0200 va  r274869 : #i103011# Added latest 3 Euro Countries
2009-08-11 17:17:41 +0200 va  r274868 : #i102567# Updated AutoCorrection
2009-08-11 17:16:59 +0200 va  r274867 : #i102567# Updated AutoCorrection
2009-08-11 17:16:27 +0200 va  r274866 : #i102567# Updated AutoCorrection

2 files changed, 75 insertions, 7 deletions

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index baedb650a0f9..45fdafdbafe5 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -68,6 +68,9 @@ Public sCurrAUSTRIAN as String
 Public sCurrFINNISH as String
 Public sCurrGREEK as String
 Public sCurrSLOVENIAN as String
+Public sCurrCYPRIOT as String
+Public sCurrMALTESE as String
+Public sCurrSLOVAK as String
 Public sCurrUNKNOWN as String
 Public sCurrSYSUNKNOWN as String
 
@@ -76,7 +79,7 @@ Public sPrgsCONVERTING as String
 Public sPrgsUNPROTECT as String
 Public sInclusiveSubDir as String
 
-Public Const SBCOUNTRYCOUNT = 12
+Public Const SBCOUNTRYCOUNT = 15
 Public CurMimeType as String
 Public CurCellCount as Long
 Public oSheets as Object
@@ -112,8 +115,8 @@ Public CurExtension(2) as String
 Public Currfactor as Double
 Public CurrSymbolList(2) as String
 Public CurrLanguage as String
-Public CurrValue(12,5)
-Public LangIDValue(12,2,2) as String
+Public CurrValue(15,5)
+Public LangIDValue(15,2,2) as String
 Public PreName as String
 Public Separator as String
 Public BitmapDir as String
@@ -189,8 +192,11 @@ Dim LocWorkPath as String
 		sCurrFINNISH = GetResText(1510)
 		sCurrGREEK = GetResText(1511)
 		sCurrSLOVENIAN = GetResText(1512)
-		sCurrUNKNOWN = GetResText(1513)
-		sCurrSYSUNKNOWN = GetResText(1514)
+		sCurrCYPRIOT = GetResText(1513)
+		sCurrMALTESE = GetResText(1514)
+		sCurrSLOVAK = GetResText(1515)
+		sCurrUNKNOWN = GetResText(1516)
+		sCurrSYSUNKNOWN = GetResText(1517)
 		.cmdCancel.Label =  sCANCEL
 		.cmdHelp.Label =  sHELP
 		.cmdBack.Label =  GetResText(1002)
@@ -299,6 +305,10 @@ Sub InitializeLanguages()
 	LangIDValue(7,0,1) = "IE"
 	LangIDValue(7,0,2) = "-1809"
 
+	LangIDValue(7,1,0) = "ga"
+	LangIDValue(7,1,1) = "IE"
+	LangIDValue(7,1,2) = "-83C"
+
 ' CURRENCIES_LUXEMBOURG
 	LangIDValue(8,0,0) = "fr"
 	LangIDValue(8,0,1) = "LU"
@@ -330,7 +340,23 @@ Sub InitializeLanguages()
 ' CURRENCIES_SLOVENIAN
 	LangIDValue(12,0,0) = "sl"
 	LangIDValue(12,0,1) = "SI"
-	LangIDValue(12,0,2) = "-408"
+	LangIDValue(12,0,2) = "-424"
+
+' CURRENCIES_CYPRIOT
+	LangIDValue(13,0,0) = "el"
+	LangIDValue(13,0,1) = "CY"
+	LangIDValue(13,0,2) = "-408"
+
+' CURRENCIES_MALTESE
+	LangIDValue(14,0,0) = "mt"
+	LangIDValue(14,0,1) = "MT"
+	LangIDValue(14,0,2) = "-43A"
+
+' CURRENCIES_SLOVAK
+	LangIDValue(15,0,0) = "sk"
+	LangIDValue(15,0,1) = "SK"
+	LangIDValue(15,0,2) = "-41B"
+
 End Sub
 
 
@@ -456,6 +482,33 @@ Dim i as Integer
 	CurrValue(12,4) = "SIT"
 	CurrValue(12,5) = "SIT"
 
+	CurrValue(13,0) = sCurrCYPRIOT
+	' real conversion rate
+	CurrValue(13,1) = 0.585274
+	' rounded conversion rate
+	CurrValue(13,2) = 0.6
+	CurrValue(13,3) = "£C"
+	CurrValue(13,4) = "£"
+	CurrValue(13,5) = "CYP"
+
+	CurrValue(14,0) = sCurrMALTESE
+	' real conversion rate
+	CurrValue(14,1) = 0.429300
+	' rounded conversion rate
+	CurrValue(14,2) = 0.4
+	CurrValue(14,3) = chr(8356)
+	CurrValue(14,4) = "Lm"
+	CurrValue(14,5) = "MTL"
+
+	CurrValue(15,0) = sCurrSLOVAK
+	' real conversion rate
+	CurrValue(15,1) = 30.1260
+	' rounded conversion rate
+	CurrValue(15,2) = 30
+	CurrValue(15,3) = "Sk"
+	CurrValue(15,4) = "Sk"
+	CurrValue(15,5) = "SKK"
+
 	i = -1
 	CurrSymbolList(0) = ""
 	CurrSymbolList(1) = ""
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index c62a756d1733..227c11203792 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -429,11 +429,26 @@ Text [ en-US ] = "Slovenian Tolar";
 
 String CURRENCIES + 13
 {
-Text [ en-US ] = "The currency set for the document is not a European currency!";
+Text [ en-US ] = "Cypriot Pound";
 };
 
 String CURRENCIES + 14
 {
+Text [ en-US ] = "Maltese Lira";
+};
+
+String CURRENCIES + 15
+{
+Text [ en-US ] = "Slovak Koruna";
+};
+
+String CURRENCIES + 16
+{
+Text [ en-US ] = "The currency set for the document is not a European currency!";
+};
+
+String CURRENCIES + 17
+{
 Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union.";
 };