convert java wizards to .properties for translations

like LibreOffice java extensions, and nlpsolver and librelogo, do, removes the
magic number problem

Change-Id: I561249ccebe41c787cd8cdaa80e1d035f27052cc
Reviewed-on: https://gerrit.libreoffice.org/37986Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Repository.mk

@@ -934,6 +934,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	wizards_basicsrvtools \
 	wizards_basicsrvtutorials \
 	wizards_basicusr \
+	wizards_properties \
+	wizards_wizardshare \
 	xmlsec \
 	$(if $(ENABLE_HEADLESS),, \
 		chart2_opengl_shader \

wizards/CustomTarget_wizards.mk

+# -*- 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/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,wizards/locproperties))
+
+wizards_DIR := $(call gb_CustomTarget_get_workdir,wizards/locproperties)
+
+define wizards_Properties_Properties
+$(call wizards_Properties__Properties_impl,$(wizards_DIR)/resources_$(1).properties,$(SRCDIR)/wizards/source/resources/resources_en_US.properties,$(gb_POLOCATION)/$(2)/wizards/source/resources.po,$(2))
+
+endef
+
+define wizards_Properties__Properties_impl
+$(1) : LANG := $(4)
+$(1) : POFILE := $(3)
+$(1) : SOURCE := $(2)
+
+$(call gb_CustomTarget_get_target,wizards/locproperties) : $(1)
+$(1) : $(2) \
+	$(wildcard $(3))
+
+endef
+
+ifneq ($(strip $(gb_WITH_LANG)),)
+wizards_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
+$(eval $(foreach lang,$(wizards_LANGS),$(call wizards_Properties_Properties,$(subst -,_,$(lang)),$(lang))))
+endif
+
+$(wizards_DIR)/resources_%.properties : \
+		$(call gb_Executable_get_runtime_dependencies,propex) \
+		| $(wizards_DIR)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		$(if $(filter-out qtz,$(LANG)), \
+			MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
+			$(call gb_Executable_get_command,propex) \
+				-i $(SOURCE) \
+				-o $@ \
+				-m $${MERGEINPUT} \
+				-l $(LANG) && \
+			rm -rf $${MERGEINPUT} \
+			, \
+			$(call gb_Executable_get_command,propex) \
+				-i $(SOURCE) \
+				-o $@ \
+				-m \
+				-l $(LANG) \
+		) \
+	)
+
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:

wizards/Module_wizards.mk

