diff options
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/ui/WizardDialog.java | 19 | ||||
| -rw-r--r-- | wizards/source/euro/Init.xba | 65 | ||||
| -rw-r--r-- | wizards/source/euro/euro.src | 17 | ||||
| -rw-r--r-- | wizards/source/importwizard/ImportDialog.xdl | 2 | ||||
| -rw-r--r-- | wizards/source/schedule/LocalHolidays.xba | 4 |
5 files changed, 96 insertions, 11 deletions
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 2e101ff3398a..15b840fa9c89 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -232,14 +232,29 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL { int iDialogHeight = ((Integer) Helper.getUnoPropertyValue(this.xDialogModel, "Height")).intValue(); + // the roadmap control has got no real TabIndex ever + // that is not correct, but changing this would need time, so it is used + // without TabIndex as before oRoadmap = insertControlModel("com.sun.star.awt.UnoControlRoadmapModel", "rdmNavi", new String[] { - "Height", "PositionX", "PositionY", "Step", "TabIndex", "Width" + "Height", + "PositionX", + "PositionY", + "Step", + "TabIndex", + "Tabstop", + "Width" }, new Object[] { - new Integer(iDialogHeight - 26), new Integer(0), new Integer(0), new Integer(0), new Short((short) 0), new Integer(85) + new Integer(iDialogHeight - 26), + new Integer(0), + new Integer(0), + new Integer(0), + new Short((short)0), + Boolean.TRUE, + new Integer(85) }); XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oRoadmap); xPSet.setPropertyValue("Name", "rdmNavi"); 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."; }; diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl index dbc7e118c99e..082c06bc8970 100644 --- a/wizards/source/importwizard/ImportDialog.xdl +++ b/wizards/source/importwizard/ImportDialog.xdl @@ -89,7 +89,7 @@ <dlg:fixedline dlg:id="hlnDocuments" dlg:tab-index="42" dlg:left="6" dlg:top="110" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnDocuments"/> <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="43" dlg:left="6" dlg:top="181" dlg:width="258" dlg:height="6"/> <dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="44" dlg:left="6" dlg:top="55" dlg:width="258" dlg:height="8" dlg:page="4" dlg:value="hlnProgress"/> - <dlg:button dlg:id="cmdShowLogFile" dlg:tab-index="45" dlg:disabled="true" dlg:left="105" dlg:top="142" dlg:width="60" dlg:height="14" dlg:page="4" dlg:value="cmdShowLogFile"> + <dlg:button dlg:id="cmdShowLogFile" dlg:tab-index="45" dlg:disabled="true" dlg:left="75" dlg:top="142" dlg:width="120" dlg:height="14" dlg:page="4" dlg:value="cmdShowLogFile"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.FilesModul.OpenLogDocument?language=Basic&location=application" script:language="Script"/> </dlg:button> </dlg:bulletinboard> diff --git a/wizards/source/schedule/LocalHolidays.xba b/wizards/source/schedule/LocalHolidays.xba index 7c7d46ce664d..0b347c03f031 100644 --- a/wizards/source/schedule/LocalHolidays.xba +++ b/wizards/source/schedule/LocalHolidays.xba @@ -13,8 +13,10 @@ Dim lDate& CalInsertBankholiday(DateSerial(YearInt, 1, 1), "Jour de l'an", cHolidayType_Full) lEasterDate = CalEasterTable(YearInt) CalInsertBankholiday(lEasterDate, "Pâques", cHolidayType_Full) - CalInsertBankholiday(lEasterDate + 10, "Pentecôte", cHolidayType_Full) + CalInsertBankholiday(lEasterDate + 1, "Lundi de Pâques", cHolidayType_Full) CalInsertBankholiday(lEasterDate + 39, "Ascension", cHolidayType_Full) + CalInsertBankholiday(lEasterDate + 49, "Pentecôte", cHolidayType_Full) + CalInsertBankholiday(lEasterDate + 50, "Lundi de Pentecôte", cHolidayType_Full) CalInsertBankholiday(DateSerial(YearInt, 5, 1), "Fête du travail", cHolidayType_Full) CalInsertBankholiday(DateSerial(YearInt, 5, 8), "Victoire 1945", cHolidayType_Full) CalInsertBankholiday(DateSerial(YearInt, 7, 14), "Fête Nationale", cHolidayType_Full) |