[Libreoffice-commits] core.git: 2 commits - Repository.mk wizards/AllLangResTarget_eur.mk wizards/AllLangResTarget_imp.mk wizards/AllLangResTarget_tpl.mk wizards/Module_wizards.mk wizards/source
Caolán McNamara
caolanm at redhat.com
Thu May 25 13:53:42 UTC 2017
Repository.mk | 3
wizards/AllLangResTarget_eur.mk | 32 -
wizards/AllLangResTarget_imp.mk | 32 -
wizards/AllLangResTarget_tpl.mk | 32 -
wizards/Module_wizards.mk | 3
wizards/source/euro/AutoPilotRun.xba | 2
wizards/source/euro/ConvertRun.xba | 4
wizards/source/euro/Init.xba | 170 +++----
wizards/source/euro/euro.src | 443 -------------------
wizards/source/formwizard/FormWizard.xba | 2
wizards/source/formwizard/Language.xba | 157 +++---
wizards/source/importwizard/DialogModul.xba | 18
wizards/source/importwizard/Language.xba | 126 ++---
wizards/source/importwizard/importwi.src | 379 ----------------
wizards/source/resources/resources_en_US.properties | 307 +++++++++++--
wizards/source/template/Autotext.xba | 8
wizards/source/template/Correspondence.xba | 86 +--
wizards/source/template/ModuleAgenda.xba | 18
wizards/source/template/Samples.xba | 20
wizards/source/template/template.src | 459 --------------------
wizards/source/tools/Misc.xba | 46 +-
wizards/source/tools/ModuleControls.xba | 12
wizards/source/tools/UCB.xba | 4
23 files changed, 598 insertions(+), 1765 deletions(-)
New commits:
commit 021ff0c97f3dabd423740782155c77cbcbc3a93a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 25 14:51:19 2017 +0100
RID_DB_TABLE_WIZARD_START should be RID_TABLE now
Change-Id: Ibb15f7e4ee1429213f523b8fd8d3b12dc4881257
diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
index 15c3646217d5..788b96ed5a69 100644
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -323,53 +323,53 @@ RID_FORM_95=Select the data entry mode
RID_FORM_96=Apply the style of your form
RID_FORM_97=Set the name of the form
RID_FORM_98=A form with the name '%FORMNAME' already exists.\nChoose another name.
-RID_DB_TABLE_WIZARD_START_1=Table Wizard
-RID_DB_TABLE_WIZARD_START_2=Select fields
-RID_DB_TABLE_WIZARD_START_3=Set types and formats
-RID_DB_TABLE_WIZARD_START_4=Set primary key
-RID_DB_TABLE_WIZARD_START_5=Create table
-RID_DB_TABLE_WIZARD_START_8=Select fields for your table
-RID_DB_TABLE_WIZARD_START_9=Set field types and formats
-RID_DB_TABLE_WIZARD_START_10=Set primary key
-RID_DB_TABLE_WIZARD_START_11=Create table
-RID_DB_TABLE_WIZARD_START_14=This wizard helps you to create a table for your database. After selecting a table category and a sample table, choose the fields you want to include in your table. You can include fields from more than one sample table.
-RID_DB_TABLE_WIZARD_START_15=Ca~tegory
-RID_DB_TABLE_WIZARD_START_16=B~usiness
-RID_DB_TABLE_WIZARD_START_17=P~ersonal
-RID_DB_TABLE_WIZARD_START_18=~Sample tables
-RID_DB_TABLE_WIZARD_START_19=A~vailable fields
-RID_DB_TABLE_WIZARD_START_20=Field information
-RID_TABLE=+
-RID_DB_TABLE_WIZARD_START_22=-
-RID_DB_TABLE_WIZARD_START_23=Field name
-RID_DB_TABLE_WIZARD_START_24=Field type
-RID_DB_TABLE_WIZARD_START_25=~Selected fields
-RID_DB_TABLE_WIZARD_START_26=A primary key uniquely identifies each record in a database table. Primary keys ease the linking of information in separate tables, and it is recommended that you have a primary key in every table. Without a primary key, it will not be possible to enter data into this table.
-RID_DB_TABLE_WIZARD_START_27=~Create a primary key
-RID_DB_TABLE_WIZARD_START_28=~Automatically add a primary key
-RID_DB_TABLE_WIZARD_START_29=~Use an existing field as a primary key
-RID_DB_TABLE_WIZARD_START_30=Define p~rimary key as a combination of several fields
-RID_DB_TABLE_WIZARD_START_31=F~ieldname
-RID_DB_TABLE_WIZARD_START_32=~Primary key fields
-RID_DB_TABLE_WIZARD_START_33=Auto ~value
-RID_DB_TABLE_WIZARD_START_34=What do you want to name your table?
-RID_DB_TABLE_WIZARD_START_35=Congratulations. You have entered all the information needed to create your table.
-RID_DB_TABLE_WIZARD_START_36=What do you want to do next?
-RID_DB_TABLE_WIZARD_START_37=Modify the table design
-RID_DB_TABLE_WIZARD_START_38=Insert data immediately
-RID_DB_TABLE_WIZARD_START_39=C~reate a form based on this table
-RID_DB_TABLE_WIZARD_START_40=The table you have created could not be opened.
-RID_DB_TABLE_WIZARD_START_41=The table name '%TABLENAME' contains a character ('%SPECIALCHAR') that might not be supported by the database.
-RID_DB_TABLE_WIZARD_START_42=The field name '%FIELDNAME' contains a special character ('%SPECIALCHAR') that might not be supported by the database.
-RID_DB_TABLE_WIZARD_START_43=Field
-RID_DB_TABLE_WIZARD_START_44=MyTable
-RID_DB_TABLE_WIZARD_START_45=Add a Field
-RID_DB_TABLE_WIZARD_START_46=Remove the selected Field
-RID_DB_TABLE_WIZARD_START_47=The field cannot be inserted because this would exceed the maximum number of %COUNT possible fields in the database table
-RID_DB_TABLE_WIZARD_START_48=The name '%TABLENAME' already exists.\nPlease enter another name.
-RID_DB_TABLE_WIZARD_START_49=Catalog of the table
-RID_DB_TABLE_WIZARD_START_50=Schema of the table
-RID_DB_TABLE_WIZARD_START_51=The field '%FIELDNAME' already exists.
+RID_TABLE_1=Table Wizard
+RID_TABLE_2=Select fields
+RID_TABLE_3=Set types and formats
+RID_TABLE_4=Set primary key
+RID_TABLE_5=Create table
+RID_TABLE_8=Select fields for your table
+RID_TABLE_9=Set field types and formats
+RID_TABLE_10=Set primary key
+RID_TABLE_11=Create table
+RID_TABLE_14=This wizard helps you to create a table for your database. After selecting a table category and a sample table, choose the fields you want to include in your table. You can include fields from more than one sample table.
+RID_TABLE_15=Ca~tegory
+RID_TABLE_16=B~usiness
+RID_TABLE_17=P~ersonal
+RID_TABLE_18=~Sample tables
+RID_TABLE_19=A~vailable fields
+RID_TABLE_20=Field information
+RID_TABLE_21=+
+RID_TABLE_22=-
+RID_TABLE_23=Field name
+RID_TABLE_24=Field type
+RID_TABLE_25=~Selected fields
+RID_TABLE_26=A primary key uniquely identifies each record in a database table. Primary keys ease the linking of information in separate tables, and it is recommended that you have a primary key in every table. Without a primary key, it will not be possible to enter data into this table.
+RID_TABLE_27=~Create a primary key
+RID_TABLE_28=~Automatically add a primary key
+RID_TABLE_29=~Use an existing field as a primary key
+RID_TABLE_30=Define p~rimary key as a combination of several fields
+RID_TABLE_31=F~ieldname
+RID_TABLE_32=~Primary key fields
+RID_TABLE_33=Auto ~value
+RID_TABLE_34=What do you want to name your table?
+RID_TABLE_35=Congratulations. You have entered all the information needed to create your table.
+RID_TABLE_36=What do you want to do next?
+RID_TABLE_37=Modify the table design
+RID_TABLE_38=Insert data immediately
+RID_TABLE_39=C~reate a form based on this table
+RID_TABLE_40=The table you have created could not be opened.
+RID_TABLE_41=The table name '%TABLENAME' contains a character ('%SPECIALCHAR') that might not be supported by the database.
+RID_TABLE_42=The field name '%FIELDNAME' contains a special character ('%SPECIALCHAR') that might not be supported by the database.
+RID_TABLE_43=Field
+RID_TABLE_44=MyTable
+RID_TABLE_45=Add a Field
+RID_TABLE_46=Remove the selected Field
+RID_TABLE_47=The field cannot be inserted because this would exceed the maximum number of %COUNT possible fields in the database table
+RID_TABLE_48=The name '%TABLENAME' already exists.\nPlease enter another name.
+RID_TABLE_49=Catalog of the table
+RID_TABLE_50=Schema of the table
+RID_TABLE_51=The field '%FIELDNAME' already exists.
STEP_ZERO_0=~Cancel
STEP_ZERO_1=~Help
STEP_ZERO_2=<<~Back
commit da543e4efbb53e25a60f8557a0b8cd307e46ebf4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 24 17:33:50 2017 +0100
convert starbasic wizards to .properties for translations
Change-Id: I165f85ee993995b54163061c7d378eea90eb276a
diff --git a/Repository.mk b/Repository.mk
index 2dd1d0867ac2..81dbcfbc9231 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1073,14 +1073,12 @@ $(eval $(call gb_Helper_register_resources,\
dkt \
editeng \
eps \
- eur \
for \
forui \
$(call gb_Helper_optional,DESKTOP,fps_office) \
frm \
fwe \
gal \
- imp \
ofa \
$(call gb_Helper_optional,DBCONNECTIVITY,pcr) \
pdffilter \
@@ -1101,7 +1099,6 @@ $(eval $(call gb_Helper_register_resources,\
svx \
sw \
t602filter \
- tpl \
upd \
uui \
vcl \
diff --git a/wizards/AllLangResTarget_eur.mk b/wizards/AllLangResTarget_eur.mk
deleted file mode 100644
index 48f470aca991..000000000000
--- a/wizards/AllLangResTarget_eur.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,eur))
-
-$(eval $(call gb_AllLangResTarget_add_srs,eur,\
- eur/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,eur/res))
-
-$(eval $(call gb_SrsTarget_add_files,eur/res,\
- wizards/source/euro/euro.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/AllLangResTarget_imp.mk b/wizards/AllLangResTarget_imp.mk
deleted file mode 100644
index 00c6a829326f..000000000000
--- a/wizards/AllLangResTarget_imp.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,imp))
-
-$(eval $(call gb_AllLangResTarget_add_srs,imp,\
- imp/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,imp/res))
-
-$(eval $(call gb_SrsTarget_add_files,imp/res,\
- wizards/source/importwizard/importwi.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk
deleted file mode 100644
index 65e3a52bce76..000000000000
--- a/wizards/AllLangResTarget_tpl.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,tpl))
-
-$(eval $(call gb_AllLangResTarget_add_srs,tpl,\
- tpl/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,tpl/res))
-
-$(eval $(call gb_SrsTarget_add_files,tpl/res,\
- wizards/source/template/template.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index be84a3c95cc5..c7bec56c3e38 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -44,9 +44,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
$(eval $(call gb_Module_add_l10n_targets,wizards,\
AllLangResTarget_dbw \
- AllLangResTarget_eur \
- AllLangResTarget_imp \
- AllLangResTarget_tpl \
))
ifeq ($(ENABLE_JAVA),TRUE)
diff --git a/wizards/source/euro/AutoPilotRun.xba b/wizards/source/euro/AutoPilotRun.xba
index b35cc056bb01..5c869459ebb8 100644
--- a/wizards/source/euro/AutoPilotRun.xba
+++ b/wizards/source/euro/AutoPilotRun.xba
@@ -45,7 +45,7 @@ Dim i As Integer
Dim oFactoryKey as Object
BasicLibraries.LoadLibrary("Tools")
BasicLibraries.LoadLibrary("ImportWizard")
- If InitResources("Euro Converter", "eur") Then
+ If InitResources("Euro Converter") Then
oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
oLocale = GetStarOfficeLocale()
InitializeConverter(oLocale, 2)
diff --git a/wizards/source/euro/ConvertRun.xba b/wizards/source/euro/ConvertRun.xba
index caf28efff5ce..5e4f06e01491 100644
--- a/wizards/source/euro/ConvertRun.xba
+++ b/wizards/source/euro/ConvertRun.xba
@@ -23,7 +23,7 @@ Public oPreSelRange as Object
Sub Main()
BasicLibraries.LoadLibrary("Tools")
- If InitResources("Euro Converter", "eur") Then
+ If InitResources("Euro Converter") Then
bDoUnProtect = False
bPreSelected = True
oDocument = ThisComponent
@@ -331,4 +331,4 @@ Sub SetStatusLineText(sStsREPROTECT as String)
oStatusline.SetText(sStsREPROTECT)
End If
End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index ccd63b754b2b..f8c2eac7e966 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -158,95 +158,95 @@ Sub InitializeResources()
Dim LocWorkPath as String
With DialogModel
' Strings that are also needed by the Password Dialog
- sGoOn = GetResText(1003)
- sHelp = GetResText(1001)
- sCANCEL = GetResText(1418)
- sEnd = GetResText(1000)
- sPROTECT = GetResText(1005)
- sCONTINUE = GetResText(1007)
- sSELTEMPL = GetResText(1106)
- sSELCELL = GetResText(1107)
- sCURRRANGES = GetResText(1108)
- sTEMPLATES = GetResText(1109)
- sStsPROGRESS = GetResText(1300)
- sStsCELLPROGRSS = GetResText(1301)
- sStsRELSHEETRANGES = GetResText(1302)
- sStsRELRANGES = GetResText(1303)
- sStsREPROTECT = GetResText(1304)
- sREADY = GetResText(1400)
- sMsgSELDIR = GetResText(1401)
- sMsgSELFILE = GetResText(1402)
- sMsgTARGETDIR = GetResText(1403)
- sMsgNOTTHERE = GetResText(1404)
- sMsgDLGTITLE = GetResText(1405)
- sMsgUNPROTECT = GetResText(1406)
- sMsgPWPROTECT = GetResText(1407)
- sMsgWRONGPW = GetResText(1408)
- sMsgSHEETPROTECTED = GetResText(1409)
- sMsgWARNING = GetResText(1410)
- sMsgSHEETSNOPROTECT = GetResText(1411)
- sMsgSHEETNOPROTECT = GetResText(1412)
- sMsgCHOOSECURRENCY = GetResText(1415)
- sMsgPASSWORD = GetResText(1416)
- sMsgOK = GetResText(1417)
- sMsgCANCEL = GetResText(1418)
- sMsgFILEINVALID = GetResText(1419)
+ sGoOn = GetResText("STEP_ZERO_3")
+ sHelp = GetResText("STEP_ZERO_1")
+ sCANCEL = GetResText("MESSAGES_18")
+ sEnd = GetResText("STEP_ZERO_0")
+ sPROTECT = GetResText("STEP_ZERO_5")
+ sCONTINUE = GetResText("STEP_ZERO_7")
+ sSELTEMPL = GetResText("STEP_CONVERTER_6")
+ sSELCELL = GetResText("STEP_CONVERTER_7")
+ sCURRRANGES = GetResText("STEP_CONVERTER_8")
+ sTEMPLATES = GetResText("STEP_CONVERTER_9")
+ sStsPROGRESS = GetResText("STATUSLINE_0")
+ sStsCELLPROGRSS = GetResText("STATUSLINE_1")
+ sStsRELSHEETRANGES = GetResText("STATUSLINE_2")
+ sStsRELRANGES = GetResText("STATUSLINE_3")
+ sStsREPROTECT = GetResText("STATUSLINE_4")
+ sREADY = GetResText("MESSAGES_0")
+ sMsgSELDIR = GetResText("MESSAGES_1")
+ sMsgSELFILE = GetResText("MESSAGES_2")
+ sMsgTARGETDIR = GetResText("MESSAGES_3")
+ sMsgNOTTHERE = GetResText("MESSAGES_4")
+ sMsgDLGTITLE = GetResText("MESSAGES_5")
+ sMsgUNPROTECT = GetResText("MESSAGES_6")
+ sMsgPWPROTECT = GetResText("MESSAGES_7")
+ sMsgWRONGPW = GetResText("MESSAGES_8")
+ sMsgSHEETPROTECTED = GetResText("MESSAGES_9")
+ sMsgWARNING = GetResText("MESSAGES_10")
+ sMsgSHEETSNOPROTECT = GetResText("MESSAGES_11")
+ sMsgSHEETNOPROTECT = GetResText("MESSAGES_12")
+ sMsgCHOOSECURRENCY = GetResText("MESSAGES_15")
+ sMsgPASSWORD = GetResText("MESSAGES_16")
+ sMsgOK = GetResText("MESSAGES_17")
+ sMsgCANCEL = GetResText("MESSAGES_18")
+ sMsgFILEINVALID = GetResText("MESSAGES_19")
sMsgFILEINVALID = ReplaceString(sMsgFILEINVALID,"%PRODUCTNAME", GetProductname())
- SMsgNODIRECTORY = GetResText(1420)
- sMsgDOCISREADONLY = GetResText(1421)
- sMsgFileExists = GetResText(1422)
- sMsgCancelConversion = GetResText(1423)
- sMsgCancelTitle = GetResText(1424)
- sCurrPORTUGUESE = GetResText(1500)
- sCurrDUTCH = GetResText(1501)
- sCurrFRENCH = GetResText(1502)
- sCurrSPANISH = GetResText(1503)
- sCurrITALIAN = GetResText(1504)
- sCurrGERMAN = GetResText(1505)
- sCurrBELGIAN = GetResText(1506)
- sCurrIRISH = GetResText(1507)
- sCurrLUXEMBOURG = GetResText(1508)
- sCurrAUSTRIAN = GetResText(1509)
- sCurrFINNISH = GetResText(1510)
- sCurrGREEK = GetResText(1511)
- sCurrSLOVENIAN = GetResText(1512)
- sCurrCYPRIOT = GetResText(1513)
- sCurrMALTESE = GetResText(1514)
- sCurrSLOVAK = GetResText(1515)
- sCurrESTONIAN = GetResText(1516)
- sCurrLATVIAN = GetResText(1517)
- sCurrLITHUANIAN = GetResText(1518)
+ SMsgNODIRECTORY = GetResText("MESSAGES_20")
+ sMsgDOCISREADONLY = GetResText("MESSAGES_21")
+ sMsgFileExists = GetResText("MESSAGES_22")
+ sMsgCancelConversion = GetResText("MESSAGES_23")
+ sMsgCancelTitle = GetResText("MESSAGES_24")
+ sCurrPORTUGUESE = GetResText("CURRENCIES_0")
+ sCurrDUTCH = GetResText("CURRENCIES_1")
+ sCurrFRENCH = GetResText("CURRENCIES_2")
+ sCurrSPANISH = GetResText("CURRENCIES_3")
+ sCurrITALIAN = GetResText("CURRENCIES_4")
+ sCurrGERMAN = GetResText("CURRENCIES_5")
+ sCurrBELGIAN = GetResText("CURRENCIES_6")
+ sCurrIRISH = GetResText("CURRENCIES_7")
+ sCurrLUXEMBOURG = GetResText("CURRENCIES_8")
+ sCurrAUSTRIAN = GetResText("CURRENCIES_9")
+ sCurrFINNISH = GetResText("CURRENCIES_10")
+ sCurrGREEK = GetResText("CURRENCIES_11")
+ sCurrSLOVENIAN = GetResText("CURRENCIES_12")
+ sCurrCYPRIOT = GetResText("CURRENCIES_13")
+ sCurrMALTESE = GetResText("CURRENCIES_14")
+ sCurrSLOVAK = GetResText("CURRENCIES_15")
+ sCurrESTONIAN = GetResText("CURRENCIES_16")
+ sCurrLATVIAN = GetResText("CURRENCIES_17")
+ sCurrLITHUANIAN = GetResText("CURRENCIES_18")
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
- .cmdBack.Label = GetResText(1002)
+ .cmdBack.Label = GetResText("STEP_ZERO_2")
.cmdGoOn.Label = sGOON
- .lblHint.Label = GetResText(1004)
- .lblCurrencies.Label = GetResText(1006)
+ .lblHint.Label = GetResText("STEP_ZERO_4")
+ .lblCurrencies.Label = GetResText("STEP_ZERO_6")
.cmdBack.Enabled = False
If .Step = 1 Then
- .chkComplete.Label = GetResText(1100)
- .hlnSelection.Label = GetResText(1101)
- .optCellTemplates.Label = GetResText(1102)
- .optSheetRanges.Label = GetResText(1103)
- .optDocRanges.Label = GetResText(1104)
- .optSelRange.Label = GetResText(1105)
- sCURRRANGES = GetResText(1108)
+ .chkComplete.Label = GetResText("STEP_CONVERTER_0")
+ .hlnSelection.Label = GetResText("STEP_CONVERTER_1")
+ .optCellTemplates.Label = GetResText("STEP_CONVERTER_2")
+ .optSheetRanges.Label = GetResText("STEP_CONVERTER_3")
+ .optDocRanges.Label = GetResText("STEP_CONVERTER_4")
+ .optSelRange.Label = GetResText("STEP_CONVERTER_5")
+ sCURRRANGES = GetResText("STEP_CONVERTER_8")
.lblSelection.Label = sCURRRANGES
Else
.lblProgress.Label = sStsPROGRESS
- .hlnExtent.Label = GetResText(1200)
- .optSingleFile.Label = GetResText(1201)
- .optWholeDir.Label = GetResText(1202)
- .chkProtect.Label = GetResText(1207)
- .chkTextDocuments.Label = GetResText(1210)
-
- sSOURCEFILE = GetResText(1203)
- sSOURCEDIR = GetResText(1204)
- .lblSource.Label = sSOURCEDIR
- sInclusiveSubDir = GetResText(1205)
- .chkRecursive.Label = sInclusiveSubDir
- sTARGETDIR = GetResText(1206)
- .lblTarget.Label = STARGETDIR
+ .hlnExtent.Label = GetResText("STEP_AUTOPILOT_0")
+ .optSingleFile.Label = GetResText("STEP_AUTOPILOT_1")
+ .optWholeDir.Label = GetResText("STEP_AUTOPILOT_2")
+ .chkProtect.Label = GetResText("STEP_AUTOPILOT_7")
+ .chkTextDocuments.Label = GetResText("STEP_AUTOPILOT_10")
+
+ sSOURCEFILE = GetResText("STEP_AUTOPILOT_3")
+ sSOURCEDIR = GetResText("STEP_AUTOPILOT_4")
+ .lblSource.Label = sSOURCEDIR
+ sInclusiveSubDir = GetResText("STEP_AUTOPILOT_5")
+ .chkRecursive.Label = sInclusiveSubDir
+ sTARGETDIR = GetResText("STEP_AUTOPILOT_6")
+ .lblTarget.Label = STARGETDIR
LocWorkPath = GetPathSettings("Work")
If Not oUcb.Exists(LocWorkPath) Then
@@ -258,11 +258,11 @@ Dim LocWorkPath as String
SubstDir = .txtSource.Text
.txtTarget.Text = .txtSource.Text
- .hlnProgress.Label = GetResText(1600)
- .lblConfig.Label = GetResText(1603)
- sPrgsRETRIEVAL = GetResText(1601)
- sPrgsCONVERTING = GetResText(1602)
- sPrgsUNPROTECT = GetResText(1604)
+ .hlnProgress.Label = GetResText("STEP_LASTPAGE_0")
+ .lblConfig.Label = GetResText("STEP_LASTPAGE_3")
+ sPrgsRETRIEVAL = GetResText("STEP_LASTPAGE_1")
+ sPrgsCONVERTING = GetResText("STEP_LASTPAGE_2")
+ sPrgsUNPROTECT = GetResText("STEP_LASTPAGE_4")
End If
End With
End Sub
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
deleted file mode 100644
index 6883861dd1b9..000000000000
--- a/wizards/source/euro/euro.src
+++ /dev/null
@@ -1,443 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define STEP_ZERO 1000
-#define STEP_CONVERTER 1100
-#define STEP_AUTOPILOT 1200
-#define STATUSLINE 1300
-#define MESSAGES 1400
-#define CURRENCIES 1500
-#define STEP_LASTPAGE 1600
-
-String STEP_ZERO
-{
-Text [ en-US ] = "~Cancel";
-};
-
-String STEP_ZERO + 1
-{
-Text [ en-US ] = "~Help";
-};
-
-String STEP_ZERO + 2
-{
-Text [ en-US ] = "<<~Back";
-};
-
-String STEP_ZERO + 3
-{
-Text [ en-US ] = "~Convert";
-};
-
-String STEP_ZERO + 4
-{
-Text [ en-US ] = "Note: Currency amounts from external links and currency conversion factors in formulas cannot be converted.";
-};
-
-String STEP_ZERO + 5
-{
-Text [ en-US ] = "First, unprotect all sheets.";
-};
-
-String STEP_ZERO + 6
-{
-Text [ en-US ] = "Currencies:";
-};
-
-String STEP_ZERO + 7
-{
-Text [ en-US ] = "C~ontinue>>";
-};
-
-String STEP_ZERO + 8
-{
-Text [ en-US ] = "C~lose";
-};
-
-String STEP_CONVERTER
-{
-Text [ en-US ] = "~Entire document";
-};
-
-String STEP_CONVERTER + 1
-{
-Text [ en-US ] = "Selection";
-};
-
-String STEP_CONVERTER + 2
-{
-Text [ en-US ] = "Cell S~tyles";
-};
-
-String STEP_CONVERTER + 3
-{
-Text [ en-US ] = "Currency cells in the current ~sheet";
-};
-
-String STEP_CONVERTER + 4
-{
-Text [ en-US ] = "Currency cells in the entire ~document";
-};
-
-String STEP_CONVERTER + 5
-{
-Text [ en-US ] = "~Selected range";
-};
-
-String STEP_CONVERTER + 6
-{
-Text [ en-US ] = "Select Cell Styles";
-};
-
-String STEP_CONVERTER + 7
-{
-Text [ en-US ] = "Select currency cells";
-};
-
-String STEP_CONVERTER + 8
-{
-Text [ en-US ] = "Currency ranges:";
-};
-
-String STEP_CONVERTER + 9
-{
-Text [ en-US ] = "Templates:";
-};
-
-String STEP_AUTOPILOT
-{
-Text [ en-US ] = "Extent";
-};
-
-String STEP_AUTOPILOT + 1
-{
-Text [ en-US ] = "~Single %PRODUCTNAME Calc document";
-};
-
-String STEP_AUTOPILOT + 2
-{
-Text [ en-US ] = "Complete ~directory";
-};
-
-String STEP_AUTOPILOT + 3
-{
-Text [ en-US ] = "Source Document:";
-};
-
-String STEP_AUTOPILOT + 4
-{
-Text [ en-US ] = "Source directory:";
-};
-
-String STEP_AUTOPILOT + 5
-{
-Text [ en-US ] = "~Including subfolders";
-};
-
-String STEP_AUTOPILOT + 6
-{
-Text [ en-US ] = "Target directory:";
-};
-
-String STEP_AUTOPILOT + 7
-{
-Text [ en-US ] = "Temporarily unprotect sheet without query";
-};
-
-String STEP_AUTOPILOT + 10
-{
-Text [ en-US ] = "Also convert fields and tables in text documents";
-};
-
-String STATUSLINE
-{
-Text [ en-US ] = "Conversion status: ";
-};
-
-String STATUSLINE + 1
-{
-Text [ en-US ] = "Conversion status of the cell templates:";
-};
-
-String STATUSLINE + 2
-{
-Text [ en-US ] = "Registration of the relevant ranges: Sheet %1Number%1 of %2TotPageCount%2";
-};
-
-String STATUSLINE + 3
-{
-Text [ en-US ] = "Entry of the ranges to be converted...";
-};
-
-String STATUSLINE + 4
-{
-Text [ en-US ] = "Sheet protection for each sheet will be restored...";
-};
-
-String STATUSLINE + 5
-{
-Text [ en-US ] = "Conversion of the currency units in the cell templates...";
-};
-
-String MESSAGES
-{
-Text [ en-US ] = "~Finish";
-};
-
-String MESSAGES + 1
-{
-Text [ en-US ] = "Select directory";
-};
-
-String MESSAGES + 2
-{
-Text [ en-US ] = "Select file";
-};
-
-String MESSAGES + 3
-{
-Text [ en-US ] = "Select target directory";
-};
-
-String MESSAGES + 4
-{
-Text [ en-US ] = "non-existent";
-};
-
-String MESSAGES + 5
-{
-Text [ en-US ] = "Euro Converter";
-};
-
-String MESSAGES + 6
-{
-Text [ en-US ] = "Should protected spreadsheets be temporarily unprotected?";
-};
-
-String MESSAGES + 7
-{
-Text [ en-US ] = "Enter the password to unprotect the table %1TableName%1";
-};
-
-String MESSAGES + 8
-{
-Text [ en-US ] = "Wrong Password!";
-};
-
-String MESSAGES + 9
-{
-Text [ en-US ] = "Protected Sheet";
-};
-
-String MESSAGES + 10
-{
-Text [ en-US ] = "Warning!";
-};
-
-String MESSAGES + 11
-{
-Text [ en-US ] = "Protection for the sheets will not be removed.";
-};
-
-String MESSAGES + 12
-{
-Text [ en-US ] = "Sheet cannot be unprotected";
-};
-
-String MESSAGES + 13
-{
-Text [ en-US ] = "The Wizard cannot edit this document as cell formats cannot be modified in documents containing protected spreadsheets.";
-};
-
-String MESSAGES + 14
-{
-Text [ en-US ] = "Please note that the Euro Converter will, otherwise, not be able to edit this document!";
-};
-
-String MESSAGES + 15
-{
-Text [ en-US ] = "Please choose a currency to be converted first!";
-};
-
-String MESSAGES + 16
-{
-Text [ en-US ] = "Password:";
-};
-
-String MESSAGES + 17
-{
-Text [ en-US ] = "OK";
-};
-
-String MESSAGES + 18
-{
-Text [ en-US ] = "Cancel";
-};
-
- String MESSAGES + 19
-{
-Text [ en-US ] = "Please select a %PRODUCTNAME Calc document for editing!";
-};
-
-String MESSAGES + 20
-{
-Text [ en-US ] = "'<1>' is not a directory!";
-};
-
-String MESSAGES + 21
-{
-Text [ en-US ] = "Document is read-only!";
-};
-
-String MESSAGES + 22
-{
- Text [ en-US ] = "The '<1>' file already exists.<CR>Do you want to overwrite it?";
-};
-
-String MESSAGES + 23
-{
- Text [ en-US ] = "Do you really want to terminate conversion at this point?";
-};
-
-String MESSAGES + 24
-{
- Text [ en-US ] = "Cancel Wizard";
-};
-
- String CURRENCIES
-{
-Text [ en-US ] = "Portuguese Escudo";
-};
-
-String CURRENCIES + 1
-{
-Text [ en-US ] = "Dutch Guilder";
-};
-
-String CURRENCIES + 2
-{
-Text [ en-US ] = "French Franc";
-};
-
-String CURRENCIES + 3
-{
-Text [ en-US ] = "Spanish Peseta";
-};
-
-String CURRENCIES + 4
-{
-Text [ en-US ] = "Italian Lira";
-};
-
-String CURRENCIES + 5
-{
-Text [ en-US ] = "German Mark";
-};
-
-String CURRENCIES + 6
-{
-Text [ en-US ] = "Belgian Franc";
-};
-
-String CURRENCIES + 7
-{
-Text [ en-US ] = "Irish Punt";
-};
-
-String CURRENCIES + 8
-{
-Text [ en-US ] = "Luxembourg Franc";
-};
-
-String CURRENCIES + 9
-{
-Text [ en-US ] = "Austrian Schilling";
-};
-
-String CURRENCIES + 10
-{
-Text [ en-US ] = "Finnish Mark";
-};
-
-String CURRENCIES + 11
-{
-Text [ en-US ] = "Greek Drachma";
-};
-
-String CURRENCIES + 12
-{
-Text [ en-US ] = "Slovenian Tolar";
-};
-
-String CURRENCIES + 13
-{
-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 ] = "Estonian Kroon";
-};
-
-String CURRENCIES + 17
-{
-Text [ en-US ] = "Latvian Lats";
-};
-
-String CURRENCIES + 18
-{
-Text [ en-US ] = "Lithuanian Litas";
-};
-
-String STEP_LASTPAGE
-{
-Text [ en-US ] = "Progress";
-};
-
-String STEP_LASTPAGE + 1
-{
-Text [ en-US ] = "Retrieving the relevant documents...";
-};
-
-String STEP_LASTPAGE + 2
-{
-Text [ en-US ] = "Converting the documents...";
-};
-
-String STEP_LASTPAGE + 3
-{
-Text [ en-US ] = "Settings:";
-};
-
-String STEP_LASTPAGE + 4
-{
-Text [ en-US ] = "Sheet is always unprotected";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index f32bba10edcd..a744014634a5 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -99,7 +99,7 @@ Dim LocList() as String
bEnableBinaryOptionGroup = False
bDisposeDoc = True
MaxIndex = -1
- If Not InitResources("Formwizard","dbw") Then
+ If Not InitResources("Formwizard") Then
Exit Sub
End If
oDBContext = CreateUnoService("com.sun.star.sdb.DatabaseContext")
diff --git a/wizards/source/formwizard/Language.xba b/wizards/source/formwizard/Language.xba
index 64cffae8b4d2..6346f8bae97a 100644
--- a/wizards/source/formwizard/Language.xba
+++ b/wizards/source/formwizard/Language.xba
@@ -20,9 +20,6 @@
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Language" script:language="StarBasic">Option Explicit
-Global Const RID_COMMON = 1000
-Global Const RID_FORM = 2200
-
Public Const SBCANCEL = 2
Public Const SBREPEAT = 4
Public LabelDiffHeight as Long
@@ -48,7 +45,7 @@ Dim sDateAppendix as String
Public sGoOn as String
Public sReady as String
Public sMsgNoConnection as String
-Public XPixelFactor as Long
+Public XPixelFactor as Long
Public YPixelFactor as Long
Public sSelectDatasource as String
Public sSelectDBTable as String
@@ -56,24 +53,24 @@ Public sSelectDBTable as String
Sub LoadLanguage ()
- sMsgWizardName = GetResText(RID_FORM + 0)
- sMsgErrMsg = GetResText(RID_COMMON + 6)
- sMsgErrNoDatabase = GetResText(RID_COMMON + 8)
- sMsgErrNoTableInDatabase = GetResText(RID_COMMON + 9)
- sMsgErrTitleSuggestedExist = GetResText(RID_COMMON + 10)
- sMsgErrTitleAsTableExist = GetResText(RID_COMMON + 10)
- sMsgErrTitleSyntaxError = GetResText(RID_COMMON + 11)
- sMsgNoConnection = GetResText(RID_COMMON + 14)
- sMsgProgressText = GetResText(RID_FORM + 2)
- sMsgCreatedForm = GetResText(RID_FORM + 26)
- sMsgErrNameToLong = GetResText (RID_FORM + 27)
- sMsgErrCouldNotOpenObject = GetResText (RID_COMMON + 13)
+ sMsgWizardName = GetResText("RID_FORM_0")
+ sMsgErrMsg = GetResText("RID_DB_COMMON_6")
+ sMsgErrNoDatabase = GetResText("RID_DB_COMMON_8")
+ sMsgErrNoTableInDatabase = GetResText("RID_DB_COMMON_9")
+ sMsgErrTitleSuggestedExist = GetResText("RID_DB_COMMON_10")
+ sMsgErrTitleAsTableExist = GetResText("RID_DB_COMMON_10")
+ sMsgErrTitleSyntaxError = GetResText("RID_DB_COMMON_11")
+ sMsgNoConnection = GetResText("RID_DB_COMMON_14")
+ sMsgProgressText = GetResText("RID_FORM_2")
+ sMsgCreatedForm = GetResText("RID_FORM_26")
+ sMsgErrNameToLong = GetResText("RID_FORM_27")
+ sMsgErrCouldNotOpenObject = GetResText("RID_DB_COMMON_13")
' Internal Logic
- sDateAppendix = GetResText(RID_FORM + 4)
- sTimeAppendix = GetResText(RID_FORM + 5)
-
- sReady = GetResText(RID_COMMON + 0)
+ sDateAppendix = GetResText("RID_FORM_4")
+ sTimeAppendix = GetResText("RID_FORM_5")
+
+ sReady = GetResText("RID_DB_COMMON_0")
End Sub
@@ -88,81 +85,81 @@ Dim slblFields as String
DlgFormDB = LoadDialog("FormWizard", "DlgFormDB")
DialogModel = DlgFormDB.Model
-
+
With DialogModel
- .cmdCancel.Label = GetResText(RID_COMMON + 1)
- .cmdBack.Label = GetResText(RID_COMMON + 2)
- .cmdHelp.Label = GetResText(RID_COMMON + 20)
- sGoOn = GetResText(RID_COMMON + 3)
+ .cmdCancel.Label = GetResText("RID_DB_COMMON_1")
+ .cmdBack.Label = GetResText("RID_DB_COMMON_2")
+ .cmdHelp.Label = GetResText("RID_DB_COMMON_20")
+ sGoOn = GetResText("RID_DB_COMMON_3")
.cmdGoOn.Label = sGoOn
- .lblTables.Label = GetResText(RID_FORM + 6)
+ .lblTables.Label = GetResText("RID_FORM_6")
- slblFields = GetResText(RID_FORM + 12)
- slblSelFields = GetResText(RID_FORM + 13)
+ slblFields = GetResText("RID_FORM_12")
+ slblSelFields = GetResText("RID_FORM_13")
.lblFields.Label = slblFields
.lblSelFields.Label = slblSelFields
- .lblStyles.Label = GetResText(RID_FORM + 21)
- .hlnBorderLayout.Label = GetResText(RID_FORM + 28)
- .hlnAlign.Label = GetResText(RID_FORM + 32)
- .hlnArrangements.Label = GetResText(RID_FORM + 35)
-
- WizardTitle(1) = sMsgWizardName & " - " & GetResText(RID_FORM + 45)
- WizardTitle(2) = sMsgWizardName & " - " & GetResText(RID_FORM + 46)
- WizardTitle(3) = sMsgWizardName & " - " & GetResText(RID_FORM + 47)
-
- .hlnBinaries.Label = GetResText(RID_FORM + 50)
- .optIgnoreBinaries.Label = GetResText(RID_FORM + 51)
- .optBinariesasGraphics.Label = GetResText(RID_FORM + 52)
-
- .hlnBackground.Label = GetResText(RID_FORM + 55)
- .optTiled.Label = GetResText(RID_FORM + 56)
- .optArea.Label = GetResText(RID_FORM + 57)
-
- .optBorder0.Label = GetResText(RID_FORM + 29)
- .optBorder1.Label = GetResText(RID_FORM + 30)
- .optBorder2.Label = GetResText(RID_FORM + 31)
+ .lblStyles.Label = GetResText("RID_FORM_21")
+ .hlnBorderLayout.Label = GetResText("RID_FORM_28")
+ .hlnAlign.Label = GetResText("RID_FORM_32")
+ .hlnArrangements.Label = GetResText("RID_FORM_35")
+
+ WizardTitle(1) = sMsgWizardName & " - " & GetResText("RID_FORM_45")
+ WizardTitle(2) = sMsgWizardName & " - " & GetResText("RID_FORM_46")
+ WizardTitle(3) = sMsgWizardName & " - " & GetResText("RID_FORM_47")
+
+ .hlnBinaries.Label = GetResText("RID_FORM_50")
+ .optIgnoreBinaries.Label = GetResText("RID_FORM_51")
+ .optBinariesasGraphics.Label = GetResText("RID_FORM_52")
+
+ .hlnBackground.Label = GetResText("RID_FORM_55")
+ .optTiled.Label = GetResText("RID_FORM_56")
+ .optArea.Label = GetResText("RID_FORM_57")
+
+ .optBorder0.Label = GetResText("RID_FORM_29")
+ .optBorder1.Label = GetResText("RID_FORM_30")
+ .optBorder2.Label = GetResText("RID_FORM_31")
.optBorder1.State = 1
-
- .optAlign0.Label = GetResText(RID_FORM + 33)
- .optAlign2.Label = GetResText(RID_FORM + 34)
+
+ .optAlign0.Label = GetResText("RID_FORM_33")
+ .optAlign2.Label = GetResText("RID_FORM_34")
.optAlign0.State = 1
-
+
REM//FIXME: Remove this unused FNameAddOn through the file
FNameAddOn = ""
- IDArray = Array(36, 37, 40, 38, 39)
+ IDArray = Array("RID_FORM_36", "RID_FORM_37", "RID_FORM_40", "RID_FORM_38", "RID_FORM_39")
For i = 1 To 5
- ButtonHelpText = GetResText(RID_FORM + IDArray(i-1))
+ ButtonHelpText = GetResText(IDArray(i-1))
cmdButton = DlgFormDB.getControl("cmdArrange" & i)
cmdButton.Model.ImageURL = FormPath & "Arrange_" & i & FNameAddOn & ".gif"
cmdButton.Model.HelpText = ButtonHelpText
cmdButton.getPeer().setProperty("AccessibleName", ButtonHelpText)
- Next i
+ Next i
' .cmdArrange1.ImageURL = FormPath & "Arrange_1" & FNameAddOn & ".gif"
-' .cmdArrange1.HelpText = GetResText(RID_FORM + 36)
+' .cmdArrange1.HelpText = GetResText("RID_FORM_36")
'
' .cmdArrange2.ImageURL = FormPath & "Arrange_2" & FNameAddOn & ".gif"
-' .cmdArrange2.HelpText = GetResText(RID_FORM + 37)
+' .cmdArrange2.HelpText = GetResText("RID_FORM_37")
'
' .cmdArrange3.ImageURL = FormPath & "Arrange_3" & FNameAddOn & ".gif"
-' .cmdArrange3.HelpText = GetResText(RID_FORM + 40)
+' .cmdArrange3.HelpText = GetResText("RID_FORM_40")
'
' .cmdArrange4.ImageURL = FormPath & "Arrange_4" & FNameAddOn & ".gif"
-' .cmdArrange4.HelpText = GetResText(RID_FORM + 38)
+' .cmdArrange4.HelpText = GetResText("RID_FORM_38")
'
' .cmdArrange5.ImageURL = FormPath & "Arrange_5" & FNameAddOn & ".gif"
-' .cmdArrange5.HelpText = GetResText(RID_FORM + 39)
+' .cmdArrange5.HelpText = GetResText("RID_FORM_39")
End With
- DlgFormDB.GetControl("cmdMoveSelected").getPeer().setProperty("AccessibleName", GetResText(RID_COMMON + 39))
- DlgFormDB.GetControl("cmdRemoveSelected").getPeer().setProperty("AccessibleName", GetResText(RID_COMMON + 40))
- DlgFormDB.GetControl("cmdMoveAll").getPeer().setProperty("AccessibleName", GetResText(RID_COMMON + 41))
- DlgFormDB.GetControl("cmdRemoveAll").getPeer().setProperty("AccessibleName", GetResText(RID_COMMON + 42))
+ DlgFormDB.GetControl("cmdMoveSelected").getPeer().setProperty("AccessibleName", GetResText("RID_DB_COMMON_39"))
+ DlgFormDB.GetControl("cmdRemoveSelected").getPeer().setProperty("AccessibleName", GetResText("RID_DB_COMMON_40"))
+ DlgFormDB.GetControl("cmdMoveAll").getPeer().setProperty("AccessibleName", GetResText("RID_DB_COMMON_41"))
+ DlgFormDB.GetControl("cmdRemoveAll").getPeer().setProperty("AccessibleName", GetResText("RID_DB_COMMON_42"))
DlgFormDB.getControl("lstFields").getPeer().setProperty("AccessibleName", DeleteStr(slblFields, "~"))
DlgFormDB.getControl("lstSelFields").getPeer().setProperty("AccessibleName", DeleteStr(slblSelFields, "~"))
-
- sSelectDatasource = GetResText(RID_COMMON + 37)
- sSelectDBTable = GetResText(RID_COMMON + 38)
+
+ sSelectDatasource = GetResText("RID_DB_COMMON_37")
+ sSelectDBTable = GetResText("RID_DB_COMMON_38")
End Sub
@@ -182,47 +179,47 @@ Sub InitializeWidthList()
WidthList(1,1) = cNumericBox
WidthList(1,2) = False
WidthList(1,3) = "FormattedField"
-
+
WidthList(2,0) = com.sun.star.sdbc.DataType.SMALLINT ' = 5;
WidthList(2,1) = cNumericBox
WidthList(2,2) = False
WidthList(2,3) = "FormattedField"
-
+
WidthList(3,0) = com.sun.star.sdbc.DataType.INTEGER ' = 4;
WidthList(3,1) = cNumericBox
WidthList(3,2) = False
WidthList(3,3) = "FormattedField"
-
+
WidthList(4,0) = com.sun.star.sdbc.DataType.BIGINT ' = -5;
WidthList(4,1) = cNumericBox
WidthList(4,2) = False
WidthList(4,3) = "FormattedField"
-
+
WidthList(5,0) = com.sun.star.sdbc.DataType.FLOAT ' = 6;
WidthList(5,1) = cNumericBox
WidthList(5,2) = False
WidthList(5,3) = "FormattedField"
-
+
WidthList(6,0) = com.sun.star.sdbc.DataType.REAL ' = 7;
WidthList(6,1) = cNumericBox
WidthList(6,2) = False
WidthList(6,3) = "FormattedField"
-
+
WidthList(7,0) = com.sun.star.sdbc.DataType.DOUBLE ' = 8;
WidthList(7,1) = cNumericBox
WidthList(7,2) = False
WidthList(7,3) = "FormattedField"
-
+
WidthList(8,0) = com.sun.star.sdbc.DataType.NUMERIC ' = 2;
WidthList(8,1) = cNumericBox
WidthList(8,2) = False
WidthList(8,3) = "FormattedField"
-
+
WidthList(9,0) = com.sun.star.sdbc.DataType.DECIMAL ' = 3; (including decimal places)
WidthList(9,1) = cNumericBox
WidthList(9,2) = False
WidthList(9,3) = "FormattedField"
-
+
WidthList(10,0) = com.sun.star.sdbc.DataType.CHAR ' = 1;
WidthList(10,1) = cTextBox
WidthList(10,2) = False
@@ -232,7 +229,7 @@ Sub InitializeWidthList()
WidthList(11,1) = cTextBox
WidthList(11,2) = True
WidthList(11,3) = "TextField"
-
+
WidthList(12,0) = com.sun.star.sdbc.DataType.LONGVARCHAR ' = -1;
WidthList(12,1) = cTextBox
WidthList(12,2) = True
@@ -242,12 +239,12 @@ Sub InitializeWidthList()
WidthList(13,1) = cDateBox
WidthList(13,2) = False
WidthList(13,3) = "DateField"
-
+
WidthList(14,0) = com.sun.star.sdbc.DataType.TIME ' = 92;
WidthList(14,1) = cTimeBox
WidthList(14,2) = False
WidthList(14,3) = "TimeField"
-
+
WidthList(15,0) = com.sun.star.sdbc.DataType.TIMESTAMP ' = 93;
WidthList(15,1) = cDateBox
WidthList(15,2) = False
@@ -262,7 +259,7 @@ Sub InitializeWidthList()
ImgWidthList(0,1) = cImageControl
ImgWidthList(0,2) = False
ImgWidthList(0,3) = "ImageControl"
-
+
ImgWidthList(1,0) = com.sun.star.sdbc.DataType.VARBINARY ' = -3;
ImgWidthList(1,1) = cImageControl
ImgWidthList(1,2) = False
diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index e55266985414..0bf782c6b12d 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -37,7 +37,6 @@ Public SOWorkPath As String
Public SOTemplatePath as String
Public bCancelTask As Boolean
Public bDoKeepApplValues as Boolean
-Public iApplSection as Integer
Public oUcb as Object
Public PathSeparator as String
@@ -311,14 +310,17 @@ End Sub
Sub SetupMSConfiguration()
- iApplSection = 0
Wizardmode = SBMICROSOFTMODE
MaxApplCount = 3
ApplCount = 3
' chkTemplatePath-Captions
- GetApplResourceArray(1009 + iApplSection, ApplCount, sTemplateCheckBox())
+ sTemplateCheckBox(0) = GetResText("MSTemplateCheckbox_1_")
+ sTemplateCheckBox(1) = GetResText("MSTemplateCheckbox_2_")
+ sTemplateCheckBox(2) = GetResText("MSTemplateCheckbox_3_")
' DocumentCheckbox- Captions
- GetApplResourceArray(1009 + iApplSection + ApplCount, ApplCount, sDocumentCheckBox())
+ sDocumentCheckBox(0) = GetResText("MSDocumentCheckbox_1_")
+ sDocumentCheckBox(1) = GetResText("MSDocumentCheckbox_2_")
+ sDocumentCheckBox(2) = GetResText("MSDocumentCheckbox_3_")
sKeyName(0) = "Software\Microsoft\Office\8.0\Word\Options"
sKeyName(1) = "Software\Microsoft\Office\8.0\Excel\Microsoft Excel"
@@ -400,10 +402,10 @@ Dim sShowPath as String
Dim oLocUcb as Object
oLocUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
If bGetResources Then
- If InitResources("ImportWizard","imp") then
- sNoDirCreation = GetResText(1050)
- sMsgDirNotThere = GetResText(1051)
- sQueryForNewCreation = GetResText(1052)
+ If InitResources("ImportWizard") then
+ sNoDirCreation = GetResText("NoDirCreation")
+ sMsgDirNotThere = GetResText("MsgDirNotThere")
+ sQueryForNewCreation = GetResText("QueryfornewCreation")
Else
CheckTextBoxPath() = False
Exit Function
diff --git a/wizards/source/importwizard/Language.xba b/wizards/source/importwizard/Language.xba
index 7d5038d653ba..bd890ed63788 100644
--- a/wizards/source/importwizard/Language.xba
+++ b/wizards/source/importwizard/Language.xba
@@ -55,82 +55,90 @@ Public ModuleList(3) as String
Public sLogSummary as String
Public sReeditMacro as String
Public sOverwriteallFiles as String
-Public scouldnotopenDocument as String
+Public sCouldnotopenDocument as String
Public sCurcouldnotopenDocument as String
-Public scouldnotsaveDocument as String
+Public sCouldnotsaveDocument as String
Public sCurcouldnotsaveDocument as String
Sub LoadLanguage()
- If InitResources("ImportWizard","imp") then
- sHelpButton = GetResText(1000)
- sCancelButton = GetResText(1001)
- sBackButton = GetResText(1002)
- sNextButton = GetResText(1003)
- sBeginButton = GetResText(1004)
- sCloseButton = GetResText(1005)
-
- sWelcometextLabel1 = ReplaceString(GetResText(1006), GetProductName(),"%PRODUCTNAME")
- sWelcometextLabel3 = GetResText(1008)
+ If InitResources("ImportWizard") then
+ sHelpButton = GetResText("HelpButton")
+ sCancelButton = GetResText("CancelButton")
+ sBackButton = GetResText("BackButton")
+ sNextButton = GetResText("NextButton")
+ sBeginButton = GetResText("BeginButton")
+ sCloseButton = GetResText("CloseButton")
+
+ sWelcometextLabel1 = ReplaceString(GetResText("WelcometextLabel1"), GetProductName(),"%PRODUCTNAME")
+ sWelcometextLabel3 = GetResText("WelcometextLabel3")
' Microsoft Documents
- GetApplResourceArray(1009, 3, sMSTemplateCheckBox())
+ sMSTemplateCheckBox(0) = GetResText("MSTemplateCheckbox_1_")
+ sMSTemplateCheckBox(1) = GetResText("MSTemplateCheckbox_2_")
+ sMSTemplateCheckBox(2) = GetResText("MSTemplateCheckbox_3_")
' DocumentCheckbox- Captions
- GetApplResourceArray(1012, 3, sMSDocumentCheckBox())
+ sMSDocumentCheckBox(0) = GetResText("MSDocumentCheckbox_1_")
+ sMSDocumentCheckBox(1) = GetResText("MSDocumentCheckbox_2_")
+ sMSDocumentCheckBox(2) = GetResText("MSDocumentCheckbox_3_")
'StarOffice Applicationnames
- sContainerName(0) = GetResText(1030)
-
- sSummaryHeader = GetResText(1031)
+ sContainerName(0) = GetResText("MSContainerName")
+
+ sSummaryHeader = GetResText("SummaryHeader")
- sTemplateGroupName = GetResText(1036)
+ sTemplateGroupName = GetResText("GroupnameDefault")
- sProgressMoreDocs = GetResText(1041)
- sProgressMoreTemplates = GetResText(1042)
- sNoDirCreation = GetResText(1050)
- sMsgDirNotThere = GetResText(1051)
- sQueryForNewCreation = GetResText(1052)
- sFileExists = GetResText(1053)
- sMorePathsError3 = GetResText(1054)
- sConvertError1 = GetResText(1055)
- sConvertError2 = GetResText(1056)
- sRTErrorDesc = GetResText(1057)
- sRTErrorHeader = GetResText(1058)
- sOverwriteallFiles = GetResText(1070)
- sReeditMacro = GetResText(1071)
- scouldnotsaveDocument = GetResText(1072)
- scouldnotopenDocument = GetResText(1073)
- sPathDialogMessage = GetResText(1080)
- sTitle = GetResText(1081)
+ sProgressMoreDocs = GetResText("ProgressMoreDocs")
+ sProgressMoreTemplates = GetResText("ProgressMoreTemplates")
+ sNoDirCreation = GetResText("NoDirCreation")
+ sMsgDirNotThere = GetResText("MsgDirNotThere")
+ sQueryForNewCreation = GetResText("QueryfornewCreation")
+ sFileExists = GetResText("FileExists")
+ sMorePathsError3 = GetResText("MorePathsError3")
+ sConvertError1 = GetResText("ConvertError1")
+ sConvertError2 = GetResText("ConvertError2")
+ sRTErrorDesc = GetResText("RTErrorDesc")
+ sRTErrorHeader = GetResText("RTErrorHeader")
+ sOverwriteallFiles = GetResText("OverwriteallFiles")
+ sReeditMacro = GetResText("ReeditMacro")
+ sCouldnotsaveDocument = GetResText("CouldNotsaveDocument")
+ sCouldnotopenDocument = GetResText("CouldNotopenDocument")
+ sPathDialogMessage = GetResText("PathDialogMessage")
+ sTitle = GetResText("DialogTitle")
- sProgressPage_1 = GetResText(1090)
- sProgressPage_2 = GetResText(1091)
- sProgressPage_3 = GetResText(1092)
- sProgressFound = GetResText(1093)
- sProgressPage_5 = GetResText(1094)
- sReady = GetResText(1100)
- sSourceDocuments = GetResText(2030)
- sTargetDocuments = GetResText(2031)
- sLogSummary = GetResText(2034)
- sSumInclusiveSubDir = GetResText(3000)
- sSumSaveDocuments = GetResText(3001)
- GetApplResourceArray(3200, 3, sSumMSDocuments())
- GetApplResourceArray(3210, 3, sSumMSTemplates())
+ sProgressPage_1 = GetResText("ProgressPage1")
+ sProgressPage_2 = GetResText("ProgressPage2")
+ sProgressPage_3 = GetResText("ProgressPage3")
+ sProgressFound = GetResText("ProgressFound")
+ sProgressPage_5 = GetResText("ProgressPage5")
+ sReady = GetResText("Ready")
+ sSourceDocuments = GetResText("SourceDocuments")
+ sTargetDocuments = GetResText("TargetDocuments")
+ sLogSummary = GetResText("LogfileSummary")
+ sSumInclusiveSubDir = GetResText("SumInclusiveSubDir")
+ sSumSaveDocuments = GetResText("SumSaveDokumente")
+ sSumMSDocuments(0) = GetResText("SumMSTextDocuments")
+ sSumMSDocuments(1) = GetResText("SumMSTableDocuments")
+ sSumMSDocuments(2) = GetResText("SumMSDrawDocuments")
+ sSumMSTemplates(0) = GetResText("SumMSTextTemplates")
+ sSumMSTemplates(1) = GetResText("SumMSTableTemplates")
+ sSumMSTemplates(2) = GetResText("SumMSDrawTemplates")
With ImportDialog
- sImportLabel = GetResText(1033)
- sExportLabel = GetResText(1034)
- sSearchInSubDir = GetResText(1022)
+ sImportLabel = GetResText("TextImportLabel")
+ sExportLabel = GetResText("TextExportLabel")
+ sSearchInSubDir = GetResText("SearchInSubDir")
.chkTemplateSearchSubDir.Label = sSearchInSubDir
.lblDocumentImport.Label = sImportLabel
.lblDocumentExport.Label = sExportLabel
.chkDocumentSearchSubDir.Label = sSearchInSubDir
.lblTemplateImport.Label = sImportLabel
.lblTemplateExport.Label = sExportLabel
- .chkLogfile.Label = GetResText(2032)
- .chkLogfile.Helptext = GetResText(2033)
- .cmdShowLogFile.Label = GetResText(2035)
+ .chkLogfile.Label = GetResText("CreateLogfile")
+ .chkLogfile.Helptext = GetResText("LogfileHelpText")
+ .cmdShowLogFile.Label = GetResText("ShowLogfile")
End With
ModuleList(0) = "com.sun.star.text.TextDocument"
ModuleList(1) = "com.sun.star.sheet.SpreadsheetDocument"
@@ -139,14 +147,4 @@ Sub LoadLanguage()
End If
End Sub
-
-Sub GetApplResourceArray(StartResIndex as Integer, Count as Integer, BigArray())
-Dim i as Integer
-Dim a as Integer
- a = 0
- For i = StartResIndex To StartResIndex + Count-1
- BigArray(a) = GetResText(i)
- a = a + 1
- Next
-End Sub
</script:module>
diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src
deleted file mode 100644
index 8f5fa58c0834..000000000000
--- a/wizards/source/importwizard/importwi.src
+++ /dev/null
@@ -1,379 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define sHelpButton 1000
-#define sCancelButton 1001
-#define sBackButton 1002
-#define sNextButton 1003
-#define sBeginButton 1004
-#define sCloseButton 1005
-#define sWelcometextLabel1 1006
-#define sWelcometextLabel3 1008
-#define sMSTemplateCheckbox_1_ 1009
-#define sMSTemplateCheckbox_2_ 1010
-#define sMSTemplateCheckbox_3_ 1011
-#define sMSDocumentCheckbox_1_ 1012
-#define sMSDocumentCheckbox_2_ 1013
-#define sMSDocumentCheckbox_3_ 1014
-#define sSearchInSubDir 1022
-#define sMSContainerName 1030
-#define sSummaryHeader 1031
-#define sTextImportLabel 1033
-#define sTextExportLabel 1034
-#define sGroupnameDefault 1036
-#define sProgressDesc1 1039
-#define sProgressOneDoc 1040
-#define sProgressMoreDocs 1041
-#define sProgressMoreTemplates 1042
-#define sNoDirCreation 1050
-#define sMsgDirNotThere 1051
-#define sQueryfornewCreation 1052
-#define sFileExists 1053
-#define sMorePathsError3 1054
-#define sConvertError1 1055
-#define sConvertError2 1056
-#define sRTErrorDesc 1057
-#define sRTErrorHeader 1058
-#define sOverwriteallFiles 1070
-#define sreeditMacro 1071
-#define scouldNotsaveDocument 1072
-#define scouldNotopenDocument 1073
-#define sPathDialogMessage 1080
-#define sDialogTitle 1081
-#define sProgressPage1 1090
-#define sProgressPage2 1091
-#define sProgressPage3 1092
-#define sProgressFound 1093
-#define sProgressPage5 1094
-#define sReady 1100
-
-#define sSourceDocuments 2030
-#define sTargetDocuments 2031
-#define sCreateLogfile 2032
-#define sLogfileHelpText 2033
-#define sLogfileSummary 2034
-#define sshowLogfile 2035
-
-#define sSumInclusiveSubDir 3000
-#define sSumSaveDokumente 3001
-
-#define sSumMSTextDocuments 3200
-#define sSumMSTableDocuments 3201
-#define sSumMSDrawDocuments 3202
-
-#define sSumMSTextTemplates 3210
-#define sSumMSTableTemplates 3211
-#define sSumMSDrawTemplates 3212
-
-String sHelpButton
-{
- Text [ en-US ] = "~Help";
-};
-
-String sCancelButton
-{
- Text [ en-US ] = "~Cancel";
-};
-
-String sBackButton
-{
- Text [ en-US ] = "<< ~Back";
-};
-
-String sNextButton
-{
- Text [ en-US ] = "Ne~xt >>";
-};
-
-String sBeginButton
-{
- Text [ en-US ] = "~Convert";
-};
-
-String sCloseButton
-{
- Text [ en-US ] = "~Close";
-};
-
-String sWelcometextLabel1
-{
- Text [ en-US ] = "This wizard convert legacy format documents to Open Document Format for Office Applications.";
-};
-
-String sWelcometextLabel3
-{
- Text [ en-US ] = "Select the document type for conversion:";
-};
-
-String sMSTemplateCheckbox_1_
-{
- Text [ en-US ] = "Word templates";
-};
-
-String sMSTemplateCheckbox_2_
-{
- Text [ en-US ] = "Excel templates";
-};
-
-String sMSTemplateCheckbox_3_
-{
- Text [ en-US ] = "PowerPoint templates";
-};
-
-String sMSDocumentCheckbox_1_
-{
- Text [ en-US ] = "Word documents";
-};
-
-String sMSDocumentCheckbox_2_
-{
- Text [ en-US ] = "Excel documents";
-};
-
-String sMSDocumentCheckbox_3_
-{
- Text [ en-US ] = "PowerPoint/Publisher documents";
-};
-
-String sSearchInSubDir
-{
- Text [ en-US ] = "Including subdirectories";
-};
-
-String sMSContainerName
-{
- Text [ en-US ] = "Microsoft Office";
-};
-
-String sSummaryHeader
-{
- Text [ en-US ] = "Summary:";
-};
-
-String sTextImportLabel
-{
- Text [ en-US ] = "Import from:";
-};
-
-String sTextExportLabel
-{
- Text [ en-US ] = "Save to:";
-};
-
-String sGroupnameDefault
-{
- Text [ en-US ] = "Imported_Templates";
-};
-
-String sProgressDesc1
-{
- Text [ en-US ] = "Progress: ";
-};
-
-String sProgressOneDoc
-{
- Text [ en-US ] = "Document";
-};
-
-String sProgressMoreDocs
-{
- Text [ en-US ] = "Documents";
-};
-
-String sProgressMoreTemplates
-{
- Text [ en-US ] = "Templates";
-};
-
-String sNoDirCreation
-{
- Text [ en-US ] = "The '%1' directory cannot be created: ";
-};
-
-String sMsgDirNotThere
-{
- Text [ en-US ] = "The '%1' directory does not exist.";
-};
-
-String sQueryfornewCreation
-{
- Text [ en-US ] = "Do you want to create it now?";
-};
-
-String sFileExists
-{
- Text [ en-US ] = "The '<1>' file already exists.<CR>Do you want to overwrite it?";
-};
-
-String sMorePathsError3
-{
- Text [ en-US ] = "Directories do not exist";
-};
-
-String sOverwriteallFiles
-{
- Text [ en-US ] = "Do you want to overwrite documents without being asked?";
-};
-
-String sreeditMacro
-{
- Text [ en-US ] = "Document macro has to be revised.";
-};
-
-String scouldNotsaveDocument
-{
- Text [ en-US ] = "Document '<1>' could not be saved.";
-};
-
-String scouldNotopenDocument
-{
- Text [ en-US ] = "Document '<1>' could not be opened.";
-};
-
-String sConvertError1
-{
- Text [ en-US ] = "Do you really want to terminate conversion at this point?";
-};
-
-String sConvertError2
-{
- Text [ en-US ] = "Cancel Wizard";
-};
-
-String sRTErrorDesc
-{
- Text [ en-US ] = "An unexpected error has occurred in the wizard.";
-};
-
-String sRTErrorHeader
-{
- Text [ en-US ] = "Error";
-};
-
-String sPathDialogMessage
-{
- Text [ en-US ] = "Select a directory";
-};
-
-String sDialogTitle
-{
- Text [ en-US ] = "Document Converter";
-};
-
-String sProgressPage1
-{
- Text [ en-US ] = "Progress";
-};
-
-String sProgressPage2
-{
- Text [ en-US ] = "Retrieving the relevant documents:";
-};
-
-String sProgressPage3
-{
- Text [ en-US ] = "Converting the documents";
-};
-
-String sProgressFound
-{
- Text [ en-US ] = "Found:";
-};
-
-String sProgressPage5
-{
- Text [ en-US ] = "%1 found";
-};
-
-String sReady
-{
- Text [ en-US ] = "Finished";
-};
-
-String sSourceDocuments
-{
- Text [ en-US ] = "Source documents";
-};
-
-String sTargetDocuments
-{
- Text [ en-US ] = "Target documents";
-};
-
-String sCreateLogfile
-{
- Text [ en-US ] = "Create log file";
-};
-
-String sLogfileSummary
-{
- Text [ en-US ] = "<COUNT> documents converted";
-};
-
-String sLogfileHelpText
-{
- Text [ en-US ] = "A log file will be created in your work directory";
-};
-
-String sshowLogfile
-{
- Text [ en-US ] = "Show log file";
-};
-
-String sSumInclusiveSubDir
-{
- Text [ en-US ] = "All subdirectories will be taken into account";
-};
-
-String sSumSaveDokumente
-{
- Text [ en-US ] = "These will be exported to the following directory:";
-};
-
-String sSumMSTextDocuments
-{
- Text [ en-US ] = "All Word documents contained in the following directory will be imported:";
-};
-
-String sSumMSTableDocuments
-{
- Text [ en-US ] = "All Excel documents contained in the following directory will be imported:";
-};
-
-String sSumMSDrawDocuments
-{
- Text [ en-US ] = "All PowerPoint/Publisher documents contained in the following directory will be imported:";
-};
-
-String sSumMSTextTemplates
-{
- Text [ en-US ] = "All Word templates contained in the following directory will be imported:";
-};
-
-String sSumMSTableTemplates
-{
- Text [ en-US ] = "All Excel templates contained in the following directory will be imported:";
-};
-
-String sSumMSDrawTemplates
-{
- Text [ en-US ] = "All PowerPoint templates contained in the following directory will be imported:";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
index c9346eb7834b..15c3646217d5 100644
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -156,6 +156,12 @@ RID_DB_COMMON_3=~Next >>
RID_DB_COMMON_4=~Database
RID_DB_COMMON_5=~Table name
RID_DB_COMMON_6=An error occurred while running the wizard. The wizard will be terminated.
+RID_DB_COMMON_8=No database has been installed. At least one database is required before the wizard for forms can be started.
+RID_DB_COMMON_9=The database does not contain any tables.
+RID_DB_COMMON_10=This title already exists in the database. Please enter another name.
+RID_DB_COMMON_11=The title must not contain any spaces or special characters.
+RID_DB_COMMON_12=The database service (com.sun.data.DatabaseEngine) could not be instantiated.
+RID_DB_COMMON_13=The selected table or query could not be opened.
RID_DB_COMMON_14=No connection to the database could be established.
RID_DB_COMMON_20=~Help
RID_DB_COMMON_21=~Stop
@@ -364,3 +370,210 @@ RID_DB_TABLE_WIZARD_START_48=The name '%TABLENAME' already exists.\nPlease enter
RID_DB_TABLE_WIZARD_START_49=Catalog of the table
RID_DB_TABLE_WIZARD_START_50=Schema of the table
RID_DB_TABLE_WIZARD_START_51=The field '%FIELDNAME' already exists.
+STEP_ZERO_0=~Cancel
+STEP_ZERO_1=~Help
+STEP_ZERO_2=<<~Back
+STEP_ZERO_3=~Convert
+STEP_ZERO_4=Note: Currency amounts from external links and currency conversion factors in formulas cannot be converted.
+STEP_ZERO_5=First, unprotect all sheets.
+STEP_ZERO_6=Currencies:
+STEP_ZERO_7=C~ontinue>>
+STEP_ZERO_8=C~lose
+STEP_CONVERTER_0=~Entire document
+STEP_CONVERTER_1=Selection
+STEP_CONVERTER_2=Cell S~tyles
+STEP_CONVERTER_3=Currency cells in the current ~sheet
+STEP_CONVERTER_4=Currency cells in the entire ~document
+STEP_CONVERTER_5=~Selected range
+STEP_CONVERTER_6=Select Cell Styles
+STEP_CONVERTER_7=Select currency cells
+STEP_CONVERTER_8=Currency ranges:
+STEP_CONVERTER_9=Templates:
+STEP_AUTOPILOT_0=Extent
+STEP_AUTOPILOT_1=~Single %PRODUCTNAME Calc document
+STEP_AUTOPILOT_2=Complete ~directory
+STEP_AUTOPILOT_3=Source Document:
+STEP_AUTOPILOT_4=Source directory:
+STEP_AUTOPILOT_5=~Including subfolders
+STEP_AUTOPILOT_6=Target directory:
+STEP_AUTOPILOT_7=Temporarily unprotect sheet without query
+STEP_AUTOPILOT_10=Also convert fields and tables in text documents
+STATUSLINE_0=Conversion status:
+STATUSLINE_1=Conversion status of the cell templates:
+STATUSLINE_2=Registration of the relevant ranges: Sheet %1Number%1 of %2TotPageCount%2
+STATUSLINE_3=Entry of the ranges to be converted...
+STATUSLINE_4=Sheet protection for each sheet will be restored...
+STATUSLINE_5=Conversion of the currency units in the cell templates...
+MESSAGES_0=~Finish
+MESSAGES_1=Select directory
+MESSAGES_2=Select file
+MESSAGES_3=Select target directory
+MESSAGES_4=non-existent
+MESSAGES_5=Euro Converter
+MESSAGES_6=Should protected spreadsheets be temporarily unprotected?
+MESSAGES_7=Enter the password to unprotect the table %1TableName%1
+MESSAGES_8=Wrong Password!
+MESSAGES_9=Protected Sheet
+MESSAGES_10=Warning!
+MESSAGES_11=Protection for the sheets will not be removed.
+MESSAGES_12=Sheet cannot be unprotected
+MESSAGES_13=The Wizard cannot edit this document as cell formats cannot be modified in documents containing protected spreadsheets.
+MESSAGES_14=Please note that the Euro Converter will, otherwise, not be able to edit this document!
+MESSAGES_15=Please choose a currency to be converted first!
+MESSAGES_16=Password:
+MESSAGES_17=OK
+MESSAGES_18=Cancel
+MESSAGES_19=Please select a %PRODUCTNAME Calc document for editing!
+MESSAGES_20='<1>' is not a directory!
+MESSAGES_21=Document is read-only!
+MESSAGES_22=The '<1>' file already exists.<CR>Do you want to overwrite it?
+MESSAGES_23=Do you really want to terminate conversion at this point?
+MESSAGES_24=Cancel Wizard
+CURRENCIES_0=Portuguese Escudo
+CURRENCIES_1=Dutch Guilder
+CURRENCIES_2=French Franc
+CURRENCIES_3=Spanish Peseta
+CURRENCIES_4=Italian Lira
+CURRENCIES_5=German Mark
+CURRENCIES_6=Belgian Franc
+CURRENCIES_7=Irish Punt
+CURRENCIES_8=Luxembourg Franc
+CURRENCIES_9=Austrian Schilling
+CURRENCIES_10=Finnish Mark
+CURRENCIES_11=Greek Drachma
+CURRENCIES_12=Slovenian Tolar
+CURRENCIES_13=Cypriot Pound
+CURRENCIES_14=Maltese Lira
+CURRENCIES_15=Slovak Koruna
+CURRENCIES_16=Estonian Kroon
+CURRENCIES_17=Latvian Lats
+CURRENCIES_18=Lithuanian Litas
+STEP_LASTPAGE_0=Progress
+STEP_LASTPAGE_1=Retrieving the relevant documents...
+STEP_LASTPAGE_2=Converting the documents...
+STEP_LASTPAGE_3=Settings:
+STEP_LASTPAGE_4=Sheet is always unprotected
+STYLES_0=Theme Selection
+STYLES_1=Error while saving the document to the clipboard! The following action cannot be undone.
+STYLES_2=~Cancel
+STYLES_3=~OK
+STYLENAME_0=(Standard)
+STYLENAME_1=Autumn Leaves
+STYLENAME_2=Be
+STYLENAME_3=Black and White
+STYLENAME_4=Blackberry Bush
+STYLENAME_5=Blue Jeans
+STYLENAME_6=Fifties Diner
+STYLENAME_7=Glacier
+STYLENAME_8=Green Grapes
+STYLENAME_9=Marine
+STYLENAME_10=Millennium
+STYLENAME_11=Nature
+STYLENAME_12=Neon
+STYLENAME_13=Night
+STYLENAME_14=PC Nostalgia
+STYLENAME_15=Pastel
+STYLENAME_16=Pool Party
+STYLENAME_17=Pumpkin
+CorrespondenceDialog_0=Addressee
+CorrespondenceDialog_1=One recipient
+CorrespondenceDialog_2=Several recipients (address database)
+CorrespondenceDialog_3=Use of This Template
+CorrespondenceMsgError=An error has occurred.
+CorrespondenceFields_0=Click placeholder and overwrite
+CorrespondenceFields_1=Company
+CorrespondenceFields_2=Department
+CorrespondenceFields_3=First Name
+CorrespondenceFields_4=Last Name
+CorrespondenceFields_5=Street
+CorrespondenceFields_6=Country
+CorrespondenceFields_7=ZIP/Postal Code
+CorrespondenceFields_8=City
+CorrespondenceFields_9=Title
+CorrespondenceFields_10=Position
+CorrespondenceFields_11=Form of Address
+CorrespondenceFields_12=Initials
+CorrespondenceFields_13=Salutation
+CorrespondenceFields_14=Home Phone
+CorrespondenceFields_15=Work Phone
+CorrespondenceFields_16=Fax
+CorrespondenceFields_17=E-Mail
+CorrespondenceFields_18=URL
+CorrespondenceFields_19=Notes
+CorrespondenceFields_20=Alt. Field 1
+CorrespondenceFields_21=Alt. Field 2
+CorrespondenceFields_22=Alt. Field 3
+CorrespondenceFields_23=Alt. Field 4
+CorrespondenceFields_24=ID
+CorrespondenceFields_25=State
+CorrespondenceFields_26=Office Phone
+CorrespondenceFields_27=Pager
+CorrespondenceFields_28=Mobile Phone
+CorrespondenceFields_29=Other Phone
+CorrespondenceFields_30=Calendar URL
+CorrespondenceFields_31=Invite
+CorrespondenceNoTextmark_0=The bookmark 'Recipient' is missing.
+CorrespondenceNoTextmark_1=Form letter fields can not be included.
+AgendaDlgName=Minutes Template
+AgendaDlgNoCancel=An option must be confirmed.
+AgendaDlgFrame=Minutes Type
+AgendaDlgButton1=Results Minutes
+AgendaDlgButton2=Evaluation Minutes
+TextField=User data field is not defined!
+NoDirCreation=The '%1' directory cannot be created:
+MsgDirNotThere=The '%1' directory does not exist.
+QueryfornewCreation=Do you want to create it now?
+HelpButton=~Help
+CancelButton=~Cancel
+BackButton=<< ~Back
+NextButton=Ne~xt >>
+BeginButton=~Convert
+CloseButton=~Close
+WelcometextLabel1=This wizard convert legacy format documents to Open Document Format for Office Applications.
+WelcometextLabel3=Select the document type for conversion:
+MSTemplateCheckbox_1_=Word templates
+MSTemplateCheckbox_2_=Excel templates
+MSTemplateCheckbox_3_=PowerPoint templates
+MSDocumentCheckbox_1_=Word documents
+MSDocumentCheckbox_2_=Excel documents
+MSDocumentCheckbox_3_=PowerPoint/Publisher documents
+MSContainerName=Microsoft Office
+SummaryHeader=Summary:
+GroupnameDefault=Imported_Templates
+ProgressMoreDocs=Documents
+ProgressMoreTemplates=Templates
+FileExists=The '<1>' file already exists.<CR>Do you want to overwrite it?
+MorePathsError3=Directories do not exist
+ConvertError1=Do you really want to terminate conversion at this point?
+ConvertError2=Cancel Wizard
+RTErrorDesc=An unexpected error has occurred in the wizard.
+RTErrorHeader=Error
+OverwriteallFiles=Do you want to overwrite documents without being asked?
+ReeditMacro=Document macro has to be revised.
+CouldNotsaveDocument=Document '<1>' could not be saved.
+CouldNotopenDocument=Document '<1>' could not be opened.
+PathDialogMessage=Select a directory
+DialogTitle=Document Converter
+SearchInSubDir=Including subdirectories
+ProgressPage1=Progress
+ProgressPage2=Retrieving the relevant documents:
+ProgressPage3=Converting the documents
+ProgressFound=Found:
+ProgressPage5="%1 found
+Ready=Finished
+SourceDocuments=Source documents
+TargetDocuments=Target documents
+LogfileSummary=<COUNT> documents converted
+SumInclusiveSubDir=All subdirectories will be taken into account
+SumSaveDokumente=These will be exported to the following directory:
+TextImportLabel=Import from:
+TextExportLabel=Save to:
+CreateLogfile=Create log file
+LogfileHelpText=A log file will be created in your work directory
+ShowLogfile=Show log file
+SumMSTextDocuments=All Word documents contained in the following directory will be imported:
+SumMSTableDocuments=All Excel documents contained in the following directory will be imported:
+SumMSDrawDocuments=All PowerPoint/Publisher documents contained in the following directory will be imported:
+SumMSTextTemplates=All Word templates contained in the following directory will be imported:
+SumMSTableTemplates=All Excel templates contained in the following directory will be imported:
+SumMSDrawTemplates=All PowerPoint templates contained in the following directory will be imported:
diff --git a/wizards/source/template/Autotext.xba b/wizards/source/template/Autotext.xba
index f99a54f13f65..35b3fdf62ce4 100644
--- a/wizards/source/template/Autotext.xba
+++ b/wizards/source/template/Autotext.xba
@@ -41,9 +41,9 @@ Sub Main()
On Local Error Goto GENERALERROR
' Initialization...
BasicLibraries.LoadLibrary("Tools")
- If InitResources("'Template'", "tpl") Then
- sGeneralError = GetResText(1302)
- sTextFieldNotDefined = GetResText(1400)
+ If InitResources("'Template'") Then
+ sGeneralError = GetResText("CorrespondenceMsgError")
+ sTextFieldNotDefined = GetResText("TextField")
End If
UserfieldDatatype(0) = "COMPANY"
@@ -187,4 +187,4 @@ Sub CreatePlaceholder(oCursor as Object, sFoundContent as String)
End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/template/Correspondence.xba b/wizards/source/template/Correspondence.xba
index 0d98846436a1..01da7f3d83e7 100644
--- a/wizards/source/template/Correspondence.xba
+++ b/wizards/source/template/Correspondence.xba
@@ -59,16 +59,16 @@ End Sub
Function LoadLanguageCorrespondence() as Boolean
- If InitResources("'Template'", "tpl") Then
- msgNoTextmark$ = GetResText(1303) & Chr(13) & Chr(10) & GetResText(1301)
- msgError$ = GetResText(1302)
+ If InitResources("'Template'") Then
+ msgNoTextmark$ = GetResText("CorrespondenceDialog_0") & Chr(13) & Chr(10) & GetResText("CorrespondenceNoTextmark_1")
+ msgError$ = GetResText("CorrespondenceMsgError")
If bTemplate Then
- DialogModel.Title = GetResText(1303+3)
- DialogModel.CmdCancel.Label = GetResText(1102)
- DialogModel.CmdCorrGoOn.Label = GetResText(1103)
- DialogModel.OptSingle.Label = GetResText(1303 + 1)
- DialogModel.Optmerge.Label = GetResText(1303 + 2)
- DialogModel.FrmLetter.Label = GetResText(1303)
+ DialogModel.Title = GetResText("CorrespondenceDialog_3")
+ DialogModel.CmdCancel.Label = GetResText("STYLES_2")
+ DialogModel.CmdCorrGoOn.Label = GetResText("STYLES_3")
+ DialogModel.OptSingle.Label = GetResText("CorrespondenceDialog_1")
+ DialogModel.Optmerge.Label = GetResText("CorrespondenceDialog_2")
+ DialogModel.FrmLetter.Label = GetResText("CorrespondenceDialog_0")
End If
LoadLanguageCorrespondence() = True
Else
@@ -130,7 +130,7 @@ Dim bDBvalid as Boolean
oDBAccess = GetRegistryKeyContent("org.openoffice.Office.DataAccess/AddressBook/")
sAddressbook = oDBAccess.DataSourceName
If sAddressbook = "" Then
- MsgBox(GetResText(1301))
+ MsgBox(GetResText("CorrespondenceNoTextmark_1"))
Exit Sub
End If
End If
@@ -230,74 +230,74 @@ Dim bCorrectField as Boolean
oFieldMaster = oDocument.createInstance("com.sun.star.text.TextField.JumpEdit")
Select Case sColName
Case "Company"
- oFieldMaster.PlaceHolder = getResText(1350+1)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_1")
Case "Department"
- oFieldMaster.PlaceHolder = getResText(1350+2)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_2")
Case "FirstName"
- oFieldMaster.PlaceHolder = getResText(1350+3)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_3")
Case "LastName"
- oFieldMaster.PlaceHolder = getResText(1350+4)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_4")
Case "Street"
- oFieldMaster.PlaceHolder = getResText(1350+5)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_5")
Case "Country"
- oFieldMaster.PlaceHolder = getResText(1350+6)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_6")
Case "Zip"
- oFieldMaster.PlaceHolder = getResText(1350+7)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_7")
Case "City"
- oFieldMaster.PlaceHolder = getResText(1350+8)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_8")
Case "Title"
- oFieldMaster.PlaceHolder = getResText(1350+9)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_9")
Case "Position"
- oFieldMaster.PlaceHolder = getResText(1350+10)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_10")
Case "AddrForm"
- oFieldMaster.PlaceHolder = getResText(1350+11)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_11")
Case "Code"
- oFieldMaster.PlaceHolder = getResText(1350+12)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_12")
Case "AddrFormMail"
- oFieldMaster.PlaceHolder = getResText(1350+13)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_13")
Case "PhonePriv"
- oFieldMaster.PlaceHolder = getResText(1350+14)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_14")
Case "PhoneComp"
- oFieldMaster.PlaceHolder = getResText(1350+15)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_15")
Case "Fax"
- oFieldMaster.PlaceHolder = getResText(1350+16)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_16")
Case "EMail"
- oFieldMaster.PlaceHolder = getResText(1350+17)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_17")
Case "URL"
- oFieldMaster.PlaceHolder = getResText(1350+18)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_18")
Case "Note"
- oFieldMaster.PlaceHolder = getResText(1350+19)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_19")
Case "Altfield1"
- oFieldMaster.PlaceHolder = getResText(1350+20)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_20")
Case "Altfield2"
- oFieldMaster.PlaceHolder = getResText(1350+21)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_21")
Case "Altfield3"
- oFieldMaster.PlaceHolder = getResText(1350+22)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_22")
Case "Altfield4"
- oFieldMaster.PlaceHolder = getResText(1350+23)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_23")
Case "Id"
- oFieldMaster.PlaceHolder = getResText(1350+24)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_24")
Case "State"
- oFieldMaster.PlaceHolder = getResText(1350+25)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_25")
Case "PhoneOffice"
- oFieldMaster.PlaceHolder = getResText(1350+26)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_26")
Case "Pager"
- oFieldMaster.PlaceHolder = getResText(1350+27)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_27")
Case "PhoneCell"
- oFieldMaster.PlaceHolder = getResText(1350+28)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_28")
Case "PhoneOther"
- oFieldMaster.PlaceHolder = getResText(1350+29)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_29")
Case "CalendarURL"
- oFieldMaster.PlaceHolder = getResText(1350+30)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_30")
Case "InviteParticipant"
- oFieldMaster.PlaceHolder = getResText(1350+31)
+ oFieldMaster.PlaceHolder = getResText("CorrespondenceFields_31")
Case Else
bCorrectField = False
End Select
If bCorrectField Then
- oFieldMaster.Hint = getResText(1350)
+ oFieldMaster.Hint = getResText("CorrespondenceFields_0")
oBookText.InsertTextContent(oBookMarkCursor, oFieldMaster, True)
End If
End If
End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/template/ModuleAgenda.xba b/wizards/source/template/ModuleAgenda.xba
index 55731dcc54c4..a17fb68cd602 100644
--- a/wizards/source/template/ModuleAgenda.xba
+++ b/wizards/source/template/ModuleAgenda.xba
@@ -45,14 +45,14 @@ End Sub
Sub LoadLanguageAgenda()
- If InitResources("'Template'", "tpl") Then
- DlgAgenda_gMyName = GetResText(1200)
- DialogModel.CmdCancel.Label = GetResText(1102)
- DialogModel.CmdAgdGoon.Label = GetResText(1103)
-' DlgAgenda_gMsgNoCancel$ = GetResText(1201)
- DialogModel.FrmAgenda.Label = GetResText(1202)
- DialogModel.OptAgenda1.Label = GetResText(1203)
- DialogModel.OptAgenda2.Label = GetResText(1204)
+ If InitResources("'Template'") Then
+ DlgAgenda_gMyName = GetResText("AgendaDlgName")
+ DialogModel.CmdCancel.Label = GetResText("STYLES_2")
+ DialogModel.CmdAgdGoon.Label = GetResText("STYLES_3")
+' DlgAgenda_gMsgNoCancel$ = GetResText("AgendaDlgNoCancel")
+ DialogModel.FrmAgenda.Label = GetResText("AgendaDlgFrame")
+ DialogModel.OptAgenda1.Label = GetResText("AgendaDlgButton1")
+ DialogModel.OptAgenda2.Label = GetResText("AgendaDlgButton2")
' DialogModel.OptAgenda1.State = 1
End If
End Sub
@@ -217,4 +217,4 @@ Dim Taglist() as String
sTrueContent = TagList(1)
End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/template/Samples.xba b/wizards/source/template/Samples.xba
index 13fe11a09dd9..ac3431a2023b 100644
--- a/wizards/source/template/Samples.xba
+++ b/wizards/source/template/Samples.xba
@@ -19,9 +19,6 @@
-->
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Samples" script:language="StarBasic">Option Explicit
-Const STYLES = 1100
-Const STYLENAME_DEF = 1120
-Const STYLENAME = 1150
Const NumStyles = 18
Const aTempFileName = "Berend_Ilko_Tom_Stella_Volker.stc"
Dim oUcbObject as Object
@@ -36,7 +33,6 @@ Public aTempURL as String
Public Files(100) as String
-
'--------------------------------------------------------------------------------------
'Calc Style Section starts here
@@ -49,8 +45,9 @@ Dim LocalizedStyleNames(NumStyles,2) As String
Dim LocalizedStyleName As String
Dim t as Integer
Dim MaxIndex as Integer
+Dim StyleNameDef As Variant
BasicLibraries.LoadLibrary("Tools")
- If InitResources("'Template'", "tpl") then
+ If InitResources("'Template'") then
oDocument = ThisComponent
If oDocument.SupportsService("com.sun.star.sheet.SpreadsheetDocument") Then
ToggleWindow(False)
@@ -62,12 +59,13 @@ Dim MaxIndex as Integer
TemplateDir = GetPathSettings("Template", False, 0)
StylesDir = GetOfficeSubPath("Template", "wizard/styles/")
sQueryPath = GetOfficeSubPath("Template", "../wizard/bitmap/")
- DialogModel.Title = GetResText(STYLES)
- DialogModel.cmdCancel.Label = GetResText(STYLES+2)
- DialogModel.cmdOk.Label = GetResText(STYLES+3)
+ DialogModel.Title = GetResText("STYLES_0")
+ DialogModel.cmdCancel.Label = GetResText("STYLES_2")
+ DialogModel.cmdOk.Label = GetResText("STYLES_3")
+ StyleNameDef = Array("(Standard)", "Autumn Leaves", "Be", "Black and White", "Blackberry Bush", "Blue Jeans", "Fifties Diner", "Glacier", "Green Grapes", "Marine", "Millennium", "Nature", "Neon", "Night", "PC Nostalgia", "Pastel", "Pool Party", "Pumpkin")
For t = 0 to NumStyles - 1
- LocalizedStyleNames(t,0) = GetResText(STYLENAME_DEF+t)
- LocalizedStyleNames(t,1) = GetResText(STYLENAME+t)
+ LocalizedStyleNames(t,0) = StyleNameDef(t)
+ LocalizedStyleNames(t,1) = GetResText("STYLENAME_" & Trim(Str(t)))
Next t
Stylenames() = ReadDirectories(StylesDir, False, False, True,)
MaxIndex = Ubound(Stylenames())
@@ -129,7 +127,7 @@ Sub SaveCurrentStyles(oDocument as Object)
Exit Sub
ErrorOcurred:
- MsgBox(GetResText( STYLES+1 ), 16, GetResText( STYLES ))
+ MsgBox(GetResText("STYLES_1"), 16, GetResText("STYLES_0"))
On Local Error Goto 0
End Sub
diff --git a/wizards/source/template/template.src b/wizards/source/template/template.src
deleted file mode 100644
index 9afa43b00a12..000000000000
--- a/wizards/source/template/template.src
+++ /dev/null
@@ -1,459 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define STYLES 1100
-#define STYLENAME_DEF 1120
-#define STYLENAME 1150
-#define AgendaDlgName 1200
-#define AgendaDlgNoCancel 1201
-#define AgendaDlgFrame 1202
-#define AgendaDlgButton1 1203
-#define AgendaDlgButton2 1204
-#define CorrespondenceNoTextmark 1300
-#define CorrespondenceMsgError 1302
-#define CorrespondenceDialog 1303
-#define CorrespondenceFields 1350
-#define TextField 1400
-
-String STYLES
-{
- Text [ en-US ] = "Theme Selection";
-};
-
-String STYLES + 1
-{
- Text [ en-US ] = "Error while saving the document to the clipboard! The following action cannot be undone.";
-};
-
-String STYLES + 2
-{
- Text [ en-US ] = "~Cancel";
-};
-
-String STYLES + 3
-{
- Text [ en-US ] = "~OK";
-};
-
-String STYLENAME_DEF
-{
- Text = "(Standard)";
-};
-
-String STYLENAME_DEF + 1
-{
- Text = "Autumn Leaves";
-};
-
-String STYLENAME_DEF + 2
-{
- Text = "Be";
-};
-
-String STYLENAME_DEF + 3
-{
- Text = "Black and White";
-};
-
-String STYLENAME_DEF + 4
-{
- Text = "Blackberry Bush";
-};
-
-String STYLENAME_DEF + 5
-{
- Text = "Blue Jeans";
-};
-
-String STYLENAME_DEF + 6
-{
- Text = "Fifties Diner";
-};
-
-String STYLENAME_DEF + 7
-{
- Text = "Glacier";
-};
-
-String STYLENAME_DEF + 8
-{
- Text = "Green Grapes";
-};
-
-String STYLENAME_DEF + 9
-{
- Text = "Marine";
-};
-
-String STYLENAME_DEF + 10
-{
- Text = "Millennium";
-};
-
-String STYLENAME_DEF + 11
-{
- Text = "Nature";
-};
-
-String STYLENAME_DEF + 12
-{
- Text = "Neon";
-};
-
-String STYLENAME_DEF + 13
-{
- Text = "Night";
-};
-
-String STYLENAME_DEF + 14
-{
- Text = "PC Nostalgia";
-};
-
-String STYLENAME_DEF + 15
-{
- Text = "Pastel";
-};
-
-String STYLENAME_DEF + 16
-{
- Text = "Pool Party";
-};
-
-String STYLENAME_DEF + 17
-{
- Text = "Pumpkin";
-};
-
-String STYLENAME
-{
- Text [ en-US ] = "(Standard)";
-};
-
-String STYLENAME + 1
-{
- Text [ en-US ] = "Autumn Leaves";
-};
-
-String STYLENAME + 2
-{
- Text [ en-US ] = "Be";
-};
-
-String STYLENAME + 3
-{
- Text [ en-US ] = "Black and White";
-};
-
-String STYLENAME + 4
-{
- Text [ en-US ] = "Blackberry Bush";
-};
-
-String STYLENAME + 5
-{
- Text [ en-US ] = "Blue Jeans";
-};
-
-String STYLENAME + 6
-{
- Text [ en-US ] = "Fifties Diner";
-};
-
-String STYLENAME + 7
-{
- Text [ en-US ] = "Glacier";
-};
-
-String STYLENAME + 8
-{
- Text [ en-US ] = "Green Grapes";
-};
-
-String STYLENAME + 9
-{
- Text [ en-US ] = "Marine";
-};
-
-String STYLENAME + 10
-{
- Text [ en-US ] = "Millennium";
-};
-
-String STYLENAME + 11
-{
- Text [ en-US ] = "Nature";
-};
-
-String STYLENAME + 12
-{
- Text [ en-US ] = "Neon";
-};
-
-String STYLENAME + 13
-{
- Text [ en-US ] = "Night";
-};
-
-String STYLENAME + 14
-{
- Text [ en-US ] = "PC Nostalgia";
-};
-
-String STYLENAME + 15
-{
- Text [ en-US ] = "Pastel";
-};
-
-String STYLENAME + 16
-{
- Text [ en-US ] = "Pool Party";
-};
-
-String STYLENAME + 17
-{
- Text [ en-US ] = "Pumpkin";
-};
-
-String AgendaDlgName
-{
- Text [ en-US ] = "Minutes Template";
-};
-
-String AgendaDlgNoCancel
-{
- Text [ en-US ] = "An option must be confirmed.";
-};
-
-String AgendaDlgFrame
-{
- Text [ en-US ] = "Minutes Type";
-};
-
-String AgendaDlgButton1
-{
- Text [ en-US ] = "Results Minutes";
-};
-
-String AgendaDlgButton2
-{
- Text [ en-US ] = "Evaluation Minutes";
-};
-
-String CorrespondenceNoTextmark
-{
- Text [ en-US ] = "The bookmark 'Recipient' is missing.";
-};
-
-String CorrespondenceNoTextmark+1
-{
- Text [ en-US ] = "Form letter fields can not be included.";
-};
-
-String CorrespondenceMsgError
-{
- Text [ en-US ] = "An error has occurred.";
-};
-
-String CorrespondenceDialog
-{
- Text [ en-US ] = "Addressee";
-};
-
-String CorrespondenceDialog+1
-{
- Text [ en-US ] = "One recipient";
-};
-
-String CorrespondenceDialog+2
-{
- Text [ en-US ] = "Several recipients (address database)";
-};
-
-String CorrespondenceDialog+3
-{
- Text [ en-US ] = "Use of This Template";
-};
-
-String CorrespondenceFields
-{
- Text [ en-US ] = "Click placeholder and overwrite";
-};
-
-String CorrespondenceFields+1
-{
- Text [ en-US ] = "Company";
-};
-
-String CorrespondenceFields+2
-{
- Text [ en-US ] = "Department";
-};
-
-String CorrespondenceFields+3
-{
- Text [ en-US ] = "First Name";
-};
-
-String CorrespondenceFields+4
-{
- Text [ en-US ] = "Last Name";
-};
-
-String CorrespondenceFields+5
-{
- Text [ en-US ] = "Street";
-};
-
-String CorrespondenceFields+6
-{
- Text [ en-US ] = "Country";
-};
-
-String CorrespondenceFields+7
-{
- Text [ en-US ] = "ZIP/Postal Code";
-};
-
-String CorrespondenceFields+8
-{
- Text [ en-US ] = "City";
-};
-
-String CorrespondenceFields+9
-{
- Text [ en-US ] = "Title";
-};
-
-String CorrespondenceFields+10
-{
- Text [ en-US ] = "Position";
-};
-
-String CorrespondenceFields+11
-{
- Text [ en-US ] = "Form of Address";
-};
-
-String CorrespondenceFields+12
-{
- Text [ en-US ] = "Initials";
-};
-
-String CorrespondenceFields+13
-{
- Text [ en-US ] = "Salutation";
-};
-
-String CorrespondenceFields+14
-{
- Text [ en-US ] = "Home Phone";
-};
-
-String CorrespondenceFields+15
-{
- Text [ en-US ] = "Work Phone";
-};
-
-String CorrespondenceFields+16
-{
- Text [ en-US ] = "Fax";
-};
-
-String CorrespondenceFields+17
-{
- Text [ en-US ] = "E-Mail";
-};
-
-String CorrespondenceFields+18
-{
- Text [ en-US ] = "URL";
-};
-
-String CorrespondenceFields+19
-{
- Text [ en-US ] = "Notes";
-};
-
-String CorrespondenceFields+20
-{
- Text [ en-US ] = "Alt. Field 1";
-};
-
-String CorrespondenceFields+21
-{
- Text [ en-US ] = "Alt. Field 2";
-};
-
-String CorrespondenceFields+22
-{
- Text [ en-US ] = "Alt. Field 3";
-};
-
-String CorrespondenceFields+23
-{
- Text [ en-US ] = "Alt. Field 4";
-};
-
-String CorrespondenceFields+24
-{
- Text [ en-US ] = "ID";
-};
-
-String CorrespondenceFields+25
-{
- Text [ en-US ] = "State";
-};
-
-String CorrespondenceFields+26
-{
- Text [ en-US ] = "Office Phone";
-};
-
-String CorrespondenceFields+27
-{
- Text [ en-US ] = "Pager";
-};
-
-String CorrespondenceFields+28
-{
- Text [ en-US ] = "Mobile Phone";
-};
-
-String CorrespondenceFields+29
-{
- Text [ en-US ] = "Other Phone";
-};
-
-String CorrespondenceFields+30
-{
- Text [ en-US ] = "Calendar URL";
-};
-
-String CorrespondenceFields+31
-{
- Text [ en-US ] = "Invite";
-};
-
-String TextField
-{
- Text [ en-US ] = "User data field is not defined!";
-
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index f5950afd1f18..d1b47172283c 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -276,9 +276,9 @@ Dim oLocResSrv as Object
If bResObjectexists Then
oLocResSrv = oResSrv
End If
- If InitResources("Tools", "com") Then
+ If InitResources("Tools") Then
ProductName = GetProductName()
- sError = GetResText(1006)
+ sError = GetResText("RID_COMMON_6")
sError = ReplaceString(sError, ProductName, "%PRODUCTNAME")
sError = ReplaceString(sError, chr(13), "<BR>")
MsgBox(sError, 16, ProductName)
@@ -290,42 +290,50 @@ Dim oLocResSrv as Object
End Sub
-Function InitResources(Description, ShortDescription as String) as boolean
+Function InitResources(Description) as boolean
Dim xResource as Object
-Dim aArgs(0) as String
+Dim sOfficeDir as String
+Dim aArgs(5) as Any
On Error Goto ErrorOcurred
- aArgs(0) = ShortDescription
- oConfigProvider = createUnoService("com.sun.star.configuration.ConfigurationProvider")
- xResource = getProcessServiceManager().createInstanceWithArguments( "org.libreoffice.resource.ResourceIndexAccess", aArgs() )
- If (IsNull(xResource)) then
+ sOfficeDir = "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/wizards/"
+ sOfficeDir = GetDefaultContext.getByName("/singletons/com.sun.star.util.theMacroExpander").ExpandMacros(sOfficeDir)
+ aArgs(0) = sOfficeDir
+ aArgs(1) = true
+ aArgs(2) = GetStarOfficeLocale()
+ aArgs(3) = "resources"
+ aArgs(4) = ""
+ aArgs(5) = NULL
+ oResSrv = getProcessServiceManager().createInstanceWithArguments( "com.sun.star.resource.StringResourceWithLocation", aArgs() )
+ If (IsNull(oResSrv)) then
InitResources = FALSE
MsgBox("could not initialize ResourceIndexAccess")
Else
InitResources = TRUE
- oResSrv = xResource.getByName( "String" )
End If
Exit Function
ErrorOcurred:
Dim nSolarVer
InitResources = FALSE
nSolarVer = GetSolarVersion()
- MsgBox("Resource file missing (" & ShortDescription & trim(str(nSolarVer)) + "*.res)", 16, GetProductName())
+ MsgBox("Resource file missing", 16, GetProductName())
Resume CLERROR
CLERROR:
End Function
-Function GetResText( nID as integer ) As string
+Function GetResText( sID as String ) As string
+Dim sString as String
On Error Goto ErrorOcurred
If Not IsNull(oResSrv) Then
- GetResText = oResSrv.getByIndex( nID )
+ sString = oResSrv.resolveString(sID)
+ GetResText = ReplaceString(sString, GetProductname(), "%PRODUCTNAME")
Else
GetResText = ""
End If
Exit Function
ErrorOcurred:
GetResText = ""
- MsgBox("Resource with ID =" + str( nID ) + " not found!", 16, GetProductName())
+ MsgBox("Resource with ID =" + sID + " not found!", 16, GetProductName())
Resume CLERROR
CLERROR:
End Function
@@ -775,18 +783,18 @@ Dim ErrMsg as String
oDocument = StarDesktop.LoadComponentFromURL(sUrl,"_default",0, NoArgs())
NOMODULEINSTALLED:
If (Err <> 0) OR IsNull(oDocument) Then
- If InitResources("", "com") Then
+ If InitResources("") Then
Select Case sType
Case "swriter"
- ErrMsg = GetResText(1001)
+ ErrMsg = GetResText("RID_COMMON_1")
Case "scalc"
- ErrMsg = GetResText(1002)
+ ErrMsg = GetResText("RID_COMMON_2")
Case "simpress"
- ErrMsg = GetResText(1003)
+ ErrMsg = GetResText("RID_COMMON_3")
Case "sdraw"
- ErrMsg = GetResText(1004)
+ ErrMsg = GetResText("RID_COMMON_4")
Case "smath"
- ErrMsg = GetResText(1005)
+ ErrMsg = GetResText("RID_COMMON_5")
Case Else
ErrMsg = "Invalid Document Type!"
End Select
diff --git a/wizards/source/tools/ModuleControls.xba b/wizards/source/tools/ModuleControls.xba
index 300b6eea6da6..059956cb1b55 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -335,17 +335,17 @@ Dim lblNo as String
Dim lblYesToAll as String
Dim lblCancel as String
Dim OverwriteModel as Object
- If InitResources(GetProductName(), "dbw") Then
- QueryString = GetResText(507)
+ If InitResources(GetProductName()) Then
+ QueryString = GetResText("RID_COMMON_7")
QueryString = ReplaceString(QueryString, ConvertFromUrl(FilePath), "<PATH>")
If Len(QueryString) > 190 Then
QueryString = DeleteStr(QueryString, ".<BR>")
End If
QueryString = ReplaceString(QueryString, chr(13), "<BR>")
- lblYes = GetResText(508)
- lblYesToAll = GetResText(509)
- lblNo = GetResText(510)
- lblCancel = GetResText(511)
+ lblYes = GetResText("RID_COMMON_8")
+ lblYesToAll = GetResText("RID_COMMON_9")
+ lblNo = GetResText("RID_COMMON_10")
+ lblCancel = GetResText("RID_COMMON_11")
DlgOverwrite = LoadDialog("Tools", "DlgOverwriteAll")
DlgOverwrite.Title = sTitle
OverwriteModel = DlgOverwrite.Model
diff --git a/wizards/source/tools/UCB.xba b/wizards/source/tools/UCB.xba
index 73d849cc8fea..d849a2ea3488 100644
--- a/wizards/source/tools/UCB.xba
+++ b/wizards/source/tools/UCB.xba
@@ -297,8 +297,8 @@ Dim oUcb as Object
CreateFolder = True
NOSPACEONDRIVE:
If Err <> 0 Then
- If InitResources("", "dbw") Then
- ErrMsg = GetResText(500)
+ If InitResources("") Then
+ ErrMsg = GetResText("RID_COMMON_0")
ErrMsg = ReplaceString(ErrMsg, chr(13), "<BR>")
ErrMsg = ReplaceString(ErrMsg, sNewFolder, "%1")
Msgbox(ErrMsg, 48, GetProductName())
More information about the Libreoffice-commits
mailing list