@@ -21,6 +21,7 @@ $(eval $(call gb_Module_Module,wizards))
 
 $(eval $(call gb_Module_add_targets,wizards,\
 	CustomTarget_share \
+	CustomTarget_wizards \
 	Package_access2base \
 	Package_depot \
 	Package_euro \
@@ -33,6 +34,8 @@ $(eval $(call gb_Module_add_targets,wizards,\
 	Package_tools \
 	Package_tutorials \
 	Package_usr \
+	Package_wizards \
+	Package_wizards_properties \
 	Pyuno_fax \
 	Pyuno_letter \
 	Pyuno_agenda \

wizards/Package_wizards.mk

+# -*- 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/.
+#
+
+$(eval $(call gb_Package_Package,wizards_wizardshare,$(SRCDIR)/wizards/source/resources))
+
+$(eval $(call gb_Package_add_files,wizards_wizardshare,$(LIBO_SHARE_FOLDER)/wizards,\
+	resources_en_US.properties \
+))
+
+# vim:set noet sw=4 ts=4:

wizards/Package_wizards_properties.mk

+# -*- 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/.
+#
+
+$(eval $(call gb_Package_Package,wizards_properties,$(call gb_CustomTarget_get_workdir,wizards/locproperties)))
+
+$(eval $(call gb_Package_add_files,wizards_properties,$(LIBO_SHARE_FOLDER)/wizards,\
+	$(foreach lang,$(subst -,_,$(gb_TRANS_LANGS)),resources_$(lang).properties) \
+))
+
+# vim:set noet sw=4 ts=4:

wizards/com/sun/star/wizards/common/Configuration.java

@@ -120,6 +120,11 @@ public abstract class Configuration
         return getLocale(xMSF, "org.openoffice.Setup/L10N/", "ooSetupSystemLocale");
     }
 
+    public static Locale getUILocale(XMultiServiceFactory xMSF)
+    {
+        return getLocale(xMSF, "org.openoffice.Setup/L10N/", "ooLocale");
+    }
+
     public static String[] getNodeDisplayNames(XNameAccess _xNameAccessNode)
     {
         return getNodeChildNames(_xNameAccessNode, PropertyNames.PROPERTY_NAME);

wizards/com/sun/star/wizards/common/InvalidQueryException.java

@@ -24,14 +24,12 @@ public class InvalidQueryException extends java.lang.Throwable
     // TODO don't show messages in Exceptions
     public InvalidQueryException(XMultiServiceFactory xMSF, String sCommand)
     {
-        final int RID_REPORT = 2400;
-        SystemDialog.showErrorBox(xMSF, "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible
+        SystemDialog.showErrorBox(xMSF, "RID_REPORT_65", "<STATEMENT>", sCommand); // Querycreationnotpossible
     }
     // TODO don't show messages in Exceptions
     public InvalidQueryException(XMultiServiceFactory xMSF, String sCommand, Throwable cause)
     {
         super(cause);
-        final int RID_REPORT = 2400;
-        SystemDialog.showErrorBox(xMSF, "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible
+        SystemDialog.showErrorBox(xMSF, "RID_REPORT_65", "<STATEMENT>", sCommand); // Querycreationnotpossible
     }
 }

wizards/com/sun/star/wizards/common/NoValidPathException.java

@@ -28,7 +28,7 @@ public class NoValidPathException extends Exception
         // TODO: NEVER open a dialog in an exception
         if (xMSF != null)
         {
-            SystemDialog.showErrorBox(xMSF, "dbw", 521); // OfficePathnotavailable
+            SystemDialog.showErrorBox(xMSF, "RID_COMMON_21"); // OfficePathnotavailable
         }
     }
 
@@ -38,7 +38,7 @@ public class NoValidPathException extends Exception
         // TODO: NEVER open a dialog in an exception
         if (xMSF != null)
         {
-            SystemDialog.showErrorBox(xMSF, "dbw", 521); // OfficePathnotavailable
+            SystemDialog.showErrorBox(xMSF, "RID_COMMON_21"); // OfficePathnotavailable
         }
     }
 }

wizards/com/sun/star/wizards/common/Resource.java

@@ -18,76 +18,44 @@
 
 package com.sun.star.wizards.common;
 
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.container.XNameAccess;
+import com.sun.star.beans.PropertyState;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.configuration.theDefaultProvider;
+import com.sun.star.lang.Locale;
 import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.resource.StringResourceWithLocation;
+import com.sun.star.resource.XStringResourceWithLocation;
+import com.sun.star.util.XMacroExpander;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import com.sun.star.uno.UnoRuntime;
 
-public class Resource
+public final class Resource
 {
+    private XStringResourceWithLocation m_xStrResource;
 
-    private XIndexAccess xStringIndexAccess;
-
-    /** Creates a new instance of Resource
+    /**
+     * <p>Load the resource bundle that contains the resource {@code String}
+     * values.</p>
      */
-    public Resource(XMultiServiceFactory _xMSF, String _Module)
-    {
-        try
-        {
-            Object[] aArgs = new Object[] { _Module };
-            XInterface xResource = (XInterface) _xMSF.createInstanceWithArguments(
-                "org.libreoffice.resource.ResourceIndexAccess",
-                aArgs);
-            if (xResource == null)
-                throw new Exception("could not initialize ResourceIndexAccess");
-            XNameAccess xNameAccess = UnoRuntime.queryInterface(
-                XNameAccess.class,
-                xResource);
-            if (xNameAccess == null)
-                throw new Exception("ResourceIndexAccess is no XNameAccess");
-            this.xStringIndexAccess = UnoRuntime.queryInterface(
-                XIndexAccess.class,
-                xNameAccess.getByName("String"));
-            if(this.xStringIndexAccess == null)
-                throw new Exception("could not initialize xStringIndexAccess");
-        }
-        catch (Exception exception)
-        {
-            exception.printStackTrace();
-            showCommonResourceError(_xMSF);
-        }
-    }
-
-    public String getResText(int nID)
-    {
-        try
-        {
-            return (String)this.xStringIndexAccess.getByIndex(nID);
-        }
-        catch (Exception exception)
-        {
-            throw new java.lang.IllegalArgumentException("Resource with ID not " + nID + "not found", exception);
-        }
+    public Resource(XMultiServiceFactory xMSF) {
+        XComponentContext xContext = Helper.getComponentContext(xMSF);
+        XMacroExpander xExpander = Helper.getMacroExpander(xMSF);
+        String sPath = xExpander.expandMacros("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/wizards/");
+        Locale locale = Configuration.getUILocale(xMSF);
+        m_xStrResource = StringResourceWithLocation.create(xContext, sPath, true, locale, "resources", "", null);
     }
 
-
-
-    public String[] getResArray(int nID, int iCount)
-    {
-        try
-        {
-            String[] ResArray = new String[iCount];
-            for (int i = 0; i < iCount; i++)
-            {
-                ResArray[i] = getResText(nID + i);
-            }
-            return ResArray;
-        }
-        catch (Exception exception)
-        {
-            throw new java.lang.IllegalArgumentException("Resource with ID not" + nID + "not found", exception);
-        }
+    /**
+     * This method returns the corresponding {@code String} given the key.
+     *
+     * @param   key      Key string for getting the message {@code String}.
+     * @return  Message  {@code String} corresponding to the key.
+     */
+    public String getResText(String key) {
+        return m_xStrResource.resolveString(key);
     }
 
     public static void showCommonResourceError(XMultiServiceFactory xMSF)

wizards/com/sun/star/wizards/common/SystemDialog.java

@@ -29,11 +29,11 @@ import com.sun.star.awt.XMessageBox;
 public class SystemDialog
 {
 
-    public static int showErrorBox(XMultiServiceFactory xMSF, String ResPrefix, int ResID, String AddTag, String AddString)
+    public static int showErrorBox(XMultiServiceFactory xMSF, String ResID, String AddTag, String AddString)
     {
         Resource oResource;
         String ProductName = Configuration.getProductName(xMSF);
-        oResource = new Resource(xMSF, ResPrefix);
+        oResource = new Resource(xMSF);
         String sErrorMessage = oResource.getResText(ResID);
         sErrorMessage = JavaTools.replaceSubString(sErrorMessage, ProductName, "%PRODUCTNAME");
         sErrorMessage = JavaTools.replaceSubString(sErrorMessage, String.valueOf((char) 13), "<BR>");
@@ -41,11 +41,11 @@ public class SystemDialog
         return SystemDialog.showMessageBox(xMSF, "ErrorBox", com.sun.star.awt.VclWindowPeerAttribute.OK, sErrorMessage);
     }
 
-    public static int showErrorBox(XMultiServiceFactory xMSF, String ResPrefix, int ResID)
+    public static int showErrorBox(XMultiServiceFactory xMSF, String ResID)
     {
         Resource oResource;
         String ProductName = Configuration.getProductName(xMSF);
-        oResource = new Resource(xMSF, ResPrefix);
+        oResource = new Resource(xMSF);
         String sErrorMessage = oResource.getResText(ResID);
         sErrorMessage = JavaTools.replaceSubString(sErrorMessage, ProductName, "%PRODUCTNAME");
         sErrorMessage = JavaTools.replaceSubString(sErrorMessage, String.valueOf((char) 13), "<BR>");

wizards/com/sun/star/wizards/db/CommandMetaData.java

@@ -291,8 +291,8 @@ public class CommandMetaData extends DBMetaData
         {
             exception.printStackTrace(System.err);
         }
-        Resource oResource = new Resource(xMSF, "dbw");
-        String sMsgNoFieldsFromCommand = oResource.getResText(RID_DB_COMMON + 45);
+        Resource oResource = new Resource(xMSF);
+        String sMsgNoFieldsFromCommand = oResource.getResText("RID_DB_COMMON_45");
         sMsgNoFieldsFromCommand = JavaTools.replaceSubString(sMsgNoFieldsFromCommand, _commandname, "%NAME");
         showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgNoFieldsFromCommand);
         return false;

wizards/com/sun/star/wizards/db/DBMetaData.java

@@ -131,7 +131,6 @@ public class DBMetaData
     private int iMaxTableNameLength = -1;
     private boolean bPasswordIsRequired;
     private static final int NOLIMIT = 9999999;
-    protected static final int RID_DB_COMMON = 1000;
     private static final int INVALID = 9999999;
     public TypeInspector oTypeInspector;
     private NumberFormatter oNumberFormatter = null;
@@ -598,7 +597,7 @@ public class DBMetaData
 
     private boolean getConnection(XDataSource _dataSource)
     {
-        Resource oResource = new Resource(xMSF, "dbw");
+        Resource oResource = new Resource(xMSF);
         try
         {
             int iMsg = 0;
@@ -632,7 +631,7 @@ public class DBMetaData
                     catch (Exception exception)
                     {
                         // Note:  WindowAttributes from toolkit/source/awt/vclxtoolkit.cxx
-                        String sMsgNoConnection = oResource.getResText(RID_DB_COMMON + 14);
+                        String sMsgNoConnection = oResource.getResText("RID_DB_COMMON_14");
                         iMsg = showMessageBox("QueryBox", VclWindowPeerAttribute.RETRY_CANCEL, sMsgNoConnection);
                         bExitLoop = iMsg == 0;
                         bgetConnection = false;
@@ -642,7 +641,7 @@ public class DBMetaData
             }
             if (!bgetConnection)
             {
-                String sMsgConnectionImpossible = oResource.getResText(RID_DB_COMMON + 35);
+                String sMsgConnectionImpossible = oResource.getResText("RID_DB_COMMON_35");
                 showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgConnectionImpossible);
             }
             else
@@ -655,7 +654,7 @@ public class DBMetaData
         }
         catch (Exception e)
         {
-            String sMsgConnectionImpossible = oResource.getResText(RID_DB_COMMON + 35);
+            String sMsgConnectionImpossible = oResource.getResText("RID_DB_COMMON_35");
             showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgConnectionImpossible);
             Logger.getLogger( DBMetaData.class.getName() ).log( Level.SEVERE, null, e );
             return false;

wizards/com/sun/star/wizards/document/GridControl.java

@@ -73,7 +73,7 @@ public class GridControl extends Shape
                 FieldColumn curfieldcolumn = _fieldcolumns[i];
                 if (curfieldcolumn.getFieldType() == DataType.TIMESTAMP)
                 {
-                    new TimeStampControl(new Resource(_xMSF, "dbw"), this, curfieldcolumn);
+                    new TimeStampControl(new Resource(_xMSF), this, curfieldcolumn);
                 }
                 else
                 {

wizards/com/sun/star/wizards/document/TimeStampControl.java

@@ -79,8 +79,8 @@ public class TimeStampControl extends DatabaseControl
     {
         super(_oGridControl, _curfieldcolumn);
         oResource = _oResource;
-        String sDateAppendix = oResource.getResText(UIConsts.RID_FORM + 88);
-        String sTimeAppendix = oResource.getResText(UIConsts.RID_FORM + 89);
+        String sDateAppendix = oResource.getResText("RID_FORM_88");
+        String sTimeAppendix = oResource.getResText("RID_FORM_89");
         oDateControl = new DatabaseControl(_oGridControl, _curfieldcolumn, DataType.DATE, _curfieldcolumn.getFieldTitle() + PropertyNames.SPACE + sDateAppendix);
         oTimeControl = new DatabaseControl(_oGridControl, _curfieldcolumn, DataType.TIME, _curfieldcolumn.getFieldTitle() + PropertyNames.SPACE + sTimeAppendix);
     }

wizards/com/sun/star/wizards/form/DataEntrySetter.java

@@ -41,12 +41,12 @@ public class DataEntrySetter
     {
         short curtabindex = (short) (FormWizard.SODATA_PAGE * 100);
         Integer IDataStep = Integer.valueOf(FormWizard.SODATA_PAGE);
-        String sNewDataOnly = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 44);
-        String sDisplayAllData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 46);
-        String sNoModification = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 47); // AllowUpdates
-        String sNoDeletion = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 48);     // AllowDeletes
-        String sNoAddition = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 49);     // AllowInserts
-        String sdontdisplayExistingData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 45);
+        String sNewDataOnly = CurUnoDialog.m_oResource.getResText("RID_FORM_44");
+        String sDisplayAllData = CurUnoDialog.m_oResource.getResText("RID_FORM_46");
+        String sNoModification = CurUnoDialog.m_oResource.getResText("RID_FORM_47"); // AllowUpdates
+        String sNoDeletion = CurUnoDialog.m_oResource.getResText("RID_FORM_48");     // AllowDeletes
+        String sNoAddition = CurUnoDialog.m_oResource.getResText("RID_FORM_49");     // AllowInserts
+        String sdontdisplayExistingData = CurUnoDialog.m_oResource.getResText("RID_FORM_45");
 
         CurUnoDialog.insertRadioButton("optNewDataOnly", new XItemListenerAdapter() {
                     @Override

wizards/com/sun/star/wizards/form/FieldLinker.java

@@ -41,7 +41,7 @@ public class FieldLinker extends DBLimitedFieldSelection
     private XListBox[] lstMasterFields;
     private int[] SOLINKLST = null;
     private String[] sSlaveListHeader;
-    private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
+    private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText("RID_FORM_40");
 
     public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosY, int _firsthelpid)
     {
@@ -63,8 +63,16 @@ public class FieldLinker extends DBLimitedFieldSelection
                 int SOSECLINKLST = 1;
                 int SOTHIRDLINKLST = 2;
                 int SOFOURTHLINKLST = 3;
-                sSlaveListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 20, 4); //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
-                sMasterListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 24, 4);// new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
+                sSlaveListHeader = new String[4]; //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
+                sSlaveListHeader[0] = CurUnoDialog.m_oResource.getResText("RID_FORM_20");
+                sSlaveListHeader[1] = CurUnoDialog.m_oResource.getResText("RID_FORM_21");
+                sSlaveListHeader[2] = CurUnoDialog.m_oResource.getResText("RID_FORM_22");
+                sSlaveListHeader[3] = CurUnoDialog.m_oResource.getResText("RID_FORM_23");
+                sMasterListHeader = new String[4]; // new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
+                sMasterListHeader[0] = CurUnoDialog.m_oResource.getResText("RID_FORM_24");
+                sMasterListHeader[1] = CurUnoDialog.m_oResource.getResText("RID_FORM_25");
+                sMasterListHeader[2] = CurUnoDialog.m_oResource.getResText("RID_FORM_26");
+                sMasterListHeader[3] = CurUnoDialog.m_oResource.getResText("RID_FORM_27");
                 SOLINKLST = new int[]
                         {
                                 SOFIRSTLINKLST, SOSECLINKLST, SOTHIRDLINKLST, SOFOURTHLINKLST
@@ -264,7 +272,7 @@ public class FieldLinker extends DBLimitedFieldSelection
         int iduplicate = JavaTools.getDuplicateFieldIndex(LinkFieldNames);
         if (iduplicate != -1)
         {
-            String sLinkFieldsAreDuplicate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 19);
+            String sLinkFieldsAreDuplicate = CurUnoDialog.m_oResource.getResText("RID_FORM_19");
             String sLocLinkFieldsAreDuplicate = JavaTools.replaceSubString(sLinkFieldsAreDuplicate, LinkFieldNames[0][iduplicate], "<FIELDNAME1>");
             sLocLinkFieldsAreDuplicate = JavaTools.replaceSubString(sLocLinkFieldsAreDuplicate, LinkFieldNames[1][iduplicate], "<FIELDNAME2>");
             CurUnoDialog.setCurrentStep(FormWizard.SOFIELDLINKER_PAGE);

wizards/com/sun/star/wizards/form/Finalizer.java

@@ -43,10 +43,10 @@ public class Finalizer
         this.CurUnoDialog = _CurUnoDialog;
         short curtabindex = (short) (FormWizard.SOSTORE_PAGE * 100);
 
-        String slblFormName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 50);
-        String slblProceed = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 51);
-        String sWorkWithForm = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 52);
-        String sModifyForm = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 53);
+        String slblFormName = CurUnoDialog.m_oResource.getResText("RID_FORM_50");
+        String slblProceed = CurUnoDialog.m_oResource.getResText("RID_FORM_51");
+        String sWorkWithForm = CurUnoDialog.m_oResource.getResText("RID_FORM_52");
+        String sModifyForm = CurUnoDialog.m_oResource.getResText("RID_FORM_53");
         CurUnoDialog.insertLabel("lblFormName",
                 new String[]
                 {

wizards/com/sun/star/wizards/form/FormConfiguration.java

@@ -56,11 +56,11 @@ public class FormConfiguration
         this.CurUnoDialog = _CurUnoDialog;
         short curtabindex = (short) (FormWizard.SOSUBFORM_PAGE * 100);
         Integer ISubFormStep = Integer.valueOf(FormWizard.SOSUBFORM_PAGE);
-        String sOnExistingRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 5);
-        String sOnManualRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 7);
-        String sSelectManually = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 4);
-        String sSelectRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 8);
-        String sSubFormDescription = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 3);
+        String sOnExistingRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_5");
+        String sOnManualRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_7");
+        String sSelectManually = CurUnoDialog.m_oResource.getResText("RID_FORM_4");
+        String sSelectRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_8");
+        String sSubFormDescription = CurUnoDialog.m_oResource.getResText("RID_FORM_3");
 
         // CheckBox 'Add sub form'
         chkcreateSubForm = CurUnoDialog.insertCheckBox("chkcreateSubForm", new XItemListenerAdapter() {

wizards/com/sun/star/wizards/form/FormControlArranger.java

@@ -598,7 +598,7 @@ public class FormControlArranger
             {
                 if (nFieldType == DataType.TIMESTAMP)
                 {
-                    DBControlList[i] = new TimeStampControl(new Resource(xMSF, "dbw"), oFormHandler, xFormName, sFieldName, aPoint);
+                    DBControlList[i] = new TimeStampControl(new Resource(xMSF), oFormHandler, xFormName, sFieldName, aPoint);
                 }
                 else
                 {

wizards/com/sun/star/wizards/form/FormWizard.java

@@ -67,7 +67,7 @@ public class FormWizard extends DatabaseObjectWizard
     public FormWizard(XMultiServiceFactory i_servicFactory, final PropertyValue[] i_wizardContext)
     {
         super(i_servicFactory, 34400, i_wizardContext);
-        super.addResourceHandler("dbw");
+        super.addResourceHandler();
         Helper.setUnoPropertyValues(xDialogModel,
                 new String[]
                 {
@@ -75,11 +75,11 @@ public class FormWizard extends DatabaseObjectWizard
                 },
                 new Object[]
                 {
-                    210, Boolean.TRUE, "DialogForm", 102, 41, 1, Short.valueOf((short) 0), m_oResource.getResText(UIConsts.RID_FORM), 310
+                    210, Boolean.TRUE, "DialogForm", 102, 41, 1, Short.valueOf((short) 0), m_oResource.getResText("RID_FORM_0"), 310
                 });
         drawNaviBar();
         getFormResources();
-        setRightPaneHeaders(m_oResource, UIConsts.RID_FORM + 90, 8);
+        setRightPaneHeaders(m_oResource, "RID_FORM_", 90, 8);
     }
 
     public static void main(String i_args[])
@@ -316,14 +316,14 @@ public class FormWizard extends DatabaseObjectWizard
     {
         addRoadmap();
         int i = 0;
-        i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_FORM + 80), SOMAIN_PAGE);
-        i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 81), SOSUBFORM_PAGE);
-        i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 82), SOSUBFORMFIELDS_PAGE);
-        i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 83), SOFIELDLINKER_PAGE);
-        i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 84), SOCONTROL_PAGE);
-        i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 85), SODATA_PAGE);
-        i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 86), SOSTYLE_PAGE);
-        i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 87), SOSTORE_PAGE);
+        i = insertRoadmapItem(0, true, m_oResource.getResText("RID_FORM_80"), SOMAIN_PAGE);
+        i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_81"), SOSUBFORM_PAGE);
+        i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_82"), SOSUBFORMFIELDS_PAGE);
+        i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_83"), SOFIELDLINKER_PAGE);
+        i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_84"), SOCONTROL_PAGE);
+        i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_85"), SODATA_PAGE);
+        i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_86"), SOSTYLE_PAGE);
+        i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_87"), SOSTORE_PAGE);
         setRoadmapInteractive(true);
         setRoadmapComplete(true);
         setCurrentRoadmapItemID((short) 1);
@@ -367,11 +367,11 @@ public class FormWizard extends DatabaseObjectWizard
 
     private void getFormResources()
     {
-        sShowBinaryFields = m_oResource.getResText(UIConsts.RID_FORM + 2);
-        slblTables = m_oResource.getResText(UIConsts.RID_FORM + 6);
-        slblFields = m_oResource.getResText(UIConsts.RID_FORM + 12);
-        slblSelFields = m_oResource.getResText(UIConsts.RID_FORM + 1);
-        serrFormNameexists = m_oResource.getResText(UIConsts.RID_FORM + 98);
+        sShowBinaryFields = m_oResource.getResText("RID_FORM_2");
+        slblTables = m_oResource.getResText("RID_FORM_6");
+        slblFields = m_oResource.getResText("RID_FORM_12");
+        slblSelFields = m_oResource.getResText("RID_FORM_1");
+        serrFormNameexists = m_oResource.getResText("RID_FORM_98");
     }
 
     private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener

wizards/com/sun/star/wizards/form/StyleApplier.java

@@ -70,11 +70,11 @@ public class StyleApplier
             xPageStylePropertySet = oTextStyleHandler.getStyleByName("PageStyles", "Standard");
             short curtabindex = (short) (FormWizard.SOSTYLE_PAGE * 100);
             Integer IStyleStep = Integer.valueOf(FormWizard.SOSTYLE_PAGE);
-            String sPageStyles = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 86);
-            String sNoBorder = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 29);
-            String s3DLook = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 30);
-            String sFlat = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 31);
-            String sFieldBorder = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 28);
+            String sPageStyles = CurUnoDialog.m_oResource.getResText("RID_FORM_86");
+            String sNoBorder = CurUnoDialog.m_oResource.getResText("RID_FORM_29");
+            String s3DLook = CurUnoDialog.m_oResource.getResText("RID_FORM_30");
+            String sFlat = CurUnoDialog.m_oResource.getResText("RID_FORM_31");
+            String sFieldBorder = CurUnoDialog.m_oResource.getResText("RID_FORM_28");
             setStyles();
             short[] SelLayoutPos;
             SelLayoutPos = new short[]

wizards/com/sun/star/wizards/form/UIControlArranger.java

@@ -63,9 +63,9 @@ public class UIControlArranger
         this.curFormDocument = _curFormDocument;
         curtabindex = (short) (FormWizard.SOCONTROL_PAGE * 100);
         IControlStep = Integer.valueOf(FormWizard.SOCONTROL_PAGE);
-        String sLabelPlacment = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 32);
-        String sAlignLeft = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 33);
-        String sAlignRight = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 34);
+        String sLabelPlacment = CurUnoDialog.m_oResource.getResText("RID_FORM_32");
+        String sAlignLeft = CurUnoDialog.m_oResource.getResText("RID_FORM_33");
+        String sAlignRight = CurUnoDialog.m_oResource.getResText("RID_FORM_34");
 
         // Label "Label Placement" -----------------
         flnLabelPlacement = CurUnoDialog.insertFixedLine("lnLabelPlacement",
@@ -116,21 +116,21 @@ public class UIControlArranger
         imageModel.addElement(ARRANGEFREE);
 
         // "Columnar - Labels Left"
-        helpTexts.put(ARRANGELISTSIDE, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 36));
+        helpTexts.put(ARRANGELISTSIDE, CurUnoDialog.m_oResource.getResText("RID_FORM_36"));
 
         // "Columnar - Labels of Top"
-        helpTexts.put(ARRANGELISTTOP, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 37));
+        helpTexts.put(ARRANGELISTTOP, CurUnoDialog.m_oResource.getResText("RID_FORM_37"));
 
         // "As Data Sheet"
-        helpTexts.put(ARRANGETABLE, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40));
+        helpTexts.put(ARRANGETABLE, CurUnoDialog.m_oResource.getResText("RID_FORM_40"));
 
         // "In Blocks - Labels Above"
-        helpTexts.put(ARRANGEFREE, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 39));
+        helpTexts.put(ARRANGEFREE, CurUnoDialog.m_oResource.getResText("RID_FORM_39"));
 
-        String sMainArrangementHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 41); // "Arrangement of the main form"
+        String sMainArrangementHeader = CurUnoDialog.m_oResource.getResText("RID_FORM_41"); // "Arrangement of the main form"
         m_aArrangeList[0] = new ArrangeButtonList(0, imageModel, sMainArrangementHeader);
 
-        String sSubArrangementHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 42); // "Arrangement of the sub form"
+        String sSubArrangementHeader = CurUnoDialog.m_oResource.getResText("RID_FORM_42"); // "Arrangement of the sub form"
         m_aArrangeList[1] = new ArrangeButtonList(1, imageModel, sSubArrangementHeader);
         enableAlignControlGroup(false);
     }

wizards/com/sun/star/wizards/query/Finalizer.java

@@ -52,12 +52,12 @@ public class Finalizer
         String reslblHowGoOn;
         this.m_queryWizard = i_queryWizard;
         this.CurDBMetaData = _CurDBMetaData;
-        reslblQueryTitle = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 5);
-        resoptDisplayQuery = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 6);
-        resoptModifyQuery = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 7);
-        resflnSummary = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 87);
-        reslblHowGoOn = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 8);
-        resQuery = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 1);
+        reslblQueryTitle = m_queryWizard.m_oResource.getResText("RID_QUERY_5");
+        resoptDisplayQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_6");
+        resoptModifyQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_7");
+        resflnSummary = m_queryWizard.m_oResource.getResText("RID_QUERY_87");
+        reslblHowGoOn = m_queryWizard.m_oResource.getResText("RID_QUERY_8");
+        resQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_1");
         int curHelpIndex = 40955;
 
         m_queryWizard.insertLabel("lblQueryTitle", new String[]

wizards/com/sun/star/wizards/query/QuerySummary.java

@@ -26,8 +26,6 @@ import com.sun.star.wizards.db.FieldColumn;
 import com.sun.star.wizards.db.QueryMetaData;
 import com.sun.star.wizards.ui.FilterComponent;
 
-import static com.sun.star.wizards.ui.UIConsts.RID_QUERY;
-
 public class QuerySummary extends QueryMetaData
 {
 
@@ -42,9 +40,9 @@ public class QuerySummary extends QueryMetaData
     {
         super(_xMSF);
         this.oResource = _oResource;
-        sAnd = oResource.getResText(RID_QUERY + 38);
-        sOr = oResource.getResText(RID_QUERY + 39);
-        sSeparator = oResource.getResText(RID_QUERY + 91);
+        sAnd = oResource.getResText("RID_QUERY_38");
+        sOr = oResource.getResText("RID_QUERY_39");
+        sSeparator = oResource.getResText("RID_QUERY_91");
         sReturnChar = String.valueOf((char) 13) + String.valueOf((char) 13);
     }
 
@@ -59,15 +57,15 @@ public class QuerySummary extends QueryMetaData
             String sGroupByFraction = PropertyNames.EMPTY_STRING;
             String sHavingFraction = PropertyNames.EMPTY_STRING;
             sFieldNamesFraction = combineFieldNameFraction() + sReturnChar;
-            sSortingFraction = combinePartString(RID_QUERY + 51, getSortFieldNames(), RID_QUERY + 52, RID_QUERY + 93, new String[]