summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java3
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java56
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java6
-rw-r--r--wizards/com/sun/star/wizards/agenda/CallWizard.java18
-rw-r--r--wizards/com/sun/star/wizards/agenda/TopicsControl.java7
-rw-r--r--wizards/com/sun/star/wizards/agenda/agenda.component35
-rw-r--r--wizards/com/sun/star/wizards/agenda/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/common/HelpIds.java1047
-rw-r--r--wizards/com/sun/star/wizards/db/DBMetaData.java32
-rw-r--r--wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java3
-rw-r--r--wizards/com/sun/star/wizards/db/SQLQueryComposer.java82
-rw-r--r--wizards/com/sun/star/wizards/fax/CallWizard.java19
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java69
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java2
-rw-r--r--wizards/com/sun/star/wizards/fax/fax.component35
-rw-r--r--wizards/com/sun/star/wizards/fax/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/form/CallFormWizard.java17
-rw-r--r--wizards/com/sun/star/wizards/form/DataEntrySetter.java10
-rw-r--r--wizards/com/sun/star/wizards/form/FieldLinker.java5
-rw-r--r--wizards/com/sun/star/wizards/form/Finalizer.java6
-rw-r--r--wizards/com/sun/star/wizards/form/FormConfiguration.java8
-rw-r--r--wizards/com/sun/star/wizards/form/StyleApplier.java8
-rw-r--r--wizards/com/sun/star/wizards/form/UIControlArranger.java6
-rw-r--r--wizards/com/sun/star/wizards/form/form.component35
-rw-r--r--wizards/com/sun/star/wizards/form/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/letter/CallWizard.java19
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialog.java94
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java2
-rw-r--r--wizards/com/sun/star/wizards/letter/letter.component35
-rw-r--r--wizards/com/sun/star/wizards/letter/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/makefile.mk1
-rw-r--r--wizards/com/sun/star/wizards/query/CallQueryWizard.java17
-rw-r--r--wizards/com/sun/star/wizards/query/Finalizer.java8
-rw-r--r--wizards/com/sun/star/wizards/query/QueryWizard.java256
-rw-r--r--wizards/com/sun/star/wizards/query/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/query/query.component35
-rw-r--r--wizards/com/sun/star/wizards/report/CallReportWizard.java20
-rw-r--r--wizards/com/sun/star/wizards/report/Dataimport.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportFinalizer.java10
-rw-r--r--wizards/com/sun/star/wizards/report/ReportLayouter.java8
-rw-r--r--wizards/com/sun/star/wizards/report/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/report/report.component35
-rw-r--r--wizards/com/sun/star/wizards/table/CallTableWizard.java17
-rw-r--r--wizards/com/sun/star/wizards/table/FieldFormatter.java14
-rw-r--r--wizards/com/sun/star/wizards/table/Finalizer.java12
-rw-r--r--wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java14
-rw-r--r--wizards/com/sun/star/wizards/table/ScenarioSelector.java6
-rw-r--r--wizards/com/sun/star/wizards/table/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/table/table.component35
-rw-r--r--wizards/com/sun/star/wizards/ui/AggregateComponent.java13
-rw-r--r--wizards/com/sun/star/wizards/ui/ButtonList.java9
-rw-r--r--wizards/com/sun/star/wizards/ui/CommandFieldSelection.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/ControlScroller.java3
-rw-r--r--wizards/com/sun/star/wizards/ui/FieldSelection.java18
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java227
-rw-r--r--wizards/com/sun/star/wizards/ui/ImageList.java7
-rw-r--r--wizards/com/sun/star/wizards/ui/SortingComponent.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/TitlesComponent.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java12
-rw-r--r--wizards/com/sun/star/wizards/web/CallWizard.java19
-rw-r--r--wizards/com/sun/star/wizards/web/FTPDialog.java19
-rw-r--r--wizards/com/sun/star/wizards/web/ImageListDialog.java11
-rw-r--r--wizards/com/sun/star/wizards/web/WWD_General.java3
-rw-r--r--wizards/com/sun/star/wizards/web/WebWizardDialog.java89
-rw-r--r--wizards/com/sun/star/wizards/web/makefile.mk8
-rw-r--r--wizards/com/sun/star/wizards/web/web.component35
-rw-r--r--wizards/prj/d.lst8
-rw-r--r--wizards/source/depot/Dialog2.xdl24
-rw-r--r--wizards/source/depot/Dialog3.xdl30
-rw-r--r--wizards/source/depot/Dialog4.xdl8
-rw-r--r--wizards/source/euro/DlgConvert.xdl40
-rw-r--r--wizards/source/euro/DlgPassword.xdl6
-rw-r--r--wizards/source/formwizard/DlgFormDB.xdl40
-rw-r--r--wizards/source/importwizard/ImportDialog.xdl54
-rw-r--r--wizards/source/schedule/DlgCalendar.xdl32
-rw-r--r--wizards/source/template/DialogStyles.xdl8
-rw-r--r--wizards/source/template/TemplateDialog.xdl16
-rw-r--r--wizards/source/webwizard/WebWzrd.xdl16
-rw-r--r--wizards/util/helpids.h859
-rw-r--r--wizards/util/hidother.src1279
80 files changed, 3603 insertions, 1505 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
index 9df6bbef9..e4452bb60 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
@@ -26,6 +26,7 @@
************************************************************************/
package com.sun.star.wizards.agenda;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.awt.FontDescriptor;
import com.sun.star.awt.XButton;
import com.sun.star.awt.XCheckBox;
@@ -381,4 +382,4 @@ public abstract class AgendaWizardDialog extends WizardDialog implements Agenda
}
-} \ No newline at end of file
+}
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java
index 109818f88..6e06327ef 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java
@@ -26,6 +26,8 @@
************************************************************************/
package com.sun.star.wizards.agenda;
+import com.sun.star.wizards.common.HelpIds;
+
public interface AgendaWizardDialogConst {
/**
@@ -58,37 +60,37 @@ public interface AgendaWizardDialogConst {
* "HID:(hid+5)" - the cancel button
*/
- final String LISTPAGEDESIGN_HID = "HID:" + (HID + 6);
- final String CHKMINUTES_HID = "HID:" + (HID + 7);
- final String TXTTIME_HID = "HID:" + (HID + 8);
- final String TXTDATE_HID = "HID:" + (HID + 9);
- final String TXTTITLE_HID = "HID:" + (HID + 10);
- final String CBLOCATION_HID = "HID:" + (HID + 11);
+ final String LISTPAGEDESIGN_HID = HelpIds.getHelpIdString((HID + 6));
+ final String CHKMINUTES_HID = HelpIds.getHelpIdString((HID + 7));
+ final String TXTTIME_HID = HelpIds.getHelpIdString((HID + 8));
+ final String TXTDATE_HID = HelpIds.getHelpIdString((HID + 9));
+ final String TXTTITLE_HID = HelpIds.getHelpIdString((HID + 10));
+ final String CBLOCATION_HID = HelpIds.getHelpIdString((HID + 11));
- final String CHKMEETINGTITLE_HID = "HID:" + (HID + 12);
- final String CHKREAD_HID = "HID:" + (HID + 13);
- final String CHKBRING_HID = "HID:" + (HID + 14);
- final String CHKNOTES_HID = "HID:" + (HID + 15);
+ final String CHKMEETINGTITLE_HID = HelpIds.getHelpIdString((HID + 12));
+ final String CHKREAD_HID = HelpIds.getHelpIdString((HID + 13));
+ final String CHKBRING_HID = HelpIds.getHelpIdString((HID + 14));
+ final String CHKNOTES_HID = HelpIds.getHelpIdString((HID + 15));
- final String CHKCONVENEDBY_HID = "HID:" + (HID + 16);
- final String CHKPRESIDING_HID = "HID:" + (HID + 17);
- final String CHKNOTETAKER_HID = "HID:" + (HID + 18);
- final String CHKTIMEKEEPER_HID = "HID:" + (HID + 19);
- final String CHKATTENDEES_HID = "HID:" + (HID + 20);
- final String CHKOBSERVERS_HID = "HID:" + (HID + 21);
- final String CHKRESOURCEPERSONS_HID = "HID:" + (HID + 22);
+ final String CHKCONVENEDBY_HID = HelpIds.getHelpIdString((HID + 16));
+ final String CHKPRESIDING_HID = HelpIds.getHelpIdString((HID + 17));
+ final String CHKNOTETAKER_HID = HelpIds.getHelpIdString((HID + 18));
+ final String CHKTIMEKEEPER_HID = HelpIds.getHelpIdString((HID + 19));
+ final String CHKATTENDEES_HID = HelpIds.getHelpIdString((HID + 20));
+ final String CHKOBSERVERS_HID = HelpIds.getHelpIdString((HID + 21));
+ final String CHKRESOURCEPERSONS_HID = HelpIds.getHelpIdString((HID + 22));
- final String TXTTEMPLATENAME_HID = "HID:" + (HID + 23);
- final String TXTTEMPLATEPATH_HID = "HID:" + (HID + 24);
- final String BTNTEMPLATEPATH_HID = "HID:" + (HID + 25);
+ final String TXTTEMPLATENAME_HID = HelpIds.getHelpIdString((HID + 23));
+ final String TXTTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 24));
+ final String BTNTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 25));
- final String OPTCREATEAGENDA_HID = "HID:" + (HID + 26);
- final String OPTMAKECHANGES_HID = "HID:" + (HID + 27);
+ final String OPTCREATEAGENDA_HID = HelpIds.getHelpIdString((HID + 26));
+ final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString((HID + 27));
- final String BTNINSERT_HID = "HID:" + (HID + 28);
- final String BTNREMOVE_HID = "HID:" + (HID + 29);
- final String BTNUP_HID = "HID:" + (HID + 30);
- final String BTNDOWN_HID = "HID:" + (HID + 31);
+ final String BTNINSERT_HID = HelpIds.getHelpIdString((HID + 28));
+ final String BTNREMOVE_HID = HelpIds.getHelpIdString((HID + 29));
+ final String BTNUP_HID = HelpIds.getHelpIdString((HID + 30));
+ final String BTNDOWN_HID = HelpIds.getHelpIdString((HID + 31));
final int LAST_HID = HID + 32;
@@ -104,4 +106,4 @@ public interface AgendaWizardDialogConst {
}
- \ No newline at end of file
+
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
index a2969df13..963b3002a 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
@@ -40,7 +40,6 @@ import com.sun.star.lang.EventObject;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.task.XInteractionHandler;
import com.sun.star.text.XTextDocument;
-//import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.util.CloseVetoException;
import com.sun.star.util.XCloseable;
@@ -50,6 +49,7 @@ import com.sun.star.wizards.common.FileAccess;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.NoValidPathException;
import com.sun.star.wizards.common.SystemDialog;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.wizards.document.OfficeDocument;
import com.sun.star.wizards.text.ViewHandler;
import com.sun.star.wizards.ui.PathSelection;
@@ -202,7 +202,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
public void insertPathSelectionControl() {
myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE);
- myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + ( HID + 24 ), "HID:" + ( HID + 25 ));
+ myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString( HID + 24 ), HelpIds.getHelpIdString( HID + 25 ));
myPathSelection.sDefaultDirectory = sUserTemplatePath;
myPathSelection.sDefaultName = "myAgendaTemplate.ott";
myPathSelection.sDefaultFilter = "writer8_template";
@@ -594,4 +594,4 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
}
- \ No newline at end of file
+
diff --git a/wizards/com/sun/star/wizards/agenda/CallWizard.java b/wizards/com/sun/star/wizards/agenda/CallWizard.java
index de5a16106..bcaf82726 100644
--- a/wizards/com/sun/star/wizards/agenda/CallWizard.java
+++ b/wizards/com/sun/star/wizards/agenda/CallWizard.java
@@ -40,8 +40,7 @@ import com.sun.star.uno.Type;
/**
* This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the
- * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>).
+ * creating the service (<CODE>__getServiceFactory</CODE>).
*
* @author $author$
* @version $Revision: 1.5.52.1 $
@@ -74,21 +73,6 @@ public class CallWizard {
}
/**
- * Writes the service information into the given registry key. This method is called
- * by the <code>JavaLoader</code>.
- *
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single registry key accessible.
- *
- * @return returns true if the operation succeeded
- *
- * @see com.sun.star.comp.loader.JavaLoader#
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
- }
-
- /**
* This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java
index db39ea99d..08f03ca6a 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java
@@ -27,6 +27,7 @@
package com.sun.star.wizards.agenda;
import java.util.List;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.awt.FocusEvent;
import com.sun.star.awt.Key;
@@ -1178,21 +1179,21 @@ public class TopicsControl extends ControlScroller implements XFocusListener
TEXT_PROPS,
new Object[]
{
- I_12, "HID:" + (curHelpIndex + i * 3 + 1), new Integer(x + 15), y_, IStep, new Short((short) (tabindex + 1)), new Integer(84)
+ I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 1), new Integer(x + 15), y_, IStep, new Short((short) (tabindex + 1)), new Integer(84)
});
combobox = dialog.insertTextField(RESP + i, "responsibleTextChanged", this,
TEXT_PROPS,
new Object[]
{
- I_12, "HID:" + (curHelpIndex + i * 3 + 2), new Integer(x + 103), y_, IStep, new Short((short) (tabindex + 2)), new Integer(68)
+ I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 2), new Integer(x + 103), y_, IStep, new Short((short) (tabindex + 2)), new Integer(68)
});
timebox = dialog.insertTextField(TIME + i, "timeTextChanged", this,
TEXT_PROPS,
new Object[]
{
- I_12, "HID:" + (curHelpIndex + i * 3 + 3), new Integer(x + 175), y_, IStep, new Short((short) (tabindex + 3)), new Integer(20)
+ I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 3), new Integer(x + 175), y_, IStep, new Short((short) (tabindex + 3)), new Integer(20)
});
setEnabled(false);
diff --git a/wizards/com/sun/star/wizards/agenda/agenda.component b/wizards/com/sun/star/wizards/agenda/agenda.component
new file mode 100644
index 000000000..e35087d94
--- /dev/null
+++ b/wizards/com/sun/star/wizards/agenda/agenda.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation
+ name="com.sun.star.wizards.agenda.CallWizard$WizardImplementation">
+ <service name="com.sun.star.wizards.agenda.CallWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk
index 314dcf3b7..1f07e9adf 100644
--- a/wizards/com/sun/star/wizards/agenda/makefile.mk
+++ b/wizards/com/sun/star/wizards/agenda/makefile.mk
@@ -69,3 +69,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/agenda.component
+
+$(MISC)/agenda.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ agenda.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt agenda.component
diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java
new file mode 100644
index 000000000..05c80fcad
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/HelpIds.java
@@ -0,0 +1,1047 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package com.sun.star.wizards.common;
+
+public class HelpIds
+{
+ private static String array1[] = new String[]
+ {
+ "HID:WIZARDS_HID0_WEBWIZARD", // HID:34200
+ "HID:WIZARDS_HID0_HELP", // HID:34201
+ "HID:WIZARDS_HID0_NEXT", // HID:34202
+ "HID:WIZARDS_HID0_PREV", // HID:34203
+ "HID:WIZARDS_HID0_CREATE", // HID:34204
+ "HID:WIZARDS_HID0_CANCEL", // HID:34205
+ "HID:WIZARDS_HID0_STATUS_DIALOG", // HID:34206
+ "HID:WIZARDS_HID1_LST_SESSIONS", // HID:34207
+ "",
+ "HID:WIZARDS_HID1_BTN_DEL_SES", // HID:34209
+ "HID:WIZARDS_HID2_LST_DOCS", // HID:34210
+ "HID:WIZARDS_HID2_BTN_ADD_DOC", // HID:34211
+ "HID:WIZARDS_HID2_BTN_REM_DOC", // HID:34212
+ "HID:WIZARDS_HID2_BTN_DOC_UP", // HID:34213
+ "HID:WIZARDS_HID2_BTN_DOC_DOWN", // HID:34214
+ "HID:WIZARDS_HID2_TXT_DOC_TITLE", // HID:34215
+ "HID:WIZARDS_HID2_TXT_DOC_DESC", // HID:34216
+ "HID:WIZARDS_HID2_TXT_DOC_AUTHOR", // HID:34217
+ "HID:WIZARDS_HID2_LST_DOC_EXPORT", // HID:34218
+ "HID:WIZARDS_HID2_STATUS_ADD_DOCS", // HID:34219
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG1", // HID:34220
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG2", // HID:34221
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG3", // HID:34222
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG4", // HID:34223
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG5", // HID:34224
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG6", // HID:34225
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG7", // HID:34226
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG8", // HID:34227
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG9", // HID:34228
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG10", // HID:34229
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG11", // HID:34230
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG12", // HID:34231
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG13", // HID:34232
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG14", // HID:34233
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG15", // HID:34234
+ "HID:WIZARDS_HID4_CHK_DISPLAY_FILENAME", // HID:34235
+ "HID:WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION", // HID:34236
+ "HID:WIZARDS_HID4_CHK_DISPLAY_AUTHOR", // HID:34237
+ "HID:WIZARDS_HID4_CHK_DISPLAY_CR_DATE", // HID:34238
+ "HID:WIZARDS_HID4_CHK_DISPLAY_UP_DATE", // HID:34239
+ "HID:WIZARDS_HID4_CHK_DISPLAY_FORMAT", // HID:34240
+ "HID:WIZARDS_HID4_CHK_DISPLAY_F_ICON", // HID:34241
+ "HID:WIZARDS_HID4_CHK_DISPLAY_PAGES", // HID:34242
+ "HID:WIZARDS_HID4_CHK_DISPLAY_SIZE", // HID:34243
+ "HID:WIZARDS_HID4_GRP_OPTIMAIZE_640", // HID:34244
+ "HID:WIZARDS_HID4_GRP_OPTIMAIZE_800", // HID:34245
+ "HID:WIZARDS_HID4_GRP_OPTIMAIZE_1024", // HID:34246
+ "HID:WIZARDS_HID5_LST_STYLES", // HID:34247
+ "HID:WIZARDS_HID5_BTN_BACKGND", // HID:34248
+ "HID:WIZARDS_HID5_BTN_ICONS", // HID:34249
+ "HID:WIZARDS_HID6_TXT_SITE_TITLE", // HID:34250
+ "",
+ "",
+ "HID:WIZARDS_HID6_TXT_SITE_DESC", // HID:34253
+ "",
+ "HID:WIZARDS_HID6_DATE_SITE_CREATED", // HID:34255
+ "HID:WIZARDS_HID6_DATE_SITE_UPDATED", // HID:34256
+ "",
+ "HID:WIZARDS_HID6_TXT_SITE_EMAIL", // HID:34258
+ "HID:WIZARDS_HID6_TXT_SITE_COPYRIGHT", // HID:34259
+ "HID:WIZARDS_HID7_BTN_PREVIEW", // HID:34260
+ "HID:WIZARDS_HID7_CHK_PUBLISH_LOCAL", // HID:34261
+ "HID:WIZARDS_HID7_TXT_LOCAL", // HID:34262
+ "HID:WIZARDS_HID7_BTN_LOCAL", // HID:34263
+ "HID:WIZARDS_HID7_CHK_PUBLISH_ZIP", // HID:34264
+ "HID:WIZARDS_HID7_TXT_ZIP", // HID:34265
+ "HID:WIZARDS_HID7_BTN_ZIP", // HID:34266
+ "HID:WIZARDS_HID7_CHK_PUBLISH_FTP", // HID:34267
+ "HID:WIZARDS_HID7_TXT_FTP", // HID:34268
+ "HID:WIZARDS_HID7_BTN_FTP", // HID:34269
+ "HID:WIZARDS_HID7_CHK_SAVE", // HID:34270
+ "HID:WIZARDS_HID7_TXT_SAVE", // HID:34271
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_BG", // HID:34290
+ "HID:WIZARDS_HID_BG_BTN_OTHER", // HID:34291
+ "HID:WIZARDS_HID_BG_BTN_NONE", // HID:34292
+ "HID:WIZARDS_HID_BG_BTN_OK", // HID:34293
+ "HID:WIZARDS_HID_BG_BTN_CANCEL", // HID:34294
+ "HID:WIZARDS_HID_BG_BTN_BACK", // HID:34295
+ "HID:WIZARDS_HID_BG_BTN_FW", // HID:34296
+ "HID:WIZARDS_HID_BG_BTN_IMG1", // HID:34297
+ "HID:WIZARDS_HID_BG_BTN_IMG2", // HID:34298
+ "HID:WIZARDS_HID_BG_BTN_IMG3", // HID:34299
+ "HID:WIZARDS_HID_BG_BTN_IMG4", // HID:34300
+ "HID:WIZARDS_HID_BG_BTN_IMG5", // HID:34301
+ "HID:WIZARDS_HID_BG_BTN_IMG6", // HID:34302
+ "HID:WIZARDS_HID_BG_BTN_IMG7", // HID:34303
+ "HID:WIZARDS_HID_BG_BTN_IMG8", // HID:34304
+ "HID:WIZARDS_HID_BG_BTN_IMG9", // HID:34305
+ "HID:WIZARDS_HID_BG_BTN_IMG10", // HID:34306
+ "HID:WIZARDS_HID_BG_BTN_IMG11", // HID:34307
+ "HID:WIZARDS_HID_BG_BTN_IMG12", // HID:34308
+ "HID:WIZARDS_HID_BG_BTN_IMG13", // HID:34309
+ "HID:WIZARDS_HID_BG_BTN_IMG14", // HID:34300
+ "HID:WIZARDS_HID_BG_BTN_IMG15", // HID:34311
+ "HID:WIZARDS_HID_BG_BTN_IMG16", // HID:34312
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_DIALOG", // HID:34320
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDPREV", // HID:34322
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDNEXT", // HID:34323
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDFINISH", // HID:34324
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDCANCEL", // HID:34325
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_1_LBTABLES", // HID:34330
+ "HID:WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE", // HID:34331
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED", // HID:34332
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEALL", // HID:34333
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED", // HID:34334
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL", // HID:34335
+ "HID:WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED", // HID:34336
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEUP", // HID:34337
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEDOWN", // HID:34338
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_2_GROUPING", // HID:34340
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDGROUP", // HID:34341
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP", // HID:34342
+ "HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST", // HID:34343
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP", // HID:34344
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP", // HID:34345
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT1", // HID:34346
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1", // HID:34347
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1", // HID:34348
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT2", // HID:34349
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2", // HID:34350
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2", // HID:34351
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT3", // HID:34352
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3", // HID:34353
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3", // HID:34354
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT4", // HID:34355
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4", // HID:34356
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4", // HID:34357
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_4_TITLE", // HID:34362
+ "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", // HID:34363
+ "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", // HID:34364
+ "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", // HID:34365
+ "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", // HID:34366
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", // HID:34370
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", // HID:34371
+ "HID:WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH", // HID:34372
+ "HID:WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH", // HID:34373
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", // HID:34374
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", // HID:34375
+ "HID:WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH", // HID:34376
+ "HID:WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH", // HID:34377
+ "HID:WIZARDS_HID_DLGREPORT_5_CHKLINKTODB", // HID:34378
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_1", // HID:34381
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_2", // HID:34382
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_3", // HID:34383
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_4", // HID:34384
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_5", // HID:34385
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_6", // HID:34386
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_7", // HID:34387
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_DIALOG", // HID:34400
+ "",
+ "HID:WIZARDS_HID_DLGFORM_CMDPREV", // HID:34402
+ "HID:WIZARDS_HID_DLGFORM_CMDNEXT", // HID:34403
+ "HID:WIZARDS_HID_DLGFORM_CMDFINISH", // HID:34404
+ "HID:WIZARDS_HID_DLGFORM_CMDCANCEL", // HID:34405
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_MASTER_LBTABLES", // HID:34411
+ "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE", // HID:34412
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED", // HID:34413
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL", // HID:34414
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED", // HID:34415
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL", // HID:34416
+ "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED", // HID:34417
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP", // HID:34418
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN", // HID:34419
+ "",
+ "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", // HID:34421
+ "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", // HID:34422
+ "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", // HID:34423
+ "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", // HID:34424
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_SUB_LBTABLES", // HID:34431
+ "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE", // HID:34432
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED", // HID:34433
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL", // HID:34434
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED", // HID:34435
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL", // HID:34436
+ "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSSELECTED", // HID:34437
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP", // HID:34438
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN", // HID:34439
+ "",
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1", // HID:34441
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1", // HID:34442
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2", // HID:34443
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2", // HID:34444
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3", // HID:34445
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3", // HID:34446
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4", // HID:34447
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4", // HID:34448
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", // HID:34451
+ "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", // HID:34452
+ "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED", // HID:34453
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED", // HID:34454
+ "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE", // HID:34455
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED", // HID:34456
+ "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED2", // HID:34457
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED2", // HID:34458
+ "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE2", // HID:34459
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED2", // HID:34460
+ "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", // HID:34461
+ "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", // HID:34462
+ "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", // HID:34463
+ "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", // HID:34464
+ "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", // HID:34465
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", // HID:34471
+ "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", // HID:34472
+ "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", // HID:34473
+ "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", // HID:34474
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_TXTPATH", // HID:34481
+ "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", // HID:34482
+ "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", // HID:34483
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGNEWSLTR_DIALOG", // HID:34500
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT", // HID:34501
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT", // HID:34502
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT", // HID:34503
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED", // HID:34504
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED", // HID:34505
+ "HID:WIZARDS_HID_DLGNEWSLTR_CMDGOON", // HID:34506
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY", // HID:34520
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY", // HID:34521
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY", // HID:34522
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTRATE", // HID:34523
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTDATE", // HID:34524
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION", // HID:34525
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTFIX", // HID:34526
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM", // HID:34527
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY", // HID:34528
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY", // HID:34529
+ "HID:WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS", // HID:34530
+ "HID:WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS", // HID:34531
+ "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT", // HID:34532
+ "HID:WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES", // HID:34533
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT", // HID:34534
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT", // HID:34535
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT", // HID:34536
+ "HID:WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE", // HID:34537
+ "HID:WIZARDS_HID_DLGDEPOT_1_OPTTOTAL", // HID:34538
+ "HID:WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND", // HID:34539
+ "HID:WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE", // HID:34540
+ "HID:WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE", // HID:34541
+ "HID:WIZARDS_HID_DLGDEPOT_2_TXTDATE", // HID:34542
+ "HID:WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE", // HID:34543
+ "HID:WIZARDS_HID_DLGDEPOT_3_TXTENDDATE", // HID:34544
+ "HID:WIZARDS_HID_DLGDEPOT_3_OPTDAILY", // HID:34545
+ "HID:WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY", // HID:34546
+ "HID:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY", // HID:34547
+ "HID:WIZARDS_HID_DLGDEPOT_LSTMARKETS", // HID:34548
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY", // HID:34549
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY", // HID:34550
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGIMPORT_DIALOG", // HID:34570
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDHELP", // HID:34571
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL", // HID:34572
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDPREV", // HID:34573
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDNEXT", // HID:34574
+ "HID:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS", // HID:34575
+ "HID:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS", // HID:34576
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE", // HID:34577
+ "HID:WIZARDS_HID_DLGIMPORT_2_CHKWORD", // HID:34578
+ "HID:WIZARDS_HID_DLGIMPORT_2_CHKEXCEL", // HID:34579
+ "HID:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT", // HID:34580
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE", // HID:34581
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE", // HID:34582
+ "HID:WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH", // HID:34583
+ "HID:WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH", // HID:34584
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT", // HID:34585
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT", // HID:34586
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE", // HID:34587
+ "HID:WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH", // HID:34588
+ "HID:WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH", // HID:34589
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT", // HID:34590
+ "HID:WIZARDS_HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH", // HID:34591
+ "HID:WIZARDS_HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH", // HID:34592
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDEXPORTPATHSELECT", // HID:34593
+ "",
+ "HID:WIZARDS_HID_DLGIMPORT_3_TBSUMMARY", // HID:34595
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKWRITER", // HID:34596
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKCALC", // HID:34597
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS", // HID:34598
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL", // HID:34599
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2", // HID:34600
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2", // HID:34601
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_DIALOG", // HID:34630
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL", // HID:34631
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1", // HID:34632
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2", // HID:34633
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY", // HID:34634
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1", // HID:34635
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2", // HID:34636
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY", // HID:34637
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGSTYLES_DIALOG", // HID:34650
+ "HID:WIZARDS_HID_DLGSTYLES_LISTBOX", // HID:34651
+ "HID:WIZARDS_HID_DLGSTYLES_CANCEL", // HID:34652
+ "HID:WIZARDS_HID_DLGSTYLES_OKAY", // HID:34653
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGCONVERT_DIALOG", // HID:34660
+ "HID:WIZARDS_HID_DLGCONVERT_CHECKBOX1", // HID:34661
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1", // HID:34662
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2", // HID:34663
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3", // HID:34664
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4", // HID:34665
+ "HID:WIZARDS_HID_DLGCONVERT_LISTBOX1", // HID:34666
+ "HID:WIZARDS_HID_DLGCONVERT_OBFILE", // HID:34667
+ "HID:WIZARDS_HID_DLGCONVERT_OBDIR", // HID:34668
+ "HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1", // HID:34669
+ "HID:WIZARDS_HID_DLGCONVERT_TBSOURCE", // HID:34670
+ "HID:WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE", // HID:34671
+ "HID:WIZARDS_HID_DLGCONVERT_TBTARGET", // HID:34672
+ "HID:WIZARDS_HID_DLGCONVERT_CBCANCEL", // HID:34673
+ "HID:WIZARDS_HID_DLGCONVERT_CBHELP", // HID:34674
+ "HID:WIZARDS_HID_DLGCONVERT_CBBACK", // HID:34675
+ "HID:WIZARDS_HID_DLGCONVERT_CBGOON", // HID:34676
+ "HID:WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN", // HID:34677
+ "HID:WIZARDS_HID_DLGCONVERT_CBTARGETOPEN", // HID:34678
+ "HID:WIZARDS_HID_DLGCONVERT_CHKPROTECT", // HID:34679
+ "HID:WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS", // HID:34680
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGPASSWORD_CMDGOON", // HID:34690
+ "HID:WIZARDS_HID_DLGPASSWORD_CMDCANCEL", // HID:34691
+ "HID:WIZARDS_HID_DLGPASSWORD_CMDHELP", // HID:34692
+ "HID:WIZARDS_HID_DLGPASSWORD_TXTPASSWORD", // HID:34693
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG", // HID:34700
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW", // HID:34701
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR", // HID:34702
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH", // HID:34703
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR", // HID:34704
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH", // HID:34705
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINYEAR", // HID:34706
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINMONTH", // HID:34707
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE", // HID:34708
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA", // HID:34709
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT", // HID:34710
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE", // HID:34711
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT", // HID:34712
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT", // HID:34713
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY", // HID:34714
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTDAY", // HID:34715
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH", // HID:34716
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH", // HID:34717
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR", // HID:34718
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR", // HID:34719
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA", // HID:34720
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL", // HID:34721
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" // HID:34722
+ };
+ private static String array2[] = new String[]
+ {
+ "HID:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER", // HID:40769
+ "HID:WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER", // HID:40770
+ "HID:WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER", // HID:40771
+ "HID:WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE", // HID:40772
+ "HID:WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER", // HID:40773
+ "HID:WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE", // HID:40774
+ "HID:WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE", // HID:40775
+ "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO", // HID:40776
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT", // HID:40777
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOX", // HID:40778
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH", // HID:40779
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOY", // HID:40780
+ "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS", // HID:40781
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT", // HID:40782
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSX", // HID:40783
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH", // HID:40784
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSY", // HID:40785
+ "HID:WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER", // HID:40786
+ "HID:WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER", // HID:40787
+ "HID:WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT", // HID:40788
+ "HID:WIZARDS_HID_LTRWIZ_LSTLETTERNORM", // HID:40789
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSELOGO", // HID:40790
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER", // HID:40791
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSESIGNS", // HID:40792
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSESUBJECT", // HID:40793
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSESALUTATION", // HID:40794
+ "HID:WIZARDS_HID_LTRWIZ_LSTSALUTATION", // HID:40795
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS", // HID:40796
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEGREETING", // HID:40797
+ "HID:WIZARDS_HID_LTRWIZ_LSTGREETING", // HID:40798
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEFOOTER", // HID:40799
+ "HID:WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER", // HID:40800
+ "HID:WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE", // HID:40801
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERNAME", // HID:40802
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTREET", // HID:40803
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE", // HID:40804
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT", // HID:40805
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERCITY", // HID:40806
+ "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER", // HID:40807
+ "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE", // HID:40808
+ "HID:WIZARDS_HID_LTRWIZ_TXTFOOTER", // HID:40809
+ "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES", // HID:40810
+ "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS", // HID:40811
+ "HID:WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME", // HID:40812
+ "HID:WIZARDS_HID_LTRWIZ_OPTCREATELETTER", // HID:40813
+ "HID:WIZARDS_HID_LTRWIZ_OPTMAKECHANGES", // HID:40814
+ "HID:WIZARDS_HID_LTRWIZ_TXTPATH", // HID:40815
+ "HID:WIZARDS_HID_LTRWIZ_CMDPATH", // HID:40816
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_LTRWIZARD", // HID:40820
+ "HID:WIZARDS_HID_LTRWIZARD_HELP", // HID:40821
+ "HID:WIZARDS_HID_LTRWIZARD_BACK", // HID:40822
+ "HID:WIZARDS_HID_LTRWIZARD_NEXT", // HID:40823
+ "HID:WIZARDS_HID_LTRWIZARD_CREATE", // HID:40824
+ "HID:WIZARDS_HID_LTRWIZARD_CANCEL", // HID:40825
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTTABLES", // HID:40850
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDS", // HID:40851
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED", // HID:40852
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEALL", // HID:40853
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED", // HID:40854
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL", // HID:40855
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS", // HID:40856
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEUP", // HID:40857
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN", // HID:40858
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT1", // HID:40865
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND1", // HID:40866
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND1", // HID:40867
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT2", // HID:40868
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND2", // HID:40869
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND2", // HID:40870
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT3", // HID:40871
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND3", // HID:40872
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND3", // HID:40873
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT4", // HID:40874
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND4", // HID:40875
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND4", // HID:40876
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHALL", // HID:40878
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHANY", // HID:40879
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1", // HID:40880
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1", // HID:40881
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_1", // HID:40882
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2", // HID:40883
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2", // HID:40884
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_2", // HID:40885
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3", // HID:40886
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3", // HID:40887
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_3", // HID:40888
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY", // HID:40895
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY", // HID:40896
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1", // HID:40897
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1", // HID:40898
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2", // HID:40899
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2", // HID:40900
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3", // HID:40901
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3", // HID:40902
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4", // HID:40903
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4", // HID:40904
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5", // HID:40905
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5", // HID:40906
+ "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS", // HID:40907
+ "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS", // HID:40908
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS", // HID:40915
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED", // HID:40916
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED", // HID:40917
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS", // HID:40918
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP", // HID:40919
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN", // HID:40920
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL", // HID:40923
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY", // HID:40924
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1", // HID:40925
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1", // HID:40926
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1", // HID:40927
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2", // HID:40928
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2", // HID:40929
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2", // HID:40930
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3", // HID:40931
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3", // HID:40932
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3", // HID:40933
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_1", // HID:40940
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_2", // HID:40941
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_3", // HID:40942
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_4", // HID:40943
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_5", // HID:40944
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_6", // HID:40945
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_7", // HID:40946
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE", // HID:40955
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY", // HID:40956
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY", // HID:40957
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTSUMMARY", // HID:40958
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD", // HID:40970
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_BACK", // HID:40972
+ "HID:WIZARDS_HID_QUERYWIZARD_NEXT", // HID:40973
+ "HID:WIZARDS_HID_QUERYWIZARD_CREATE", // HID:40974
+ "HID:WIZARDS_HID_QUERYWIZARD_CANCEL", // HID:40975
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_IS", // HID:41000
+ "",
+ "HID:WIZARDS_HID_IS_BTN_NONE", // HID:41002
+ "HID:WIZARDS_HID_IS_BTN_OK", // HID:41003
+ "HID:WIZARDS_HID_IS_BTN_CANCEL", // HID:41004
+ "HID:WIZARDS_HID_IS_BTN_IMG1", // HID:41005
+ "HID:WIZARDS_HID_IS_BTN_IMG2", // HID:41006
+ "HID:WIZARDS_HID_IS_BTN_IMG3", // HID:41007
+ "HID:WIZARDS_HID_IS_BTN_IMG4", // HID:41008
+ "HID:WIZARDS_HID_IS_BTN_IMG5", // HID:41009
+ "HID:WIZARDS_HID_IS_BTN_IMG6", // HID:41010
+ "HID:WIZARDS_HID_IS_BTN_IMG7", // HID:41011
+ "HID:WIZARDS_HID_IS_BTN_IMG8", // HID:41012
+ "HID:WIZARDS_HID_IS_BTN_IMG9", // HID:41013
+ "HID:WIZARDS_HID_IS_BTN_IMG10", // HID:41014
+ "HID:WIZARDS_HID_IS_BTN_IMG11", // HID:41015
+ "HID:WIZARDS_HID_IS_BTN_IMG12", // HID:41016
+ "HID:WIZARDS_HID_IS_BTN_IMG13", // HID:41017
+ "HID:WIZARDS_HID_IS_BTN_IMG14", // HID:41018
+ "HID:WIZARDS_HID_IS_BTN_IMG15", // HID:41019
+ "HID:WIZARDS_HID_IS_BTN_IMG16", // HID:41020
+ "HID:WIZARDS_HID_IS_BTN_IMG17", // HID:41021
+ "HID:WIZARDS_HID_IS_BTN_IMG18", // HID:41022
+ "HID:WIZARDS_HID_IS_BTN_IMG19", // HID:41023
+ "HID:WIZARDS_HID_IS_BTN_IMG20", // HID:41024
+ "HID:WIZARDS_HID_IS_BTN_IMG21", // HID:41025
+ "HID:WIZARDS_HID_IS_BTN_IMG22", // HID:41026
+ "HID:WIZARDS_HID_IS_BTN_IMG23", // HID:41027
+ "HID:WIZARDS_HID_IS_BTN_IMG24", // HID:41028
+ "HID:WIZARDS_HID_IS_BTN_IMG25", // HID:41029
+ "HID:WIZARDS_HID_IS_BTN_IMG26", // HID:41030
+ "HID:WIZARDS_HID_IS_BTN_IMG27", // HID:41031
+ "HID:WIZARDS_HID_IS_BTN_IMG28", // HID:41032
+ "HID:WIZARDS_HID_IS_BTN_IMG29", // HID:41033
+ "HID:WIZARDS_HID_IS_BTN_IMG30", // HID:41034
+ "HID:WIZARDS_HID_IS_BTN_IMG31", // HID:41035
+ "HID:WIZARDS_HID_IS_BTN_IMG32", // HID:41036
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_FTP", // HID:41040
+ "HID:WIZARDS_HID_FTP_SERVER", // HID:41041
+ "HID:WIZARDS_HID_FTP_USERNAME", // HID:41042
+ "HID:WIZARDS_HID_FTP_PASS", // HID:41043
+ "HID:WIZARDS_HID_FTP_TEST", // HID:41044
+ "HID:WIZARDS_HID_FTP_TXT_PATH", // HID:41045
+ "HID:WIZARDS_HID_FTP_BTN_PATH", // HID:41046
+ "HID:WIZARDS_HID_FTP_OK", // HID:41047
+ "HID:WIZARDS_HID_FTP_CANCEL", // HID:41048
+ "",
+ "",
+ "HID:WIZARDS_HID_AGWIZ", // HID:41051
+ "HID:WIZARDS_HID_AGWIZ_HELP", // HID:41052
+ "HID:WIZARDS_HID_AGWIZ_NEXT", // HID:41053
+ "HID:WIZARDS_HID_AGWIZ_PREV", // HID:41054
+ "HID:WIZARDS_HID_AGWIZ_CREATE", // HID:41055
+ "HID:WIZARDS_HID_AGWIZ_CANCEL", // HID:41056
+ "HID:WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN", // HID:41057
+ "HID:WIZARDS_HID_AGWIZ_1_CHK_MINUTES", // HID:41058
+ "HID:WIZARDS_HID_AGWIZ_2_TXT_TIME", // HID:41059
+ "HID:WIZARDS_HID_AGWIZ_2_TXT_DATE", // HID:41060
+ "HID:WIZARDS_HID_AGWIZ_2_TXT_TITLE", // HID:41061
+ "HID:WIZARDS_HID_AGWIZ_2_TXT_LOCATION", // HID:41062
+ "HID:WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE", // HID:41063
+ "HID:WIZARDS_HID_AGWIZ_3_CHK_READ", // HID:41064
+ "HID:WIZARDS_HID_AGWIZ_3_CHK_BRING", // HID:41065
+ "HID:WIZARDS_HID_AGWIZ_3_CHK_NOTES", // HID:41066
+ "HID:WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY", // HID:41067
+ "HID:WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR", // HID:41068
+ "HID:WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER", // HID:41069
+ "HID:WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER", // HID:41070
+ "HID:WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES", // HID:41071
+ "HID:WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS", // HID:41072
+ "HID:WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS", // HID:41073
+ "HID:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME", // HID:41074
+ "HID:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH", // HID:41075
+ "HID:WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH", // HID:41076
+ "HID:WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA", // HID:41077
+ "HID:WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES", // HID:41078
+ "HID:WIZARDS_HID_AGWIZ_5_BTN_INSERT", // HID:41079
+ "HID:WIZARDS_HID_AGWIZ_5_BTN_REMOVE", // HID:41080
+ "HID:WIZARDS_HID_AGWIZ_5_BTN_UP", // HID:41081
+ "HID:WIZARDS_HID_AGWIZ_5_BTN_DOWN", // HID:41082
+ "HID:WIZARDS_HID_AGWIZ_5_SCROLL_BAR", // HID:41083
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1", // HID:41084
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1", // HID:41085
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1", // HID:41086
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2", // HID:41087
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2", // HID:41088
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2", // HID:41089
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3", // HID:41090
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3", // HID:41091
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3", // HID:41092
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4", // HID:41093
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4", // HID:41094
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4", // HID:41095
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5", // HID:41096
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5", // HID:41097
+ "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5", // HID:41098
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX", // HID:41120
+ "HID:WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE", // HID:41121
+ "HID:WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX", // HID:41122
+ "HID:WIZARDS_HID_LSTPRIVATESTYLE", // HID:41123
+ "HID:WIZARDS_HID_IMAGECONTROL3", // HID:41124
+ "HID:WIZARDS_HID_CHKUSELOGO", // HID:41125
+ "HID:WIZARDS_HID_CHKUSEDATE", // HID:41126
+ "HID:WIZARDS_HID_CHKUSECOMMUNICATIONTYPE", // HID:41127
+ "HID:WIZARDS_HID_LSTCOMMUNICATIONTYPE", // HID:41128
+ "HID:WIZARDS_HID_CHKUSESUBJECT", // HID:41129
+ "HID:WIZARDS_HID_CHKUSESALUTATION", // HID:41130
+ "HID:WIZARDS_HID_LSTSALUTATION", // HID:41131
+ "HID:WIZARDS_HID_CHKUSEGREETING", // HID:41132
+ "HID:WIZARDS_HID_LSTGREETING", // HID:41133
+ "HID:WIZARDS_HID_CHKUSEFOOTER", // HID:41134
+ "HID:WIZARDS_HID_OPTSENDERPLACEHOLDER", // HID:41135
+ "HID:WIZARDS_HID_OPTSENDERDEFINE", // HID:41136
+ "HID:WIZARDS_HID_TXTSENDERNAME", // HID:41137
+ "HID:WIZARDS_HID_TXTSENDERSTREET", // HID:41138
+ "HID:WIZARDS_HID_TXTSENDERPOSTCODE", // HID:41139
+ "HID:WIZARDS_HID_TXTSENDERSTATE", // HID:41140
+ "HID:WIZARDS_HID_TXTSENDERCITY", // HID:41141
+ "HID:WIZARDS_HID_TXTSENDERFAX", // HID:41142
+ "HID:WIZARDS_HID_OPTRECEIVERPLACEHOLDER", // HID:41143
+ "HID:WIZARDS_HID_OPTRECEIVERDATABASE", // HID:41144
+ "HID:WIZARDS_HID_TXTFOOTER", // HID:41145
+ "HID:WIZARDS_HID_CHKFOOTERNEXTPAGES", // HID:41146
+ "HID:WIZARDS_HID_CHKFOOTERPAGENUMBERS", // HID:41147
+ "HID:WIZARDS_HID_TXTTEMPLATENAME", // HID:41148
+ "HID:WIZARDS_HID_FILETEMPLATEPATH", // HID:41149
+ "HID:WIZARDS_HID_OPTCREATEFAX", // HID:41150
+ "HID:WIZARDS_HID_OPTMAKECHANGES", // HID:41151
+ "HID:WIZARDS_HID_IMAGECONTROL2", // HID:41152
+ "HID:WIZARDS_HID_FAXWIZ_TXTPATH", // HID:41153
+ "HID:WIZARDS_HID_FAXWIZ_CMDPATH", // HID:41154
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_FAXWIZARD", // HID:41180
+ "HID:WIZARDS_HID_FAXWIZARD_HELP", // HID:41181
+ "HID:WIZARDS_HID_FAXWIZARD_BACK", // HID:41182
+ "HID:WIZARDS_HID_FAXWIZARD_NEXT", // HID:41183
+ "HID:WIZARDS_HID_FAXWIZARD_CREATE", // HID:41184
+ "HID:WIZARDS_HID_FAXWIZARD_CANCEL", // HID:41185
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGTABLE_DIALOG", // HID:41200
+ "",
+ "HID:WIZARDS_HID_DLGTABLE_CMDPREV", // HID:41202
+ "HID:WIZARDS_HID_DLGTABLE_CMDNEXT", // HID:41203
+ "HID:WIZARDS_HID_DLGTABLE_CMDFINISH", // HID:41204
+ "HID:WIZARDS_HID_DLGTABLE_CMDCANCEL", // HID:41205
+ "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", // HID:41206
+ "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", // HID:41207
+ "HID:WIZARDS_HID_DLGTABLE_LBTABLES", // HID:41208
+ "HID:WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE", // HID:41209
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVESELECTED", // HID:41210
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVEALL", // HID:41211
+ "HID:WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED", // HID:41212
+ "HID:WIZARDS_HID_DLGTABLE_CMDREMOVEALL", // HID:41213
+ "HID:WIZARDS_HID_DLGTABLE_FIELDSSELECTED", // HID:41214
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP", // HID:41215
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN", // HID:41216
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", // HID:41220
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", // HID:41221
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", // HID:41222
+ "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", // HID:41223
+ "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", // HID:41224
+ "HID:WIZARDS_HID_DLGTABLE_COLNAME", // HID:41225
+ "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER", // HID:41226
+ "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", // HID:41227
+ "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", // HID:41228
+ "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", // HID:41229
+ "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", // HID:41230
+ "HID:WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME", // HID:41231
+ "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", // HID:41232
+ "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", // HID:41233
+ "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE", // HID:41234
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED", // HID:41235
+ "HID:WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED", // HID:41236
+ "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED", // HID:41237
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED", // HID:41238
+ "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED", // HID:41239
+ "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", // HID:41240
+ "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", // HID:41241
+ "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", // HID:41242
+ "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", // HID:41243
+ "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", // HID:41244
+ "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA" // HID:41245
+ };
+
+ public static String getHelpIdString( int nHelpId )
+ {
+ if ( nHelpId >= 34200 && nHelpId <= 34722 )
+ return array1[ nHelpId - 34200 ];
+ else if ( nHelpId >= 40769 && nHelpId <= 41245 )
+ return array2[ nHelpId - 40769 ];
+ else
+ return new String();
+ }
+}
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index cff3736b9..2fceae708 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -38,12 +38,10 @@ import com.sun.star.awt.XWindowPeer;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XChild;
import com.sun.star.container.XHierarchicalNameAccess;
import com.sun.star.container.XHierarchicalNameContainer;
import com.sun.star.container.XNameAccess;
import com.sun.star.container.XNameContainer;
-import com.sun.star.frame.XComponentLoader;
import com.sun.star.frame.XModel;
import com.sun.star.frame.XStorable;
import com.sun.star.lang.XComponent;
@@ -91,7 +89,6 @@ import java.util.logging.Logger;
public class DBMetaData
{
-
private XNameAccess xQueryNames;
public XDatabaseMetaData xDBMetaData;
private XDataSource m_dataSource;
@@ -109,12 +106,8 @@ public class DBMetaData
public com.sun.star.lang.XMultiServiceFactory xMSF;
public XComponent xConnectionComponent;
- private XNameAccess m_xTableNames;
- private XInteractionHandler oInteractionHandler;
private XNameAccess xNameAccess;
private XInterface xDatabaseContext;
- private XCompletedConnection xCompleted;
- // private int[] nDataTypes = null;
private XWindowPeer xWindowPeer;
private String[] TableNames = new String[] {};
private String[] QueryNames = new String[] {};
@@ -212,15 +205,13 @@ public class DBMetaData
return lDateCorrection;
}
- void getInterfaces(XMultiServiceFactory xMSF)
+ private void getInterfaces(XMultiServiceFactory xMSF)
{
try
{
this.xMSF = xMSF;
xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext");
xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
- XInterface xInteractionHandler = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler");
- oInteractionHandler = UnoRuntime.queryInterface( XInteractionHandler.class, xInteractionHandler );
DataSourceNames = xNameAccess.getElementNames();
}
catch (Exception exception)
@@ -257,7 +248,6 @@ public class DBMetaData
public boolean hasTableByName(String _stablename)
{
- // getTableNames();
return getTableNamesAsNameAccess().hasByName(_stablename);
}
@@ -371,11 +361,6 @@ public class DBMetaData
return bHasEscapeProcessing;
}
- // public void initCommandNames()
- // {
- // getTableNames();
- // }
-
public XNameAccess getQueryNamesAsNameAccess()
{
XQueriesSupplier xDBQueries = UnoRuntime.queryInterface( XQueriesSupplier.class, DBConnection );
@@ -416,7 +401,7 @@ public class DBMetaData
return TableNames;
}
- void InitializeWidthList()
+ private void InitializeWidthList()
{
WidthList = new int[17][2];
WidthList[0][0] = DataType.BIT; // == -7;
@@ -581,7 +566,7 @@ public class DBMetaData
return m_dataSource;
}
- private void setDataSourceByName(String _DataSourceName, boolean bgetInterfaces)
+ private void setDataSourceByName(String _DataSourceName)
{
try
{
@@ -601,7 +586,6 @@ public class DBMetaData
public void getDataSourceInterfaces() throws Exception
{
- xCompleted = UnoRuntime.queryInterface( XCompletedConnection.class, getDataSource() );
xDataSourcePropertySet = UnoRuntime.queryInterface( XPropertySet.class, getDataSource() );
bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue();
}
@@ -684,8 +668,8 @@ public class DBMetaData
private boolean getConnection(String _DataSourceName)
{
- setDataSourceByName(_DataSourceName, true);
- return getConnection( getDataSource() );
+ setDataSourceByName(_DataSourceName);
+ return getConnection( getDataSource() );
}
private boolean getConnection(com.sun.star.sdbc.XConnection _DBConnection)
@@ -955,7 +939,7 @@ public class DBMetaData
NamedValueCollection creationArgs = new NamedValueCollection();
creationArgs.put( "Name", basename );
creationArgs.put( "URL", documentURL );
- creationArgs.put( "AsTemplate", new Boolean( i_createTemplate ) );
+ creationArgs.put( "AsTemplate", i_createTemplate );
XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, _xDocNameAccess );
Object oDBDocument = xDocMSF.createInstanceWithArguments( "com.sun.star.sdb.DocumentDefinition", creationArgs.getPropertyValues() );
XHierarchicalNameContainer xHier = UnoRuntime.queryInterface( XHierarchicalNameContainer.class, _xDocNameAccess );
@@ -967,7 +951,7 @@ public class DBMetaData
}
catch (Exception e)
{
- e.printStackTrace(System.out);
+ e.printStackTrace();
}
}
@@ -1103,13 +1087,11 @@ public class DBMetaData
public void finish()
{
xQueryNames = null;
- oInteractionHandler = null;
xNameAccess = null;
xDatabaseContext = null;
xDBMetaData = null;
m_dataSource = null;
xModel = null;
- xCompleted = null;
xDataSourcePropertySet = null;
xWindowPeer = null;
DBConnection = null;
diff --git a/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java b/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java
index 5c65d7379..e03323c6e 100644
--- a/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java
+++ b/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java
@@ -57,7 +57,8 @@ public abstract class DatabaseObjectWizard extends WizardDialog
{
try
{
- m_docUI.loadComponent( i_type, i_name, i_forEditing );
+ if ( m_docUI != null )
+ m_docUI.loadComponent( i_type, i_name, i_forEditing );
}
catch ( IllegalArgumentException ex )
{
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index a80623e27..b474c6a5b 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -47,6 +47,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.sdbc.SQLException;
import com.sun.star.lang.XInitialization;
import com.sun.star.awt.XWindow;
+import com.sun.star.sdb.SQLFilterOperator;
import com.sun.star.wizards.common.*;
@@ -60,7 +61,7 @@ public class SQLQueryComposer
// String m_sFromClause;
public XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
Vector composedCommandNames = new Vector(1);
- private XSingleSelectQueryComposer m_xQueryComposer;
+ private XSingleSelectQueryComposer m_queryComposer;
XMultiServiceFactory xMSF;
boolean bincludeGrouping = true;
@@ -72,7 +73,7 @@ public class SQLQueryComposer
xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, CurDBMetaData.DBConnection);
final Object oQueryComposer = xMSF.createInstance("com.sun.star.sdb.SingleSelectQueryComposer");
m_xQueryAnalyzer = (XSingleSelectQueryAnalyzer) UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, oQueryComposer);
- m_xQueryComposer = (XSingleSelectQueryComposer) UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, m_xQueryAnalyzer);
+ m_queryComposer = (XSingleSelectQueryComposer) UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, m_xQueryAnalyzer);
XSQLQueryComposerFactory xSQLComposerFactory;
xSQLComposerFactory = (XSQLQueryComposerFactory) UnoRuntime.queryInterface(XSQLQueryComposerFactory.class, CurDBMetaData.DBConnection);
// /* XSQLQueryComposer */ xSQLQueryComposer = xSQLComposerFactory.createQueryComposer();
@@ -160,7 +161,7 @@ public class SQLQueryComposer
{
for (int i = 0; i < CurDBMetaData.getFilterConditions().length; i++)
{
- m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
+ m_queryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
}
}
catch (Exception exception)
@@ -172,7 +173,7 @@ public class SQLQueryComposer
public void prependSortingCriteria() throws SQLException
{
XIndexAccess xColumnIndexAccess = m_xQueryAnalyzer.getOrderColumns();
- m_xQueryComposer.setOrder("");
+ m_queryComposer.setOrder("");
for (int i = 0; i < CurDBMetaData.getSortFieldNames().length; i++)
{
appendSortingCriterion(i, false);
@@ -186,7 +187,7 @@ public class SQLQueryComposer
if (JavaTools.FieldInTable(CurDBMetaData.getSortFieldNames(), sName) == -1)
{
boolean bascend = AnyConverter.toBoolean(xColumnPropertySet.getPropertyValue("IsAscending"));
- m_xQueryComposer.appendOrderByColumn(xColumnPropertySet, bascend);
+ m_queryComposer.appendOrderByColumn(xColumnPropertySet, bascend);
}
}
catch (Exception e)
@@ -203,13 +204,13 @@ public class SQLQueryComposer
String sSort = CurDBMetaData.getSortFieldNames()[_SortIndex][1];
boolean bascend = (sSort.equals("ASC"));
- m_xQueryComposer.appendOrderByColumn(xColumn, bascend);
+ m_queryComposer.appendOrderByColumn(xColumn, bascend);
}
public void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException
{
String sOrder = "";
- m_xQueryComposer.setOrder("");
+ m_queryComposer.setOrder("");
for (int i = 0; i < CurDBMetaData.getSortFieldNames().length; i++)
{
String sSortValue = CurDBMetaData.getSortFieldNames()[i][0];
@@ -223,7 +224,7 @@ public class SQLQueryComposer
}
sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + CurDBMetaData.AggregateFieldNames[iAggregate][0] + ")";
sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1];
- m_xQueryComposer.setOrder(sOrder);
+ m_queryComposer.setOrder(sOrder);
}
else
{
@@ -232,7 +233,7 @@ public class SQLQueryComposer
sOrder = m_xQueryAnalyzer.getOrder();
}
// just for debug!
- sOrder = m_xQueryComposer.getOrder();
+ sOrder = m_queryComposer.getOrder();
int dummy = 0;
}
@@ -241,7 +242,7 @@ public class SQLQueryComposer
for (int i = 0; i < CurDBMetaData.GroupFieldNames.length; i++)
{
XPropertySet xColumn = CurDBMetaData.getColumnObjectByFieldName(CurDBMetaData.GroupFieldNames[i], _baddAliasFieldNames);
- m_xQueryComposer.appendGroupByColumn(xColumn);
+ m_queryComposer.appendGroupByColumn(xColumn);
}
String s = m_xQueryAnalyzer.getQuery();
}
@@ -309,7 +310,7 @@ public class SQLQueryComposer
if (CurDBMetaData.getFilterConditions().length > 0)
{
CurDBMetaData.setFilterConditions(replaceConditionsByAlias(CurDBMetaData.getFilterConditions()));
- m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
+ m_queryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
}
}
}
@@ -319,7 +320,7 @@ public class SQLQueryComposer
appendGroupByColumns(_baddAliasFieldNames);
if (CurDBMetaData.GroupByFilterConditions.length > 0)
{
- m_xQueryComposer.setStructuredHavingClause(CurDBMetaData.GroupByFilterConditions);
+ m_queryComposer.setStructuredHavingClause(CurDBMetaData.GroupByFilterConditions);
}
}
appendSortingcriteria(_baddAliasFieldNames);
@@ -426,8 +427,63 @@ public class SQLQueryComposer
typeexception.printStackTrace(System.out);
}
}
+
+ /**
+ * retrieves a normalized structured filter
+ *
+ * <p>XSingleSelectQueryComposer.getStructuredFilter has a strange habit of returning the predicate (equal, not equal, etc)
+ * effectively twice: Once as SQLFilterOperator, and once in the value. That is, if you have a term "column <> 3", then
+ * you'll get an SQLFilterOperator.NOT_EQUAL (which is fine), <strong>and</strong> the textual value of the condition
+ * will read "<> 3". The latter is strange enough, but even more strange is that this behavior is not even consistent:
+ * for SQLFilterOperator.EQUAL, the "=" sign is not include in the textual value.</p>
+ *
+ * <p>To abstract from this weirdness, use this function here, which strips the unwanted tokens from the textual value
+ * representation.</p>
+ */
+ public PropertyValue[][] getNormalizedStructuredFilter()
+ {
+ final PropertyValue[][] structuredFilter = m_queryComposer.getStructuredFilter();
+ for ( int i=0; i<structuredFilter.length; ++i )
+ {
+ for ( int j=0; j<structuredFilter[i].length; ++j )
+ {
+ if ( !( structuredFilter[i][j].Value instanceof String ) )
+ continue;
+ final StringBuffer textualValue = new StringBuffer( (String)structuredFilter[i][j].Value );
+ switch ( structuredFilter[i][j].Handle )
+ {
+ case SQLFilterOperator.EQUAL:
+ break;
+ case SQLFilterOperator.NOT_EQUAL:
+ case SQLFilterOperator.LESS_EQUAL:
+ case SQLFilterOperator.GREATER_EQUAL:
+ textualValue.delete( 0, 2 );
+ break;
+ case SQLFilterOperator.LESS:
+ case SQLFilterOperator.GREATER:
+ textualValue.delete( 0, 1 );
+ break;
+ case SQLFilterOperator.NOT_LIKE:
+ textualValue.delete( 0, 8 );
+ break;
+ case SQLFilterOperator.LIKE:
+ textualValue.delete( 0, 4 );
+ break;
+ case SQLFilterOperator.SQLNULL:
+ textualValue.delete( 0, 7 );
+ break;
+ case SQLFilterOperator.NOT_SQLNULL:
+ textualValue.delete( 0, 11 );
+ break;
+ }
+ structuredFilter[i][j].Value = textualValue.toString().trim();
+ }
+ }
+ return structuredFilter;
+ }
+
public XSingleSelectQueryComposer getQueryComposer()
{
- return m_xQueryComposer;
+ return m_queryComposer;
}
}
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.java b/wizards/com/sun/star/wizards/fax/CallWizard.java
index 0d04b0b94..d177a2100 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.java
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.java
@@ -41,8 +41,7 @@ import com.sun.star.uno.Type;
/**
* This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the
- * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>).
+ * creating the service (<CODE>__getServiceFactory</CODE>).
*
* @author $author$
* @version $Revision: 1.3.192.1 $
@@ -78,22 +77,6 @@ public class CallWizard
}
/**
- * Writes the service information into the given registry key. This method is called
- * by the <code>JavaLoader</code>.
- *
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single registry key accessible.
- *
- * @return returns true if the operation succeeded
- *
- * @see com.sun.star.comp.loader.JavaLoader#
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey)
- {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
- }
-
- /**
* This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
index af3abb57f..c82695b25 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
@@ -26,6 +26,7 @@
*
************************************************************************/
package com.sun.star.wizards.fax;
+import com.sun.star.wizards.common.*;
public interface FaxWizardDialogConst
{
@@ -78,38 +79,38 @@ public interface FaxWizardDialogConst
*/
public final static int HID = 41119; //TODO enter first hid here
public static final int HIDMAIN = 41180;
- public final String OPTBUSINESSFAX_HID = "HID:" + (HID + 1);
- public final String LSTBUSINESSSTYLE_HID = "HID:" + (HID + 2);
- public final String OPTPRIVATEFAX_HID = "HID:" + (HID + 3);
- public final String LSTPRIVATESTYLE_HID = "HID:" + (HID + 4);
- public final String IMAGECONTROL3_HID = "HID:" + (HID + 5);
- public final String CHKUSELOGO_HID = "HID:" + (HID + 6);
- public final String CHKUSEDATE_HID = "HID:" + (HID + 7);
- public final String CHKUSECOMMUNICATIONTYPE_HID = "HID:" + (HID + 8);
- public final String LSTCOMMUNICATIONTYPE_HID = "HID:" + (HID + 9);
- public final String CHKUSESUBJECT_HID = "HID:" + (HID + 10);
- public final String CHKUSESALUTATION_HID = "HID:" + (HID + 11);
- public final String LSTSALUTATION_HID = "HID:" + (HID + 12);
- public final String CHKUSEGREETING_HID = "HID:" + (HID + 13);
- public final String LSTGREETING_HID = "HID:" + (HID + 14);
- public final String CHKUSEFOOTER_HID = "HID:" + (HID + 15);
- public final String OPTSENDERPLACEHOLDER_HID = "HID:" + (HID + 16);
- public final String OPTSENDERDEFINE_HID = "HID:" + (HID + 17);
- public final String TXTSENDERNAME_HID = "HID:" + (HID + 18);
- public final String TXTSENDERSTREET_HID = "HID:" + (HID + 19);
- public final String TXTSENDERPOSTCODE_HID = "HID:" + (HID + 20);
- public final String TXTSENDERSTATE_HID = "HID:" + (HID + 21);
- public final String TXTSENDERCITY_HID = "HID:" + (HID + 22);
- public final String TXTSENDERFAX_HID = "HID:" + (HID + 23);
- public final String OPTRECEIVERPLACEHOLDER_HID = "HID:" + (HID + 24);
- public final String OPTRECEIVERDATABASE_HID = "HID:" + (HID + 25);
- public final String TXTFOOTER_HID = "HID:" + (HID + 26);
- public final String CHKFOOTERNEXTPAGES_HID = "HID:" + (HID + 27);
- public final String CHKFOOTERPAGENUMBERS_HID = "HID:" + (HID + 28);
- public final String TXTTEMPLATENAME_HID = "HID:" + (HID + 29);
- public final String FILETEMPLATEPATH_HID = "HID:" + (HID + 30);
- public final String OPTCREATEFAX_HID = "HID:" + (HID + 31);
- public final String OPTMAKECHANGES_HID = "HID:" + (HID + 32);
- public final String IMAGECONTROL2_HID = "HID:" + (HID + 33);
+ public final String OPTBUSINESSFAX_HID = HelpIds.getHelpIdString(HID + 1);
+ public final String LSTBUSINESSSTYLE_HID = HelpIds.getHelpIdString(HID + 2);
+ public final String OPTPRIVATEFAX_HID = HelpIds.getHelpIdString(HID + 3);
+ public final String LSTPRIVATESTYLE_HID = HelpIds.getHelpIdString(HID + 4);
+ public final String IMAGECONTROL3_HID = HelpIds.getHelpIdString(HID + 5);
+ public final String CHKUSELOGO_HID = HelpIds.getHelpIdString(HID + 6);
+ public final String CHKUSEDATE_HID = HelpIds.getHelpIdString(HID + 7);
+ public final String CHKUSECOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 8);
+ public final String LSTCOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 9);
+ public final String CHKUSESUBJECT_HID = HelpIds.getHelpIdString(HID + 10);
+ public final String CHKUSESALUTATION_HID = HelpIds.getHelpIdString(HID + 11);
+ public final String LSTSALUTATION_HID = HelpIds.getHelpIdString(HID + 12);
+ public final String CHKUSEGREETING_HID = HelpIds.getHelpIdString(HID + 13);
+ public final String LSTGREETING_HID = HelpIds.getHelpIdString(HID + 14);
+ public final String CHKUSEFOOTER_HID = HelpIds.getHelpIdString(HID + 15);
+ public final String OPTSENDERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 16);
+ public final String OPTSENDERDEFINE_HID = HelpIds.getHelpIdString(HID + 17);
+ public final String TXTSENDERNAME_HID = HelpIds.getHelpIdString(HID + 18);
+ public final String TXTSENDERSTREET_HID = HelpIds.getHelpIdString(HID + 19);
+ public final String TXTSENDERPOSTCODE_HID = HelpIds.getHelpIdString(HID + 20);
+ public final String TXTSENDERSTATE_HID = HelpIds.getHelpIdString(HID + 21);
+ public final String TXTSENDERCITY_HID = HelpIds.getHelpIdString(HID + 22);
+ public final String TXTSENDERFAX_HID = HelpIds.getHelpIdString(HID + 23);
+ public final String OPTRECEIVERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 24);
+ public final String OPTRECEIVERDATABASE_HID = HelpIds.getHelpIdString(HID + 25);
+ public final String TXTFOOTER_HID = HelpIds.getHelpIdString(HID + 26);
+ public final String CHKFOOTERNEXTPAGES_HID = HelpIds.getHelpIdString(HID + 27);
+ public final String CHKFOOTERPAGENUMBERS_HID = HelpIds.getHelpIdString(HID + 28);
+ public final String TXTTEMPLATENAME_HID = HelpIds.getHelpIdString(HID + 29);
+ public final String FILETEMPLATEPATH_HID = HelpIds.getHelpIdString(HID + 30);
+ public final String OPTCREATEFAX_HID = HelpIds.getHelpIdString(HID + 31);
+ public final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString(HID + 32);
+ public final String IMAGECONTROL2_HID = HelpIds.getHelpIdString(HID + 33);
}
- \ No newline at end of file
+
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index d904bc65e..4750b20a3 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -340,7 +340,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
public void insertPathSelectionControl()
{
myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE);
- myPathSelection.insert(5, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + (HID + 34), "HID:" + (HID + 35));
+ myPathSelection.insert(5, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString(HID + 34), HelpIds.getHelpIdString(HID + 35));
myPathSelection.sDefaultDirectory = sUserTemplatePath;
myPathSelection.sDefaultName = "myFaxTemplate.ott";
myPathSelection.sDefaultFilter = "writer8_template";
diff --git a/wizards/com/sun/star/wizards/fax/fax.component b/wizards/com/sun/star/wizards/fax/fax.component
new file mode 100644
index 000000000..462fe2901
--- /dev/null
+++ b/wizards/com/sun/star/wizards/fax/fax.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation
+ name="com.sun.star.wizards.fax.CallWizard$WizardImplementation">
+ <service name="com.sun.star.wizards.fax.CallWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk
index 247aaf063..5cf089392 100644
--- a/wizards/com/sun/star/wizards/fax/makefile.mk
+++ b/wizards/com/sun/star/wizards/fax/makefile.mk
@@ -60,3 +60,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/fax.component
+
+$(MISC)/fax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fax.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fax.component
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 4d730225d..d0994cf11 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -31,9 +31,7 @@ import com.sun.star.uno.Type;
import com.sun.star.wizards.common.Properties;
/** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a
- * method, that writes the information into the given registry key
- * (<CODE>__writeRegistryServiceInfo</CODE>).
+ * factory for creating the service (<CODE>__getServiceFactory</CODE>).
* @author Bertram Nolte
*/
public class CallFormWizard
@@ -62,19 +60,6 @@ public class CallFormWizard
return xsingleservicefactory;
}
- /** Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>.
- * @return returns true if the operation succeeded
- * @see com.sun.star.comp.loader.JavaLoader#
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single
- * registry key accessible.
- */
- public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
- {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(FormWizardImplementation.class.getName(), FormWizardImplementation.__serviceName, xregistrykey);
- }
-
/** This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java
index 07649cacc..ee5da12de 100644
--- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java
+++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java
@@ -65,7 +65,7 @@ public class DataEntrySetter
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34461", sNewDataOnly, new Integer(98), new Integer(25), IDataStep, new Short(curtabindex++), new Integer(195)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", sNewDataOnly, new Integer(98), new Integer(25), IDataStep, new Short(curtabindex++), new Integer(195)
});
optDisplayAllData = CurUnoDialog.insertRadioButton("optDisplayAllData", "toggleCheckBoxes", this,
@@ -75,7 +75,7 @@ public class DataEntrySetter
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34462", sDisplayAllData, new Integer(98), new Integer(50), new Short((short) 1), IDataStep, new Short(curtabindex++), new Integer(197)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", sDisplayAllData, new Integer(98), new Integer(50), new Short((short) 1), IDataStep, new Short(curtabindex++), new Integer(197)
});
chknomodification = CurUnoDialog.insertCheckBox("chknomodification", null,
new String[]
@@ -84,7 +84,7 @@ public class DataEntrySetter
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34463", sNoModification, new Integer(108), new Integer(62), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", sNoModification, new Integer(108), new Integer(62), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189)
});
chknodeletion = CurUnoDialog.insertCheckBox("chknodeletion", null,
new String[]
@@ -93,7 +93,7 @@ public class DataEntrySetter
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34464", sNoDeletion, new Integer(108), new Integer(74), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", sNoDeletion, new Integer(108), new Integer(74), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189)
});
chknoaddition = CurUnoDialog.insertCheckBox("chknoaddition", null,
new String[]
@@ -102,7 +102,7 @@ public class DataEntrySetter
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34465", sNoAddition, new Integer(108), new Integer(86), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(191)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", sNoAddition, new Integer(108), new Integer(86), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(191)
});
CurUnoDialog.insertLabel("lbldontdisplayExistingData",
new String[]
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index 3396f9433..b9fdfcc38 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -32,6 +32,7 @@ import com.sun.star.awt.XFixedText;
import com.sun.star.awt.XListBox;
import com.sun.star.uno.Exception;
import com.sun.star.wizards.common.Helper;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.wizards.common.JavaTools;
import com.sun.star.wizards.db.RelationController;
import com.sun.star.wizards.ui.UnoDialog;
@@ -86,8 +87,8 @@ public class FieldLinker extends DBLimitedFieldSelection
SOFIRSTLINKLST, SOSECLINKLST, SOTHIRDLINKLST, SOFOURTHLINKLST
};
}
- sSlaveHidString = "HID:" + Integer.toString(FirstHelpIndex + (i * 2));
- sMasterHidString = "HID:" + Integer.toString(FirstHelpIndex + (i * 2) + 1);
+ sSlaveHidString = HelpIds.getHelpIdString(FirstHelpIndex + (i * 2));
+ sMasterHidString = HelpIds.getHelpIdString(FirstHelpIndex + (i * 2) + 1);
boolean bDoEnable = (i < 2);
lblSlaveFields[i] = CurUnoDialog.insertLabel("lblSlaveFieldLink" + new Integer(i + 1).toString(),
new String[]
diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java
index f1d4ce983..31397e5ef 100644
--- a/wizards/com/sun/star/wizards/form/Finalizer.java
+++ b/wizards/com/sun/star/wizards/form/Finalizer.java
@@ -72,7 +72,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGER_12, "HID:34481", new Integer(97), new Integer(35), UIConsts.INTEGERS[8], new Short((short) 82), "", new Integer(185)
+ UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGFORM_TXTPATH", new Integer(97), new Integer(35), UIConsts.INTEGERS[8], new Short((short) 82), "", new Integer(185)
});
CurUnoDialog.insertLabel("lblProceed",
new String[]
@@ -90,7 +90,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34482", sWorkWithForm, new Integer(101), new Integer(77), new Short((short) 1), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", sWorkWithForm, new Integer(101), new Integer(77), new Short((short) 1), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107)
});
optModifyForm = CurUnoDialog.insertRadioButton("optModifyForm", null,
new String[]
@@ -99,7 +99,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34483", sModifyForm, new Integer(101), new Integer(89), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", sModifyForm, new Integer(101), new Integer(89), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107)
});
}
diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java
index 0c293a850..328fb453b 100644
--- a/wizards/com/sun/star/wizards/form/FormConfiguration.java
+++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java
@@ -82,7 +82,7 @@ public class FormConfiguration
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:34421", sSelectManually, new Integer(97), new Integer(26), ISubFormStep, new Short(curtabindex++), new Integer(160)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", sSelectManually, new Integer(97), new Integer(26), ISubFormStep, new Short(curtabindex++), new Integer(160)
});
optOnExistingRelation = CurUnoDialog.insertRadioButton("optOnExistingRelation", STOGGLESTEPS, this,
new String[]
@@ -91,7 +91,7 @@ public class FormConfiguration
},
new Object[]
{
- Boolean.FALSE, UIConsts.INTEGERS[8], "HID:34422", sOnExistingRelation, new Integer(107), new Integer(43), ISubFormStep, new Short(curtabindex++), new Integer(160)
+ Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", sOnExistingRelation, new Integer(107), new Integer(43), ISubFormStep, new Short(curtabindex++), new Integer(160)
});
optSelectManually = CurUnoDialog.insertRadioButton("optSelectManually", STOGGLESTEPS, this,
new String[]
@@ -100,7 +100,7 @@ public class FormConfiguration
},
new Object[]
{
- Boolean.FALSE, UIConsts.INTEGERS[8], "HID:34423", sOnManualRelation, new Integer(107), new Integer(99), new Short((short) 1), ISubFormStep, new Short(curtabindex++), new Integer(160)
+ Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", sOnManualRelation, new Integer(107), new Integer(99), new Short((short) 1), ISubFormStep, new Short(curtabindex++), new Integer(160)
});
lblRelations = CurUnoDialog.insertLabel("lblSelectRelation",
new String[]
@@ -118,7 +118,7 @@ public class FormConfiguration
},
new Object[]
{
- Boolean.FALSE, new Integer(37), "HID:34424", new Integer(201), new Integer(55), ISubFormStep, new Short(curtabindex++), new Integer(103)
+ Boolean.FALSE, new Integer(37), "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", new Integer(201), new Integer(55), ISubFormStep, new Short(curtabindex++), new Integer(103)
});
lblSubFormDescription = CurUnoDialog.insertLabel("lblSubFormDescription",
new String[]
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 09a9f1aad..ed2064594 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -125,7 +125,7 @@ public class StyleApplier
},
new Object[]
{
- new Integer(143), "HID:34471", new Integer(92), new Integer(35), SelLayoutPos, IStyleStep, this.StyleNames, new Short(curtabindex++), new Integer(90)
+ new Integer(143), "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", new Integer(92), new Integer(35), SelLayoutPos, IStyleStep, this.StyleNames, new Short(curtabindex++), new Integer(90)
});
optNoBorder = CurUnoDialog.insertRadioButton("otpNoBorder", SCHANGEBORDERTYPE, this,
@@ -135,7 +135,7 @@ public class StyleApplier
},
new Object[]
{
- UIConsts.INTEGERS[10], "HID:34472", sNoBorder, new Integer(196), new Integer(39), IStyleStep, new Short(curtabindex++), "0", new Integer(93)
+ UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", sNoBorder, new Integer(196), new Integer(39), IStyleStep, new Short(curtabindex++), "0", new Integer(93)
});
opt3DLook = CurUnoDialog.insertRadioButton("otp3DLook", SCHANGEBORDERTYPE, this,
@@ -145,7 +145,7 @@ public class StyleApplier
},
new Object[]
{
- UIConsts.INTEGERS[10], "HID:34473", s3DLook, new Integer(196), new Integer(53), new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", new Integer(93)
+ UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", s3DLook, new Integer(196), new Integer(53), new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", new Integer(93)
});
optFlat = CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this,
@@ -155,7 +155,7 @@ public class StyleApplier
},
new Object[]
{
- UIConsts.INTEGERS[10], "HID:34474", sFlat, new Integer(196), new Integer(67), IStyleStep, new Short(curtabindex++), "2", new Integer(93)
+ UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", sFlat, new Integer(196), new Integer(67), IStyleStep, new Short(curtabindex++), "2", new Integer(93)
});
CurUnoDialog.insertFixedLine("lnFieldBorder",
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index 61d634a11..c90acc93c 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -92,7 +92,7 @@ public class UIControlArranger
},
new Object[]
{
- UIConsts.INTEGERS[10], "HID:34451", sAlignLeft, new Integer(107), new Integer(38), new Short((short) 1), IControlStep, new Short(curtabindex++), new Integer(171)
+ UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", sAlignLeft, new Integer(107), new Integer(38), new Short((short) 1), IControlStep, new Short(curtabindex++), new Integer(171)
});
// Radio Button "Align Right"
optAlignRight = CurUnoDialog.insertRadioButton("optAlignRight", SOALIGNMETHOD, this,
@@ -102,7 +102,7 @@ public class UIControlArranger
},
new Object[]
{
- UIConsts.INTEGERS[10], "HID:34452", sAlignRight, Boolean.TRUE, new Integer(107), new Integer(50), IControlStep, new Short(curtabindex++), new Integer(171)
+ UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", sAlignRight, Boolean.TRUE, new Integer(107), new Integer(50), IControlStep, new Short(curtabindex++), new Integer(171)
});
@@ -142,7 +142,7 @@ public class UIControlArranger
// {
// Boolean.valueOf(bEnabled),
// new Integer(14),
-///* TODO: WRONG!*/ "HID:34452",
+///* TODO: WRONG!*/ "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT",
// "1",
// new Integer(nXPos + nBtnWidth),
// new Integer(nYPos),
diff --git a/wizards/com/sun/star/wizards/form/form.component b/wizards/com/sun/star/wizards/form/form.component
new file mode 100644
index 000000000..3f010d8bc
--- /dev/null
+++ b/wizards/com/sun/star/wizards/form/form.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation
+ name="com.sun.star.wizards.form.CallFormWizard$FormWizardImplementation">
+ <service name="com.sun.star.wizards.form.CallFormWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk
index 092135289..b63666073 100644
--- a/wizards/com/sun/star/wizards/form/makefile.mk
+++ b/wizards/com/sun/star/wizards/form/makefile.mk
@@ -65,3 +65,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/form.component
+
+$(MISC)/form.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ form.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt form.component
diff --git a/wizards/com/sun/star/wizards/letter/CallWizard.java b/wizards/com/sun/star/wizards/letter/CallWizard.java
index d203856d6..5488ffcc4 100644
--- a/wizards/com/sun/star/wizards/letter/CallWizard.java
+++ b/wizards/com/sun/star/wizards/letter/CallWizard.java
@@ -41,8 +41,7 @@ import com.sun.star.uno.Type;
/**
* This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the
- * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>).
+ * creating the service (<CODE>__getServiceFactory</CODE>).
*
* @author $author$
* @version $Revision: 1.3.192.1 $
@@ -78,22 +77,6 @@ public class CallWizard
}
/**
- * Writes the service information into the given registry key. This method is called
- * by the <code>JavaLoader</code>.
- *
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single registry key accessible.
- *
- * @return returns true if the operation succeeded
- *
- * @see com.sun.star.comp.loader.JavaLoader#
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey)
- {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
- }
-
- /**
* This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java
index 03638d368..e0ef661e5 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java
@@ -169,7 +169,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 1), resources.resoptBusinessLetter_value, "optBusinessLetter", new Integer(97), new Integer(28), INTEGERS[1], new Short((short) 1), new Integer(184)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 1), resources.resoptBusinessLetter_value, "optBusinessLetter", new Integer(97), new Integer(28), INTEGERS[1], new Short((short) 1), new Integer(184)
});
optPrivOfficialLetter = insertRadioButton("optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED,
new String[]
@@ -178,7 +178,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 2), resources.resoptPrivOfficialLetter_value, "optPrivOfficialLetter", new Integer(97), new Integer(74), INTEGERS[1], new Short((short) 2), new Integer(184)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 2), resources.resoptPrivOfficialLetter_value, "optPrivOfficialLetter", new Integer(97), new Integer(74), INTEGERS[1], new Short((short) 2), new Integer(184)
});
optPrivateLetter = insertRadioButton("optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED,
new String[]
@@ -187,7 +187,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 3), resources.resoptPrivateLetter_value, "optPrivateLetter", new Integer(97), new Integer(106), INTEGERS[1], new Short((short) 3), new Integer(184)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 3), resources.resoptPrivateLetter_value, "optPrivateLetter", new Integer(97), new Integer(106), INTEGERS[1], new Short((short) 3), new Integer(184)
});
lstBusinessStyle = insertListBox("lstBusinessStyle", LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED,
new String[]
@@ -196,7 +196,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + (HID + 4), "lstBusinessStyle", new Integer(180), INTEGER_40, INTEGERS[1], new Short((short) 4), new Integer(74)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 4), "lstBusinessStyle", new Integer(180), INTEGER_40, INTEGERS[1], new Short((short) 4), new Integer(74)
});
chkBusinessPaper = insertCheckBox("chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED,
new String[]
@@ -205,7 +205,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 5), resources.reschkBusinessPaper_value, "chkBusinessPaper", new Integer(110), new Integer(56), new Short((short) 0), INTEGERS[1], new Short((short) 5), new Integer(168)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 5), resources.reschkBusinessPaper_value, "chkBusinessPaper", new Integer(110), new Integer(56), new Short((short) 0), INTEGERS[1], new Short((short) 5), new Integer(168)
});
lstPrivOfficialStyle = insertListBox("lstPrivOfficialStyle", LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED, LSTPRIVOFFICIALSTYLE_ITEM_CHANGED,
new String[]
@@ -214,7 +214,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + (HID + 6), "lstPrivOfficialStyle", new Integer(180), new Integer(86), INTEGERS[1], new Short((short) 6), new Integer(74)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 6), "lstPrivOfficialStyle", new Integer(180), new Integer(86), INTEGERS[1], new Short((short) 6), new Integer(74)
});
lstPrivateStyle = insertListBox("lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED, LSTPRIVATESTYLE_ITEM_CHANGED,
new String[]
@@ -223,7 +223,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + (HID + 7), "lstPrivateStyle", new Integer(180), new Integer(118), INTEGERS[1], new Short((short) 7), new Integer(74)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 7), "lstPrivateStyle", new Integer(180), new Integer(118), INTEGERS[1], new Short((short) 7), new Integer(74)
});
lblBusinessStyle = insertLabel("lblBusinessStyle",
new String[]
@@ -287,7 +287,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 8), resources.reschkPaperCompanyLogo_value, "chkPaperCompanyLogo", new Integer(97), new Integer(28), new Short((short) 0), INTEGERS[2], new Short((short) 8), new Integer(68)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 8), resources.reschkPaperCompanyLogo_value, "chkPaperCompanyLogo", new Integer(97), new Integer(28), new Short((short) 0), INTEGERS[2], new Short((short) 8), new Integer(68)
});
numLogoHeight = insertNumericField("numLogoHeight", NUMLOGOHEIGHT_TEXT_CHANGED,
new String[]
@@ -296,7 +296,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 9), "numLogoHeight", new Integer(138), INTEGER_40, Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 9), INTEGERS[3], new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 9), "numLogoHeight", new Integer(138), INTEGER_40, Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 9), INTEGERS[3], new Integer(30)
});
numLogoX = insertNumericField("numLogoX", NUMLOGOX_TEXT_CHANGED,
new String[]
@@ -305,7 +305,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 10), "numLogoX", new Integer(266), INTEGER_40, Boolean.TRUE, INTEGERS[2], new Short((short) 10), INTEGERS[0], new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 10), "numLogoX", new Integer(266), INTEGER_40, Boolean.TRUE, INTEGERS[2], new Short((short) 10), INTEGERS[0], new Integer(30)
});
numLogoWidth = insertNumericField("numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED,
new String[]
@@ -314,7 +314,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 11), "numLogoWidth", new Integer(138), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 11), new Double(3.8), new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 11), "numLogoWidth", new Integer(138), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 11), new Double(3.8), new Integer(30)
});
numLogoY = insertNumericField("numLogoY", NUMLOGOY_TEXT_CHANGED,
new String[]
@@ -323,7 +323,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 12), "numLogoY", new Integer(266), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 12), new Double(-3.4), new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 12), "numLogoY", new Integer(266), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 12), new Double(-3.4), new Integer(30)
});
chkPaperCompanyAddress = insertCheckBox("chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED,
new String[]
@@ -332,7 +332,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 13), resources.reschkPaperCompanyAddress_value, "chkPaperCompanyAddress", new Integer(98), new Integer(84), new Short((short) 0), INTEGERS[2], new Short((short) 13), new Integer(68)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 13), resources.reschkPaperCompanyAddress_value, "chkPaperCompanyAddress", new Integer(98), new Integer(84), new Short((short) 0), INTEGERS[2], new Short((short) 13), new Integer(68)
});
numAddressHeight = insertNumericField("numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED,
new String[]
@@ -341,7 +341,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 14), "numAddressHeight", new Integer(138), new Integer(96), Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 14), INTEGERS[3], new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 14), "numAddressHeight", new Integer(138), new Integer(96), Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 14), INTEGERS[3], new Integer(30)
});
numAddressX = insertNumericField("numAddressX", NUMADDRESSX_TEXT_CHANGED,
new String[]
@@ -350,7 +350,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 15), "numAddressX", new Integer(266), new Integer(96), Boolean.TRUE, INTEGERS[2], new Short((short) 15), new Double(3.8), new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 15), "numAddressX", new Integer(266), new Integer(96), Boolean.TRUE, INTEGERS[2], new Short((short) 15), new Double(3.8), new Integer(30)
});
numAddressWidth = insertNumericField("numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED,
new String[]
@@ -359,7 +359,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 16), "numAddressWidth", new Integer(138), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 16), new Double(13.8), new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 16), "numAddressWidth", new Integer(138), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 16), new Double(13.8), new Integer(30)
});
numAddressY = insertNumericField("numAddressY", NUMADDRESSY_TEXT_CHANGED,
new String[]
@@ -368,7 +368,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 17), "numAddressY", new Integer(266), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 17), new Double(-3.4), new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 17), "numAddressY", new Integer(266), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 17), new Double(-3.4), new Integer(30)
});
chkCompanyReceiver = insertCheckBox("chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED,
new String[]
@@ -377,7 +377,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 18), resources.reschkCompanyReceiver_value, "chkCompanyReceiver", new Integer(103), new Integer(131), new Short((short) 0), INTEGERS[2], new Short((short) 18), new Integer(185)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 18), resources.reschkCompanyReceiver_value, "chkCompanyReceiver", new Integer(103), new Integer(131), new Short((short) 0), INTEGERS[2], new Short((short) 18), new Integer(185)
});
chkPaperFooter = insertCheckBox("chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED,
new String[]
@@ -386,7 +386,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 19), resources.reschkPaperFooter_value, "chkPaperFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[2], new Short((short) 19), new Integer(68)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 19), resources.reschkPaperFooter_value, "chkPaperFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[2], new Short((short) 19), new Integer(68)
});
numFooterHeight = insertNumericField("numFooterHeight", NUMFOOTERHEIGHT_TEXT_CHANGED,
new String[]
@@ -395,7 +395,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 20), "numFooterHeight", new Integer(236), new Integer(156), Boolean.TRUE, INTEGERS[2], new Short((short) 20), INTEGERS[5], new Integer(30)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 20), "numFooterHeight", new Integer(236), new Integer(156), Boolean.TRUE, INTEGERS[2], new Short((short) 20), INTEGERS[5], new Integer(30)
});
lblLogoHeight = insertLabel("lblLogoHeight",
new String[]
@@ -516,7 +516,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + (HID + 21), "lstLetterNorm", new Integer(210), new Integer(34), INTEGERS[3], new Short((short) 21), new Integer(74)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 21), "lstLetterNorm", new Integer(210), new Integer(34), INTEGERS[3], new Short((short) 21), new Integer(74)
});
chkUseLogo = insertCheckBox("chkUseLogo", CHKUSELOGO_ITEM_CHANGED,
new String[]
@@ -525,7 +525,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 22), resources.reschkUseLogo_value, "chkUseLogo", new Integer(97), new Integer(54), new Short((short) 0), INTEGERS[3], new Short((short) 22), new Integer(212)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 22), resources.reschkUseLogo_value, "chkUseLogo", new Integer(97), new Integer(54), new Short((short) 0), INTEGERS[3], new Short((short) 22), new Integer(212)
});
chkUseAddressReceiver = insertCheckBox("chkUseAddressReceiver", CHKUSEADDRESSRECEIVER_ITEM_CHANGED,
new String[]
@@ -534,7 +534,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 23), resources.reschkUseAddressReceiver_value, "chkUseAddressReceiver", new Integer(97), new Integer(69), new Short((short) 0), INTEGERS[3], new Short((short) 23), new Integer(212)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 23), resources.reschkUseAddressReceiver_value, "chkUseAddressReceiver", new Integer(97), new Integer(69), new Short((short) 0), INTEGERS[3], new Short((short) 23), new Integer(212)
});
chkUseSigns = insertCheckBox("chkUseSigns", CHKUSESIGNS_ITEM_CHANGED,
new String[]
@@ -543,7 +543,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 24), resources.reschkUseSigns_value, "chkUseSigns", new Integer(97), new Integer(82), new Short((short) 0), INTEGERS[3], new Short((short) 24), new Integer(212)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 24), resources.reschkUseSigns_value, "chkUseSigns", new Integer(97), new Integer(82), new Short((short) 0), INTEGERS[3], new Short((short) 24), new Integer(212)
});
chkUseSubject = insertCheckBox("chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED,
new String[]
@@ -552,7 +552,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 25), resources.reschkUseSubject_value, "chkUseSubject", new Integer(97), new Integer(98), new Short((short) 0), INTEGERS[3], new Short((short) 25), new Integer(212)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 25), resources.reschkUseSubject_value, "chkUseSubject", new Integer(97), new Integer(98), new Short((short) 0), INTEGERS[3], new Short((short) 25), new Integer(212)
});
chkUseSalutation = insertCheckBox("chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED,
new String[]
@@ -561,7 +561,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 26), resources.reschkUseSalutation_value, "chkUseSalutation", new Integer(97), new Integer(113), new Short((short) 0), INTEGERS[3], new Short((short) 26), new Integer(66)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 26), resources.reschkUseSalutation_value, "chkUseSalutation", new Integer(97), new Integer(113), new Short((short) 0), INTEGERS[3], new Short((short) 26), new Integer(66)
});
lstSalutation = insertComboBox("lstSalutation", LSTSALUTATION_ACTION_PERFORMED, LSTSALUTATION_ITEM_CHANGED, LSTSALUTATION_TEXT_CHANGED,
new String[]
@@ -570,7 +570,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + (HID + 27), "lstSalutation", new Integer(210), new Integer(110), INTEGERS[3], new Short((short) 27), new Integer(74)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 27), "lstSalutation", new Integer(210), new Integer(110), INTEGERS[3], new Short((short) 27), new Integer(74)
});
chkUseBendMarks = insertCheckBox("chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED,
new String[]
@@ -579,7 +579,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 28), resources.reschkUseBendMarks_value, "chkUseBendMarks", new Integer(97), new Integer(127), new Short((short) 0), INTEGERS[3], new Short((short) 28), new Integer(212)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 28), resources.reschkUseBendMarks_value, "chkUseBendMarks", new Integer(97), new Integer(127), new Short((short) 0), INTEGERS[3], new Short((short) 28), new Integer(212)
});
chkUseGreeting = insertCheckBox("chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED,
new String[]
@@ -588,7 +588,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 29), resources.reschkUseGreeting_value, "chkUseGreeting", new Integer(97), new Integer(142), new Short((short) 0), INTEGERS[3], new Short((short) 29), new Integer(66)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 29), resources.reschkUseGreeting_value, "chkUseGreeting", new Integer(97), new Integer(142), new Short((short) 0), INTEGERS[3], new Short((short) 29), new Integer(66)
});
lstGreeting = insertComboBox("lstGreeting", LSTGREETING_ACTION_PERFORMED, LSTGREETING_ITEM_CHANGED, LSTGREETING_TEXT_CHANGED,
new String[]
@@ -597,7 +597,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + (HID + 30), "lstGreeting", new Integer(210), new Integer(141), INTEGERS[3], new Short((short) 30), new Integer(74)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 30), "lstGreeting", new Integer(210), new Integer(141), INTEGERS[3], new Short((short) 30), new Integer(74)
});
chkUseFooter = insertCheckBox("chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED,
new String[]
@@ -606,7 +606,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 31), resources.reschkUseFooter_value, "chkUseFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[3], new Short((short) 31), new Integer(212)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 31), resources.reschkUseFooter_value, "chkUseFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[3], new Short((short) 31), new Integer(212)
});
lblLetterNorm = insertLabel("lblLetterNorm",
new String[]
@@ -637,7 +637,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 32), resources.resoptSenderPlaceholder_value, "optSenderPlaceholder", new Integer(104), new Integer(42), INTEGERS[4], new Short((short) 32), new Integer(149)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 32), resources.resoptSenderPlaceholder_value, "optSenderPlaceholder", new Integer(104), new Integer(42), INTEGERS[4], new Short((short) 32), new Integer(149)
});
optSenderDefine = insertRadioButton("optSenderDefine", OPTSENDERDEFINE_ITEM_CHANGED,
new String[]
@@ -646,7 +646,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 33), resources.resoptSenderDefine_value, "optSenderDefine", new Integer(104), new Integer(54), INTEGERS[4], new Short((short) 33), new Integer(149)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 33), resources.resoptSenderDefine_value, "optSenderDefine", new Integer(104), new Integer(54), INTEGERS[4], new Short((short) 33), new Integer(149)
});
txtSenderName = insertTextField("txtSenderName", TXTSENDERNAME_TEXT_CHANGED,
new String[]
@@ -655,7 +655,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 34), "txtSenderName", new Integer(182), new Integer(67), INTEGERS[4], new Short((short) 34), new Integer(119)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 34), "txtSenderName", new Integer(182), new Integer(67), INTEGERS[4], new Short((short) 34), new Integer(119)
});
txtSenderStreet = insertTextField("txtSenderStreet", TXTSENDERSTREET_TEXT_CHANGED,
new String[]
@@ -664,7 +664,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 35), "txtSenderStreet", new Integer(182), new Integer(81), INTEGERS[4], new Short((short) 35), new Integer(119)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 35), "txtSenderStreet", new Integer(182), new Integer(81), INTEGERS[4], new Short((short) 35), new Integer(119)
});
txtSenderPostCode = insertTextField("txtSenderPostCode", TXTSENDERPOSTCODE_TEXT_CHANGED,
new String[]
@@ -673,7 +673,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 36), "txtSenderPostCode", new Integer(182), new Integer(95), INTEGERS[4], new Short((short) 36), new Integer(25)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 36), "txtSenderPostCode", new Integer(182), new Integer(95), INTEGERS[4], new Short((short) 36), new Integer(25)
});
txtSenderState = insertTextField("txtSenderState", TXTSENDERSTATE_TEXT_CHANGED,
new String[]
@@ -682,7 +682,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 37), "txtSenderState", new Integer(211), new Integer(95), INTEGERS[4], new Short((short) 37), new Integer(21)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 37), "txtSenderState", new Integer(211), new Integer(95), INTEGERS[4], new Short((short) 37), new Integer(21)
});
txtSenderCity = insertTextField("txtSenderCity", TXTSENDERCITY_TEXT_CHANGED,
new String[]
@@ -691,7 +691,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 38), "txtSenderCity", new Integer(236), new Integer(95), INTEGERS[4], new Short((short) 38), new Integer(65)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 38), "txtSenderCity", new Integer(236), new Integer(95), INTEGERS[4], new Short((short) 38), new Integer(65)
});
optReceiverPlaceholder = insertRadioButton("optReceiverPlaceholder", OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
new String[]
@@ -700,7 +700,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 39), resources.resoptReceiverPlaceholder_value, "optReceiverPlaceholder", new Integer(104), new Integer(145), INTEGERS[4], new Short((short) 39), new Integer(200)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 39), resources.resoptReceiverPlaceholder_value, "optReceiverPlaceholder", new Integer(104), new Integer(145), INTEGERS[4], new Short((short) 39), new Integer(200)
});
optReceiverDatabase = insertRadioButton("optReceiverDatabase", OPTRECEIVERDATABASE_ITEM_CHANGED,
new String[]
@@ -709,7 +709,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 40), resources.resoptReceiverDatabase_value, "optReceiverDatabase", new Integer(104), new Integer(157), INTEGERS[4], new Short((short) 40), new Integer(200)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 40), resources.resoptReceiverDatabase_value, "optReceiverDatabase", new Integer(104), new Integer(157), INTEGERS[4], new Short((short) 40), new Integer(200)
});
lblSenderAddress = insertLabel("lblSenderAddress",
new String[]
@@ -785,7 +785,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- new Integer(47), "HID:" + (HID + 41), Boolean.TRUE, "txtFooter", new Integer(97), INTEGER_40, INTEGERS[5], new Short((short) 41), new Integer(203)
+ new Integer(47), HelpIds.getHelpIdString(HID + 41), Boolean.TRUE, "txtFooter", new Integer(97), INTEGER_40, INTEGERS[5], new Short((short) 41), new Integer(203)
});
chkFooterNextPages = insertCheckBox("chkFooterNextPages", CHKFOOTERNEXTPAGES_ITEM_CHANGED,
new String[]
@@ -794,7 +794,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 42), resources.reschkFooterNextPages_value, "chkFooterNextPages", new Integer(97), new Integer(92), new Short((short) 0), INTEGERS[5], new Short((short) 42), new Integer(202)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 42), resources.reschkFooterNextPages_value, "chkFooterNextPages", new Integer(97), new Integer(92), new Short((short) 0), INTEGERS[5], new Short((short) 42), new Integer(202)
});
chkFooterPageNumbers = insertCheckBox("chkFooterPageNumbers", CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
new String[]
@@ -803,7 +803,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 43), resources.reschkFooterPageNumbers_value, "chkFooterPageNumbers", new Integer(97), new Integer(106), new Short((short) 0), INTEGERS[5], new Short((short) 43), new Integer(201)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 43), resources.reschkFooterPageNumbers_value, "chkFooterPageNumbers", new Integer(97), new Integer(106), new Short((short) 0), INTEGERS[5], new Short((short) 43), new Integer(201)
});
lblFooter = insertLabel("lblFooter",
new String[]
@@ -834,7 +834,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGER_12, "HID:" + (HID + 44), "txtTemplateName", new Integer(202), new Integer(56), INTEGERS[6], new Short((short) 44), resources.restxtTemplateName_value, new Integer(100)
+ INTEGER_12, HelpIds.getHelpIdString(HID + 44), "txtTemplateName", new Integer(202), new Integer(56), INTEGERS[6], new Short((short) 44), resources.restxtTemplateName_value, new Integer(100)
});
optCreateLetter = insertRadioButton("optCreateLetter", OPTCREATELETTER_ITEM_CHANGED,
new String[]
@@ -843,7 +843,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 45), resources.resoptCreateLetter_value, "optCreateLetter", new Integer(104), new Integer(111), INTEGERS[6], new Short((short) 50), new Integer(198)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 45), resources.resoptCreateLetter_value, "optCreateLetter", new Integer(104), new Integer(111), INTEGERS[6], new Short((short) 50), new Integer(198)
});
optMakeChanges = insertRadioButton("optMakeChanges", OPTMAKECHANGES_ITEM_CHANGED,
new String[]
@@ -852,7 +852,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
},
new Object[]
{
- INTEGERS[8], "HID:" + (HID + 46), resources.resoptMakeChanges_value, "optMakeChanges", new Integer(104), new Integer(123), INTEGERS[6], new Short((short) 51), new Integer(198)
+ INTEGERS[8], HelpIds.getHelpIdString(HID + 46), resources.resoptMakeChanges_value, "optMakeChanges", new Integer(104), new Integer(123), INTEGERS[6], new Short((short) 51), new Integer(198)
});
lblFinalExplanation1 = insertLabel("lblFinalExplanation1",
new String[]
@@ -910,4 +910,4 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
});
}
-} \ No newline at end of file
+}
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index e11d33eaa..9a0d47acb 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -1435,7 +1435,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
public void insertPathSelectionControl()
{
myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE);
- myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + (HID + 47), "HID:" + (HID + 48));
+ myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString(HID + 47), HelpIds.getHelpIdString(HID + 48));
myPathSelection.sDefaultDirectory = sUserTemplatePath;
myPathSelection.sDefaultName = "myLetterTemplate.ott";
myPathSelection.sDefaultFilter = "writer8_template";
diff --git a/wizards/com/sun/star/wizards/letter/letter.component b/wizards/com/sun/star/wizards/letter/letter.component
new file mode 100644
index 000000000..277aae81e
--- /dev/null
+++ b/wizards/com/sun/star/wizards/letter/letter.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation
+ name="com.sun.star.wizards.letter.CallWizard$WizardImplementation">
+ <service name="com.sun.star.wizards.letter.CallWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk
index 700d0b72d..ca6c750ba 100644
--- a/wizards/com/sun/star/wizards/letter/makefile.mk
+++ b/wizards/com/sun/star/wizards/letter/makefile.mk
@@ -63,3 +63,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/letter.component
+
+$(MISC)/letter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ letter.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt letter.component
diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk
index fb9c3e185..a9ec3e2d5 100644
--- a/wizards/com/sun/star/wizards/makefile.mk
+++ b/wizards/com/sun/star/wizards/makefile.mk
@@ -55,6 +55,7 @@ JARTARGET = commonwizards.jar
# --- Files --------------------------------------------------------
JAVAFILES= \
+ common$/HelpIds.java \
common$/Desktop.java \
common$/NumberFormatter.java \
common$/FileAccess.java \
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index f108bc365..99952e19c 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
@@ -34,9 +34,7 @@ import com.sun.star.uno.Type;
import com.sun.star.wizards.common.Properties;
/** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a
- * method, that writes the information into the given registry key
- * (<CODE>__writeRegistryServiceInfo</CODE>).
+ * factory for creating the service (<CODE>__getServiceFactory</CODE>).
* @author Bertram Nolte
*/
public class CallQueryWizard
@@ -65,19 +63,6 @@ public class CallQueryWizard
return xsingleservicefactory;
}
- /** Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>.
- * @return returns true if the operation succeeded
- * @see com.sun.star.comp.loader.JavaLoader#
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single
- * registry key accessible.
- */
- public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
- {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(QueryWizardImplementation.class.getName(), QueryWizardImplementation.__serviceName, xregistrykey);
- }
-
/** This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java
index 592c3e64a..ece267433 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.java
@@ -78,7 +78,7 @@ public class Finalizer
},
new Object[]
{
- new Integer(12), "HID:" + curHelpIndex++, new Integer(95), new Integer(37), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(90)
+ new Integer(12), HelpIds.getHelpIdString(curHelpIndex++), new Integer(95), new Integer(37), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(90)
});
m_queryWizard.insertLabel("lblHowGoOn", new String[]
{
@@ -95,7 +95,7 @@ public class Finalizer
},
new Object[]
{
- new Integer(9), "HID:" + curHelpIndex++, resoptDisplayQuery, new Integer(192), new Integer(46), new Short((short) 1), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118)
+ new Integer(9), HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, new Integer(192), new Integer(46), new Short((short) 1), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118)
});
m_queryWizard.insertRadioButton("optModifyQuery",
@@ -105,7 +105,7 @@ public class Finalizer
},
new Object[]
{
- new Integer(10), "HID:" + curHelpIndex++, resoptModifyQuery, new Integer(192), new Integer(56), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118)
+ new Integer(10), HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, new Integer(192), new Integer(56), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118)
});
m_queryWizard.insertFixedLine("flnSummary", new String[]
{
@@ -121,7 +121,7 @@ public class Finalizer
},
new Object[]
{
- new Integer(96), "HID:" + curHelpIndex++, Boolean.TRUE, new Integer(95), new Integer(80), Boolean.TRUE, new Integer(8), Boolean.TRUE, new Integer(209)
+ new Integer(96), HelpIds.getHelpIdString(curHelpIndex++), Boolean.TRUE, new Integer(95), new Integer(80), Boolean.TRUE, new Integer(8), Boolean.TRUE, new Integer(209)
});
}
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 1ede9b0dd..8184c13c1 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -36,8 +36,10 @@ import com.sun.star.sdbc.SQLException;
import com.sun.star.uno.AnyConverter;
import com.sun.star.wizards.ui.UIConsts;
import com.sun.star.uno.UnoRuntime;
+import com.sun.star.wizards.common.Desktop;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.JavaTools;
+import com.sun.star.wizards.common.Properties;
import com.sun.star.wizards.common.Resource;
import com.sun.star.wizards.db.DatabaseObjectWizard;
import com.sun.star.wizards.db.QueryMetaData;
@@ -59,15 +61,15 @@ public class QueryWizard extends DatabaseObjectWizard
private static final int SOGROUPFILTER_PAGE = 6;
private static final int SOTITLES_PAGE = 7;
protected static final int SOSUMMARY_PAGE = 8;
- private CommandFieldSelection CurDBCommandFieldSelection;
- private SortingComponent CurSortingComponent;
- private FieldSelection CurGroupFieldSelection;
- private TitlesComponent CurTitlesComponent;
- private FilterComponent CurFilterComponent;
- private FilterComponent CurGroupFilterComponent;
- private AggregateComponent CurAggregateComponent;
- private Finalizer CurFinalizer;
- private QuerySummary CurDBMetaData;
+ private CommandFieldSelection m_DBCommandFieldSelectio;
+ private SortingComponent m_sortingComponent;
+ private FieldSelection m_groupFieldSelection;
+ private TitlesComponent m_titlesComponent;
+ private FilterComponent m_filterComponent;
+ private FilterComponent m_groupFilterComponent;
+ private AggregateComponent m_aggregateComponent;
+ private Finalizer m_finalizer;
+ private QuerySummary m_DBMetaData;
private String reslblFieldHeader;
private String reslblAliasHeader;
private String reslblFields;
@@ -82,30 +84,85 @@ public class QueryWizard extends DatabaseObjectWizard
{
super( xMSF, 40970, i_wizardContext );
addResourceHandler("QueryWizard", "dbw");
- CurDBMetaData = new QuerySummary(xMSF, m_oResource);
+ m_DBMetaData = new QuerySummary(xMSF, m_oResource);
}
-/* public static void main(String args[])
+ public static void main(String i_args[])
{
- String ConnectStr = "uno:pipe,name=foo;urp;StarOffice.ServiceManager";
+ final String settings[] = new String[] { null, null, null };
+ final int IDX_PIPE_NAME = 0;
+ final int IDX_LOCATION = 1;
+ final int IDX_DSN = 2;
+
+ // some simple parsing
+ boolean failure = false;
+ int settingsIndex = -1;
+ for ( int i=0; i<i_args.length; ++i )
+ {
+ if ( settingsIndex >= 0 )
+ {
+ settings[ settingsIndex ] = i_args[i];
+ settingsIndex = -1;
+ continue;
+ }
+
+ if ( i_args[i].equals( "--pipe-name" ) )
+ {
+ settingsIndex = IDX_PIPE_NAME;
+ continue;
+ }
+
+ if ( i_args[i].equals( "--database-location" ) )
+ {
+ settingsIndex = IDX_LOCATION;
+ continue;
+ }
+
+ if ( i_args[i].equals( "--data-source-name" ) )
+ {
+ settingsIndex = IDX_DSN;
+ continue;
+ }
+
+ failure = true;
+ }
+
+ if ( settings[ IDX_PIPE_NAME ] == null )
+ failure = true;
+
+ if ( ( settings[ IDX_DSN ] == null ) && ( settings[ IDX_LOCATION ] == null ) )
+ failure = true;
+
+ if ( failure )
+ {
+ System.err.println( "supported arguments: " );
+ System.err.println( " --pipe-name <name> : specifies the name of the pipe to connect to the running OOo instance" );
+ System.err.println( " --database-location <url> : specifies the URL of the database document to work with" );
+ System.err.println( " --data-source-name <name> : specifies the name of the data source to work with" );
+ return;
+ }
+
+ final String ConnectStr = "uno:pipe,name=" + settings[IDX_PIPE_NAME] + ";urp;StarOffice.ServiceManager";
try
{
- XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr);
- if (xLocMSF != null)
+ final XMultiServiceFactory serviceFactory = Desktop.connect(ConnectStr);
+ if (serviceFactory != null)
{
PropertyValue[] curproperties = new PropertyValue[1];
- curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///G:/temp/abc.odb");
-// curproperties[0] = Properties.createProperty("DataSourceName", "TESTDB");
+ if ( settings[ IDX_LOCATION ] != null )
+ curproperties[0] = Properties.createProperty( "DatabaseLocation", settings[ IDX_LOCATION ] );
+ else
+ curproperties[0] = Properties.createProperty( "DataSourceName", settings[ IDX_DSN ] );
- QueryWizard CurQueryWizard = new QueryWizard(xLocMSF);
- CurQueryWizard.startQueryWizard(xLocMSF, curproperties);
+ QueryWizard CurQueryWizard = new QueryWizard( serviceFactory, curproperties );
+ CurQueryWizard.startQueryWizard();
}
}
catch (java.lang.Exception jexception)
{
jexception.printStackTrace(System.out);
}
- }*/
+ }
public final XFrame getFrame()
{
@@ -116,7 +173,7 @@ public class QueryWizard extends DatabaseObjectWizard
{
try
{
- if ( CurDBMetaData.getConnection( m_wizardContext ) )
+ if ( m_DBMetaData.getConnection( m_wizardContext ) )
{
reslblFields = m_oResource.getResText(UIConsts.RID_QUERY + 4);
reslblFieldHeader = m_oResource.getResText(UIConsts.RID_QUERY + 19); //Fielnames in AliasComponent
@@ -138,11 +195,11 @@ public class QueryWizard extends DatabaseObjectWizard
setRightPaneHeaders(m_oResource, UIConsts.RID_QUERY + 70, 8);
this.setMaxStep(8);
buildSteps();
- this.CurDBCommandFieldSelection.preselectCommand( m_wizardContext, false );
+ this.m_DBCommandFieldSelectio.preselectCommand( m_wizardContext, false );
XWindowPeer windowPeer = UnoRuntime.queryInterface( XWindowPeer.class, m_frame.getContainerWindow() );
createWindowPeer(windowPeer);
- CurDBMetaData.setWindowPeer(this.xControl.getPeer());
+ m_DBMetaData.setWindowPeer(this.xControl.getPeer());
insertQueryRelatedSteps();
executeDialog( m_frame.getContainerWindow().getPosSize() );
}
@@ -151,14 +208,14 @@ public class QueryWizard extends DatabaseObjectWizard
{
jexception.printStackTrace(System.out);
}
- CurGroupFilterComponent = null;
- CurTitlesComponent = null;
- CurAggregateComponent = null;
- CurDBCommandFieldSelection = null;
+ m_groupFilterComponent = null;
+ m_titlesComponent = null;
+ m_aggregateComponent = null;
+ m_DBCommandFieldSelectio = null;
xWindowPeer = null;
- CurFinalizer = null;
- CurDBMetaData.finish();
- CurDBMetaData = null;
+ m_finalizer = null;
+ m_DBMetaData.finish();
+ m_DBMetaData = null;
System.gc();
return m_createdQuery;
@@ -181,17 +238,17 @@ public class QueryWizard extends DatabaseObjectWizard
case SOAGGREGATE_PAGE:
if (_bEnabled == true)
{
- bEnabled = ((CurDBMetaData.hasNumericalFields()) && (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar()));
+ bEnabled = ((m_DBMetaData.hasNumericalFields()) && (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar()));
}
break;
case SOGROUPSELECTION_PAGE:
- bEnabled = CurDBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY;
+ bEnabled = m_DBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY;
break;
case SOGROUPFILTER_PAGE:
bEnabled = false;
if (_bEnabled == true)
{
- bEnabled = (CurDBMetaData.GroupByFilterConditions.length > 0);
+ bEnabled = (m_DBMetaData.GroupByFilterConditions.length > 0);
}
break;
@@ -225,11 +282,11 @@ public class QueryWizard extends DatabaseObjectWizard
i = insertRoadmapItem(0, true, SOFIELDSELECTION_PAGE - 1, SOFIELDSELECTION_PAGE);
i = insertRoadmapItem(i, false, SOSORTING_PAGE - 1, SOSORTING_PAGE); // Orderby is always supported
i = insertRoadmapItem(i, false, SOFILTER_PAGE - 1, SOFILTER_PAGE);
- if (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar())
+ if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
{
- i = insertRoadmapItem(i, CurDBMetaData.hasNumericalFields(), SOAGGREGATE_PAGE - 1, SOAGGREGATE_PAGE);
+ i = insertRoadmapItem(i, m_DBMetaData.hasNumericalFields(), SOAGGREGATE_PAGE - 1, SOAGGREGATE_PAGE);
}
- if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.xDBMetaData.supportsGroupBy())
{
i = insertRoadmapItem(i, false, SOGROUPSELECTION_PAGE - 1, SOGROUPSELECTION_PAGE);
i = insertRoadmapItem(i, false, SOGROUPFILTER_PAGE - 1, SOGROUPFILTER_PAGE);
@@ -251,28 +308,25 @@ public class QueryWizard extends DatabaseObjectWizard
{
try
{
-// curDBCommandFieldSelection = new CommandFieldSelection(this, curFormDocument.oMainFormDBMetaData, 92, slblFields, slblSelFields, slblTables, true, 34411);
-// curDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
-
- CurDBCommandFieldSelection = new CommandFieldSelection(this, CurDBMetaData, 120, reslblFields, reslblSelFields, reslblTables, true, 40850);
- CurDBCommandFieldSelection.setAppendMode(true);
- CurDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
- CurSortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865);
- CurFilterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 209, 3, CurDBMetaData, 40878);
- CurFilterComponent.addNumberFormats();
+ m_DBCommandFieldSelectio = new CommandFieldSelection(this, m_DBMetaData, 120, reslblFields, reslblSelFields, reslblTables, true, 40850);
+ m_DBCommandFieldSelectio.setAppendMode(true);
+ m_DBCommandFieldSelectio.addFieldSelectionListener(new FieldSelectionListener());
+ m_sortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865);
+ m_filterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40878);
+ m_filterComponent.addNumberFormats();
- if (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar())
+ if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
{
- CurAggregateComponent = new AggregateComponent(this, CurDBMetaData, SOAGGREGATE_PAGE, 97, 69, 209, 5, 40895);
+ m_aggregateComponent = new AggregateComponent(this, m_DBMetaData, SOAGGREGATE_PAGE, 97, 69, 209, 5, 40895);
}
- if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.xDBMetaData.supportsGroupBy())
{
- CurGroupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false);
- CurGroupFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
- CurGroupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 209, 3, CurDBMetaData, 40923);
+ m_groupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false);
+ m_groupFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
+ m_groupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40923);
}
- CurTitlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940);
- CurFinalizer = new Finalizer(this, CurDBMetaData);
+ m_titlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940);
+ m_finalizer = new Finalizer(this, m_DBMetaData);
enableNavigationButtons(false, false, false);
}
catch (com.sun.star.uno.Exception exception)
@@ -288,10 +342,10 @@ public class QueryWizard extends DatabaseObjectWizard
|| ( switchToStep( ncurStep, SOSUMMARY_PAGE ) )
)
{
- m_createdQuery = CurFinalizer.finish();
+ m_createdQuery = m_finalizer.finish();
if ( m_createdQuery.length() > 0 )
{
- loadSubComponent( CommandType.QUERY, m_createdQuery, CurFinalizer.displayQueryDesign() );
+ loadSubComponent( CommandType.QUERY, m_createdQuery, m_finalizer.displayQueryDesign() );
xDialog.endExecute();
return true;
}
@@ -305,11 +359,11 @@ public class QueryWizard extends DatabaseObjectWizard
{
if (nOldStep <= SOGROUPSELECTION_PAGE && nNewStep > SOGROUPSELECTION_PAGE)
{
- if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.xDBMetaData.supportsGroupBy())
{
- CurDBMetaData.setGroupFieldNames(CurGroupFieldSelection.getSelectedFieldNames());
- CurDBMetaData.GroupFieldNames = JavaTools.removeOutdatedFields(CurDBMetaData.GroupFieldNames, CurDBMetaData.NonAggregateFieldNames);
- CurDBMetaData.GroupByFilterConditions = JavaTools.removeOutdatedFields(CurDBMetaData.GroupByFilterConditions, CurDBMetaData.GroupFieldNames);
+ m_DBMetaData.setGroupFieldNames(m_groupFieldSelection.getSelectedFieldNames());
+ m_DBMetaData.GroupFieldNames = JavaTools.removeOutdatedFields(m_DBMetaData.GroupFieldNames, m_DBMetaData.NonAggregateFieldNames);
+ m_DBMetaData.GroupByFilterConditions = JavaTools.removeOutdatedFields(m_DBMetaData.GroupByFilterConditions, m_DBMetaData.GroupFieldNames);
}
}
switch (nNewStep)
@@ -317,24 +371,24 @@ public class QueryWizard extends DatabaseObjectWizard
case SOFIELDSELECTION_PAGE:
break;
case SOSORTING_PAGE:
- CurSortingComponent.initialize(CurDBMetaData.getDisplayFieldNames(), CurDBMetaData.getSortFieldNames());
+ m_sortingComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.getSortFieldNames());
break;
case SOFILTER_PAGE:
- CurFilterComponent.initialize(CurDBMetaData.getFilterConditions(), CurDBMetaData.getDisplayFieldNames());
+ m_filterComponent.initialize(m_DBMetaData.getFilterConditions(), m_DBMetaData.getDisplayFieldNames());
break;
case SOAGGREGATE_PAGE:
- CurAggregateComponent.initialize();
+ m_aggregateComponent.initialize();
break;
case SOGROUPSELECTION_PAGE:
break;
case SOGROUPFILTER_PAGE:
- CurGroupFilterComponent.initialize(CurDBMetaData.GroupByFilterConditions, CurDBMetaData.getGroupFieldNames());
+ m_groupFilterComponent.initialize(m_DBMetaData.GroupByFilterConditions, m_DBMetaData.getGroupFieldNames());
break;
case SOTITLES_PAGE:
- CurTitlesComponent.initialize(CurDBMetaData.getDisplayFieldNames(), CurDBMetaData.FieldTitleSet);
+ m_titlesComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.FieldTitleSet);
break;
case SOSUMMARY_PAGE:
- CurFinalizer.initialize();
+ m_finalizer.initialize();
break;
default:
break;
@@ -351,27 +405,27 @@ public class QueryWizard extends DatabaseObjectWizard
switch (nOldStep)
{
case SOFIELDSELECTION_PAGE:
- CurDBMetaData.reorderFieldColumns(CurDBCommandFieldSelection.getSelectedFieldNames());
- CurDBMetaData.initializeFieldTitleSet(true);
- CurDBMetaData.setNumericFields();
+ m_DBMetaData.reorderFieldColumns(m_DBCommandFieldSelectio.getSelectedFieldNames());
+ m_DBMetaData.initializeFieldTitleSet(true);
+ m_DBMetaData.setNumericFields();
searchForOutdatedFields();
break;
case SOSORTING_PAGE:
- CurDBMetaData.setSortFieldNames(CurSortingComponent.getSortFieldNames());
+ m_DBMetaData.setSortFieldNames(m_sortingComponent.getSortFieldNames());
break;
case SOFILTER_PAGE:
- CurDBMetaData.setFilterConditions(CurFilterComponent.getFilterConditions());
+ m_DBMetaData.setFilterConditions(m_filterComponent.getFilterConditions());
break;
case SOAGGREGATE_PAGE:
- CurDBMetaData.AggregateFieldNames = CurAggregateComponent.getAggregateFieldNames();
+ m_DBMetaData.AggregateFieldNames = m_aggregateComponent.getAggregateFieldNames();
break;
case SOGROUPSELECTION_PAGE:
break;
case SOGROUPFILTER_PAGE:
- CurDBMetaData.setGroupByFilterConditions(this.CurGroupFilterComponent.getFilterConditions());
+ m_DBMetaData.setGroupByFilterConditions(this.m_groupFilterComponent.getFilterConditions());
break;
case SOTITLES_PAGE:
- CurDBMetaData.setFieldTitles(CurTitlesComponent.getFieldTitles());
+ m_DBMetaData.setFieldTitles(m_titlesComponent.getFieldTitles());
break;
case SOSUMMARY_PAGE:
break;
@@ -382,15 +436,15 @@ public class QueryWizard extends DatabaseObjectWizard
{
try
{
- if (CurDBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY)
+ if (m_DBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY)
{
- if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.xDBMetaData.supportsGroupBy())
{
- CurDBMetaData.setNonAggregateFieldNames();
- CurGroupFieldSelection.initialize(CurDBMetaData.getUniqueAggregateFieldNames(), false, CurDBMetaData.xDBMetaData.getMaxColumnsInGroupBy());
- CurGroupFieldSelection.intializeSelectedFields(CurDBMetaData.NonAggregateFieldNames);
- CurGroupFieldSelection.setMultipleMode(false);
- setStepEnabled(SOGROUPFILTER_PAGE, CurAggregateComponent.isGroupingpossible() && CurDBMetaData.NonAggregateFieldNames.length > 0);
+ m_DBMetaData.setNonAggregateFieldNames();
+ m_groupFieldSelection.initialize(m_DBMetaData.getUniqueAggregateFieldNames(), false, m_DBMetaData.xDBMetaData.getMaxColumnsInGroupBy());
+ m_groupFieldSelection.intializeSelectedFields(m_DBMetaData.NonAggregateFieldNames);
+ m_groupFieldSelection.setMultipleMode(false);
+ setStepEnabled(SOGROUPFILTER_PAGE, m_aggregateComponent.isGroupingpossible() && m_DBMetaData.NonAggregateFieldNames.length > 0);
}
}
}
@@ -403,18 +457,18 @@ public class QueryWizard extends DatabaseObjectWizard
private void searchForOutdatedFields()
{
- String[] sFieldNames = CurDBMetaData.getFieldNames();
- String[][] sRemovedFields = JavaTools.removeOutdatedFields(CurDBMetaData.getSortFieldNames(), sFieldNames);
- CurDBMetaData.setSortFieldNames(sRemovedFields);
- CurDBMetaData.setFilterConditions(JavaTools.removeOutdatedFields(CurDBMetaData.getFilterConditions(), sFieldNames));
- CurDBMetaData.AggregateFieldNames = JavaTools.removeOutdatedFields(CurDBMetaData.AggregateFieldNames, sFieldNames);
+ String[] sFieldNames = m_DBMetaData.getFieldNames();
+ String[][] sRemovedFields = JavaTools.removeOutdatedFields(m_DBMetaData.getSortFieldNames(), sFieldNames);
+ m_DBMetaData.setSortFieldNames(sRemovedFields);
+ m_DBMetaData.setFilterConditions(JavaTools.removeOutdatedFields(m_DBMetaData.getFilterConditions(), sFieldNames));
+ m_DBMetaData.AggregateFieldNames = JavaTools.removeOutdatedFields(m_DBMetaData.AggregateFieldNames, sFieldNames);
}
private void enableWizardSteps(String[] NewItems)
{
boolean bEnabled = NewItems.length > 0;
- setControlProperty("btnWizardNext", "Enabled", new Boolean(bEnabled));
- setControlProperty("btnWizardFinish", "Enabled", new Boolean(bEnabled));
+ setControlProperty("btnWizardNext", "Enabled", bEnabled);
+ setControlProperty("btnWizardFinish", "Enabled", bEnabled);
enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this could be improved
}
@@ -446,15 +500,15 @@ public class QueryWizard extends DatabaseObjectWizard
{
if (ID == 1)
{
- CurDBMetaData.addSeveralFieldColumns(SelItems, CurDBCommandFieldSelection.getSelectedCommandName());
+ m_DBMetaData.addSeveralFieldColumns(SelItems, m_DBCommandFieldSelectio.getSelectedCommandName());
enableWizardSteps(NewItems);
- CurDBCommandFieldSelection.changeSelectedFieldNames(CurDBMetaData.getDisplayFieldNames());
- CurDBCommandFieldSelection.toggleCommandListBox(NewItems);
+ m_DBCommandFieldSelectio.changeSelectedFieldNames(m_DBMetaData.getDisplayFieldNames());
+ m_DBCommandFieldSelectio.toggleCommandListBox(NewItems);
}
else
{
- boolean bEnabled = (CurGroupFieldSelection.getSelectedFieldNames().length > 0);
- Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled));
+ boolean bEnabled = (m_groupFieldSelection.getSelectedFieldNames().length > 0);
+ Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled);
}
}
@@ -464,30 +518,30 @@ public class QueryWizard extends DatabaseObjectWizard
if (ID == 1)
{
enableWizardSteps(NewItems);
- String[] sSelfieldNames = CurDBMetaData.getFieldNames(SelItems, CurDBCommandFieldSelection.getSelectedCommandName());
- CurDBCommandFieldSelection.addItemsToFieldsListbox(sSelfieldNames);
- CurDBMetaData.removeSeveralFieldColumnsByDisplayFieldName(SelItems);
- CurDBCommandFieldSelection.toggleCommandListBox(NewItems);
+ String[] sSelfieldNames = m_DBMetaData.getFieldNames(SelItems, m_DBCommandFieldSelectio.getSelectedCommandName());
+ m_DBCommandFieldSelectio.addItemsToFieldsListbox(sSelfieldNames);
+ m_DBMetaData.removeSeveralFieldColumnsByDisplayFieldName(SelItems);
+ m_DBCommandFieldSelectio.toggleCommandListBox(NewItems);
}
else
{
- boolean bEnabled = (CurGroupFieldSelection.getSelectedFieldNames().length > 0);
+ boolean bEnabled = (m_groupFieldSelection.getSelectedFieldNames().length > 0);
String CurDisplayFieldName = SelItems[0];
- if (JavaTools.FieldInList(CurDBMetaData.NonAggregateFieldNames, CurDisplayFieldName) > -1)
+ if (JavaTools.FieldInList(m_DBMetaData.NonAggregateFieldNames, CurDisplayFieldName) > -1)
{
showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, resmsgNonNumericAsGroupBy);
- CurGroupFieldSelection.xSelectedFieldsListBox.addItems(SelItems, CurGroupFieldSelection.xSelectedFieldsListBox.getItemCount());
- String FieldList[] = CurGroupFieldSelection.xFieldsListBox.getItems();
+ m_groupFieldSelection.xSelectedFieldsListBox.addItems(SelItems, m_groupFieldSelection.xSelectedFieldsListBox.getItemCount());
+ String FieldList[] = m_groupFieldSelection.xFieldsListBox.getItems();
int index = JavaTools.FieldInList(FieldList, CurDisplayFieldName);
if (index > -1)
{
- CurGroupFieldSelection.xFieldsListBox.removeItems((short) index, (short) 1);
+ m_groupFieldSelection.xFieldsListBox.removeItems((short) index, (short) 1);
}
}
else
{
- Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled));
+ Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled);
}
}
}
diff --git a/wizards/com/sun/star/wizards/query/makefile.mk b/wizards/com/sun/star/wizards/query/makefile.mk
index af5056ba5..080076668 100644
--- a/wizards/com/sun/star/wizards/query/makefile.mk
+++ b/wizards/com/sun/star/wizards/query/makefile.mk
@@ -59,3 +59,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/query.component
+
+$(MISC)/query.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ query.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt query.component
diff --git a/wizards/com/sun/star/wizards/query/query.component b/wizards/com/sun/star/wizards/query/query.component
new file mode 100644
index 000000000..d1d708c6b
--- /dev/null
+++ b/wizards/com/sun/star/wizards/query/query.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name=
+ "com.sun.star.wizards.query.CallQueryWizard$QueryWizardImplementation">
+ <service name="com.sun.star.wizards.query.CallQueryWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index 78b67263e..47d846183 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java
@@ -35,9 +35,7 @@ import com.sun.star.sdb.application.XDatabaseDocumentUI;
import com.sun.star.wizards.common.NamedValueCollection;
/** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a
- * method, that writes the information into the given registry key
- * (<CODE>__writeRegistryServiceInfo</CODE>).
+ * factory for creating the service (<CODE>__getServiceFactory</CODE>).
* @author Bertram Nolte
*/
public class CallReportWizard
@@ -94,22 +92,6 @@ public class CallReportWizard
return xsingleservicefactory;
}
- /** Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>.
- * @return returns true if the operation succeeded
- * @see com.sun.star.comp.loader.JavaLoader#
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single
- * registry key accessible.
- */
- public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
- {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(
- ReportWizardImplementation.class.getName(),
- ReportWizardImplementation.__serviceName,
- xregistrykey);
- }
-
/** This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 9b1d993c8..e8c533cb8 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -178,7 +178,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
},
new Object[]
{
- new Integer(14), "HID:34321", new Integer(74), new Integer(58), new Integer(0), new Short((short) 1), new Integer(40), sStop
+ new Integer(14), HelpIds.getHelpIdString(34321), new Integer(74), new Integer(58), new Integer(0), new Short((short) 1), new Integer(40), sStop
});
createWindowPeer(CurReportDocument.getWizardParent());
calculateDialogPosition(CurReportDocument.getFrame().getComponentWindow().getPosSize());
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index 05253f45d..5573fe0c2 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -104,7 +104,7 @@ public class ReportFinalizer
},
new Object[]
{
- new Integer(12), "HID:34362", new Integer(95), new Integer(37), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209)
+ new Integer(12), "HID:WIZARDS_HID_DLGREPORT_4_TITLE", new Integer(95), new Integer(37), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209)
});
CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblChooseReportKind",
@@ -124,7 +124,7 @@ public class ReportFinalizer
},
new Object[]
{
- new Integer(10), "HID:34371", sSaveAsDocument, new Integer(95), new Integer(69), new Short((short) 0), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138)
+ new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", sSaveAsDocument, new Integer(95), new Integer(69), new Short((short) 0), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138)
});
CurUnoDialog.insertRadioButton("optCreateReportTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this,
@@ -134,7 +134,7 @@ public class ReportFinalizer
},
new Object[]
{
- new Integer(8), "HID:34370", sSaveAsTemplate, new Integer(95), new Integer(81), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209)
+ new Integer(8), "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", sSaveAsTemplate, new Integer(95), new Integer(81), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209)
});
@@ -156,7 +156,7 @@ public class ReportFinalizer
},
new Object[]
{
- new Integer(10), "HID:34374", sEditTemplate, new Integer(111), new Integer(105), new Integer(6), new Short(curtabindex++), new Integer(138)
+ new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", sEditTemplate, new Integer(111), new Integer(105), new Integer(6), new Short(curtabindex++), new Integer(138)
});
CurUnoDialog.insertRadioButton("optUseTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this,
@@ -166,7 +166,7 @@ public class ReportFinalizer
},
new Object[]
{
- new Integer(10), "HID:34375", sUseTemplate, new Integer(111), new Integer(115), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138)
+ new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", sUseTemplate, new Integer(111), new Integer(115), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138)
});
}
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index d05bc2cf4..9b4b9b777 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -115,7 +115,7 @@ public class ReportLayouter
},
new Object[]
{
- new Integer(108), "HID:34363", new Integer(95), new Integer(37), new short[]
+ new Integer(108), "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", new Integer(95), new Integer(37), new short[]
{
iSelPos
}, new Integer(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), new Integer(99)
@@ -150,7 +150,7 @@ public class ReportLayouter
},
new Object[]
{
- new Integer(108), "HID:34364", new Integer(205), new Integer(37), new short[]
+ new Integer(108), "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", new Integer(205), new Integer(37), new short[]
{
iSelLayoutPos
}, new Integer(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), new Integer(99)
@@ -174,7 +174,7 @@ public class ReportLayouter
},
new Object[]
{
- new Integer(10), "HID:34365", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)
+ new Integer(10), "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)
});
short m_nPortraitState = CurReportDocument.getDefaultPageOrientation() == SOOPTPORTRAIT ? (short) 1 : (short) 0;
@@ -185,7 +185,7 @@ public class ReportLayouter
},
new Object[]
{
- new Integer(10), "HID:34366", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)
+ new Integer(10), "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)
});
aOrientationImage = CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlImageControlModel", "imgOrientation",
diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk
index b31639d21..62b948674 100644
--- a/wizards/com/sun/star/wizards/report/makefile.mk
+++ b/wizards/com/sun/star/wizards/report/makefile.mk
@@ -66,3 +66,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/report.component
+
+$(MISC)/report.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ report.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt report.component
diff --git a/wizards/com/sun/star/wizards/report/report.component b/wizards/com/sun/star/wizards/report/report.component
new file mode 100644
index 000000000..67efca927
--- /dev/null
+++ b/wizards/com/sun/star/wizards/report/report.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name=
+ "com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation">
+ <service name="com.sun.star.wizards.report.CallReportWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 4b992a5ea..cac3a18a0 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -32,9 +32,7 @@ import com.sun.star.uno.Type;
import com.sun.star.wizards.common.Properties;
/** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a
- * method, that writes the information into the given registry key
- * (<CODE>__writeRegistryServiceInfo</CODE>).
+ * factory for creating the service (<CODE>__getServiceFactory</CODE>).
* @author Bertram Nolte
*/
public class CallTableWizard
@@ -63,19 +61,6 @@ public class CallTableWizard
return xsingleservicefactory;
}
- /** Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>.
- * @return returns true if the operation succeeded
- * @see com.sun.star.comp.loader.JavaLoader#
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single
- * registry key accessible.
- */
- public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
- {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(TableWizardImplementation.class.getName(), TableWizardImplementation.__serviceName, xregistrykey);
- }
-
/** This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index 3c9a8997e..3547712f0 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -95,7 +95,7 @@ public class FieldFormatter implements XItemListener
},
new Object[]
{
- new Integer(133), "HID:41220", new Integer(92), new Integer(37), IFieldFormatStep, new Short(curtabindex++), new Integer(62)
+ new Integer(133), "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", new Integer(92), new Integer(37), IFieldFormatStep, new Short(curtabindex++), new Integer(62)
});
}
catch (Exception e)
@@ -113,7 +113,7 @@ public class FieldFormatter implements XItemListener
},
new Object[]
{
- Boolean.FALSE, oFontDesc, new Integer(14), "HID:41221", String.valueOf((char) 8743), new Integer(158), new Integer(139), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
+ Boolean.FALSE, oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", String.valueOf((char) 8743), new Integer(158), new Integer(139), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
});
btnShiftDown = CurUnoDialog.insertButton("btnShiftDown", "shiftFieldNameDown", this,
@@ -123,7 +123,7 @@ public class FieldFormatter implements XItemListener
},
new Object[]
{
- Boolean.FALSE, oFontDesc, new Integer(14), "HID:41222", String.valueOf((char) 8744), new Integer(158), new Integer(156), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
+ Boolean.FALSE, oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", String.valueOf((char) 8744), new Integer(158), new Integer(156), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
});
oFontDesc = new FontDescriptor();
oFontDesc.Weight = com.sun.star.awt.FontWeight.BOLD;
@@ -135,7 +135,7 @@ public class FieldFormatter implements XItemListener
},
new Object[]
{
- oFontDesc, new Integer(14), "HID:41223", "-", new Integer(118), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
+ oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", "-", new Integer(118), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
});
btnplus = CurUnoDialog.insertButton("btnplus", "addFieldName", this,
@@ -145,7 +145,7 @@ public class FieldFormatter implements XItemListener
},
new Object[]
{
- oFontDesc, new Integer(14), "HID:41224", "+", new Integer(137), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
+ oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", "+", new Integer(137), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14)
});
CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedLineModel", "ColDescriptorHeader",
@@ -176,7 +176,7 @@ public class FieldFormatter implements XItemListener
},
new Object[]
{
- UIConsts.INTEGER_12, "HID:41225", new Integer(274), new Integer(37), IFieldFormatStep, new Short(curtabindex++), "", new Integer(50)
+ UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_COLNAME", new Integer(274), new Integer(37), IFieldFormatStep, new Short(curtabindex++), "", new Integer(50)
});
txtfieldname.addTextListener(CurUnoDialog);
CurUnoDialog.getPeerConfiguration().setAccessibleName(btnplus, sbtnplushelptext);
@@ -195,7 +195,7 @@ public class FieldFormatter implements XItemListener
new Object[]
{
new Integer(85), new Integer(158), new Integer(49), IFieldFormatStep, new Short(curtabindex++), new Integer(166), new Integer(50)
- }); //, "HID:41226"
+ }); //, "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER"
curTableDescriptor = _curTableDescriptor;
Helper.setUnoPropertyValue(oColumnDescriptorModel, "ActiveConnection", _curTableDescriptor.DBConnection);
txtfieldname.setMaxTextLen((short) this.curTableDescriptor.getMaxColumnNameLength());
diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java
index 94636532e..b86e2a698 100644
--- a/wizards/com/sun/star/wizards/table/Finalizer.java
+++ b/wizards/com/sun/star/wizards/table/Finalizer.java
@@ -91,7 +91,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGER_12, "HID:41240", new Integer(97), new Integer(35), IFINALSTEP, new Short(curtabindex++), "", new Integer(223)
+ UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", new Integer(97), new Integer(35), IFINALSTEP, new Short(curtabindex++), "", new Integer(223)
});
txtTableName.addTextListener(CurUnoDialog);
txtTableName.setMaxTextLen((short) this.curtabledescriptor.getMaxTableNameLength());
@@ -130,7 +130,7 @@ public class Finalizer
},
new Object[]
{
- Boolean.TRUE, new Integer(12), "HID:41244", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sCatalogNames, new Short(curtabindex++), new Integer(80)
+ Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sCatalogNames, new Short(curtabindex++), new Integer(80)
});
int isel = JavaTools.FieldInList(sCatalogNames, sCatalog);
if (isel < 0)
@@ -185,7 +185,7 @@ public class Finalizer
},
new Object[]
{
- Boolean.TRUE, new Integer(12), "HID:41245", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sSchemaNames, new Short(curtabindex++), new Integer(80)
+ Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sSchemaNames, new Short(curtabindex++), new Integer(80)
});
int isel = JavaTools.FieldInList(sSchemaNames, sSchema);
if (isel < 0)
@@ -236,7 +236,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41242", sWorkWithTable, new Integer(101), new Integer(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), new Integer(177)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", sWorkWithTable, new Integer(101), new Integer(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), new Integer(177)
});
optModifyTable = CurUnoDialog.insertRadioButton("optModifyTable", null,
new String[]
@@ -245,7 +245,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41241", sModifyTable, new Integer(101), new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, new Integer(101), new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177)
});
optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null,
new String[]
@@ -254,7 +254,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41243", sStartFormWizard, new Integer(101), new Integer(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, new Integer(101), new Integer(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177)
});
}
catch (SQLException e)
diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index 6f7ecb289..4880c8735 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -99,7 +99,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41227", screatePrimaryKey, new Integer(97), new Integer(70), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(160)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", screatePrimaryKey, new Integer(97), new Integer(70), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(160)
});
optAddAutomatically = CurUnoDialog.insertRadioButton("optAddAutomatically", SPRIMEKEYMODE, this,
@@ -109,7 +109,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41228", sAddAutomatically, new Integer(106), new Integer(82), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", sAddAutomatically, new Integer(106), new Integer(82), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200)
});
optUseExisting = CurUnoDialog.insertRadioButton("optUseExisting", SPRIMEKEYMODE, this,
@@ -119,7 +119,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
}, //94
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41230", sUseExisting, new Integer(106), new Integer(104), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", sUseExisting, new Integer(106), new Integer(104), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200)
});
optUseSeveral = CurUnoDialog.insertRadioButton("optUseSeveral", SPRIMEKEYMODE, this,
@@ -129,7 +129,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41233", sUseSeveral, new Integer(106), new Integer(132), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", sUseSeveral, new Integer(106), new Integer(132), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200)
});
chkApplyAutoValueAutomatic = CurUnoDialog.insertCheckBox("chkApplyAutoValueAutomatic", SPRIMEKEYMODE, this,
@@ -139,7 +139,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
}, //107
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41229", sApplyAutoValue, new Integer(116), new Integer(92), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(68)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", sApplyAutoValue, new Integer(116), new Integer(92), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(68)
});
lblPrimeFieldName = CurUnoDialog.insertLabel("lblPrimeFieldName",
@@ -171,7 +171,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
Boolean.TRUE,
Boolean.FALSE,
new Integer(12),
- "HID:41231",
+ "HID:WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME",
Short.valueOf(UnoDialog.getListBoxLineCount()),
new Integer(162),
new Integer(115),
@@ -187,7 +187,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
}, //107
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41232", sApplyAutoValue, new Integer(248), new Integer(117), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(66)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", sApplyAutoValue, new Integer(248), new Integer(117), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(66)
});
curPrimaryKeySelection = new FieldSelection(CurUnoDialog, IPRIMEKEYSTEP.intValue(), 116, 142, 208, 47, slblAvailableFields, slblSelPrimaryFields, 41234, false);
curPrimaryKeySelection.addFieldSelectionListener(this);
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 6f6ae92fc..23a48772a 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -123,7 +123,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41206", sBusiness, new Integer(98), new Integer(70), new Short((short) 1), IMAINSTEP, new Short(pretabindex++), new Integer(78)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", sBusiness, new Integer(98), new Integer(70), new Short((short) 1), IMAINSTEP, new Short(pretabindex++), new Integer(78)
});
optPrivate = CurTableWizardUnoDialog.insertRadioButton("optPrivate", SELECTCATEGORY, this,
@@ -133,7 +133,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:41207", sPrivate, new Integer(182), new Integer(70), IMAINSTEP, new Short(pretabindex++), new Integer(90)
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", sPrivate, new Integer(182), new Integer(70), IMAINSTEP, new Short(pretabindex++), new Integer(90)
});
CurUnoDialog.insertLabel("lblTableNames",
@@ -155,7 +155,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
},
new Object[]
{
- Boolean.TRUE, new Integer(12), "HID:41208", new Short(UnoDialog.getListBoxLineCount()), new Integer(91), new Integer(92), IMAINSTEP, new Short(pretabindex++), getListboxWidth()
+ Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LBTABLES", new Short(UnoDialog.getListBoxLineCount()), new Integer(91), new Integer(92), IMAINSTEP, new Short(pretabindex++), getListboxWidth()
});
}
catch (Exception e)
diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk
index c0d62baa7..4343af99d 100644
--- a/wizards/com/sun/star/wizards/table/makefile.mk
+++ b/wizards/com/sun/star/wizards/table/makefile.mk
@@ -63,3 +63,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/table.component
+
+$(MISC)/table.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ table.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt table.component
diff --git a/wizards/com/sun/star/wizards/table/table.component b/wizards/com/sun/star/wizards/table/table.component
new file mode 100644
index 000000000..24cacd225
--- /dev/null
+++ b/wizards/com/sun/star/wizards/table/table.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name=
+ "com.sun.star.wizards.table.CallTableWizard$TableWizardImplementation">
+ <service name="com.sun.star.wizards.table.CallTableWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 55ae22803..7272896fd 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -30,7 +30,6 @@ import java.util.Vector;
import com.sun.star.wizards.common.*;
import com.sun.star.wizards.db.*;
import com.sun.star.lang.EventObject;
-//import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.beans.*;
import com.sun.star.sdbc.SQLException;
import com.sun.star.uno.AnyConverter;
@@ -89,7 +88,7 @@ public class AggregateComponent extends ControlScroller
},
new Object[]
{
- new Integer(8), "HID:" + curHelpID, soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth)
+ new Integer(8), HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth)
});
optSummaryQuery = CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(),
@@ -99,7 +98,7 @@ public class AggregateComponent extends ControlScroller
},
new Object[]
{
- new Integer(16), "HID:" + (curHelpID + 1), soptSummaryQuery, Boolean.TRUE, new Integer(_iPosX), new Integer(iCompPosY - 32), IStep, new Short(curtabindex++), new Integer(iCompWidth)
+ new Integer(16), HelpIds.getHelpIdString(curHelpID + 1), soptSummaryQuery, Boolean.TRUE, new Integer(_iPosX), new Integer(iCompPosY - 32), IStep, new Short(curtabindex++), new Integer(iCompWidth)
});
CurUnoDialog.insertLabel("lblAggregate",
new String[]
@@ -132,7 +131,7 @@ public class AggregateComponent extends ControlScroller
},
new Object[]
{
- oFontDescriptor, new Integer(14), "HID:" + (lastHelpIndex + 1), "+", new Integer(_iPosX + iCompWidth - 36), new Integer(iButtonPosY), IStep, new Short((curtabindex++)), new Integer(16)
+ oFontDescriptor, new Integer(14), HelpIds.getHelpIdString(lastHelpIndex + 1), "+", new Integer(_iPosX + iCompWidth - 36), new Integer(iButtonPosY), IStep, new Short((curtabindex++)), new Integer(16)
});
CurUnoDialog.insertButton("btnminus", SOREMOVEROW, new ActionListenerImpl(),
new String[]
@@ -141,7 +140,7 @@ public class AggregateComponent extends ControlScroller
},
new Object[]
{
- oFontDescriptor, new Integer(14), "HID:" + (lastHelpIndex + 2), "-", new Integer(_iPosX + iCompWidth - 16), new Integer(iButtonPosY), IStep, new Short(curtabindex++), new Integer(16)
+ oFontDescriptor, new Integer(14), HelpIds.getHelpIdString(lastHelpIndex + 2), "-", new Integer(_iPosX + iCompWidth - 16), new Integer(iButtonPosY), IStep, new Short(curtabindex++), new Integer(16)
});
CurDBMetaData.Type = getQueryType();
}
@@ -533,7 +532,7 @@ public class AggregateComponent extends ControlScroller
},
new Object[]
{
- Boolean.TRUE, new Integer(12), "HID:" + _curHelpID++, new Integer(iCompPosX + 4), new Integer(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), new Integer(88)
+ Boolean.TRUE, new Integer(12), HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 4), new Integer(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), new Integer(88)
});
xFieldListBox = CurUnoDialog.insertListBox(getFieldsControlName(index), 1, null, new ItemListenerImpl(),
@@ -543,7 +542,7 @@ public class AggregateComponent extends ControlScroller
},
new Object[]
{
- Boolean.TRUE, new Integer(12), "HID:" + _curHelpID++, new Integer(iCompPosX + 98), new Integer(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(86)
+ Boolean.TRUE, new Integer(12), HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 98), new Integer(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(86)
});
lastHelpIndex = _curHelpID - 1;
}
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index e14a06b4e..aacae9848 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -34,16 +34,15 @@ import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XFixedText;
import com.sun.star.awt.XItemEventBroadcaster;
import com.sun.star.awt.XItemListener;
-// import com.sun.star.awt.XView;
import com.sun.star.awt.XWindow;
import com.sun.star.lang.EventObject;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.IRenderer;
import com.sun.star.wizards.common.PropertySetHelper;
-// import com.sun.star.wizards.ui.event.*;
import javax.swing.ListModel;
import javax.swing.event.ListDataEvent;
+import com.sun.star.wizards.common.HelpIds;
/**
*
@@ -165,7 +164,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
btnBack = dialog.insertButton(m_aControlName + "_btnBack", "prevPage", this, pNames1, new Object[]
{
btnSize,
- "HID:" + helpURL++,
+ HelpIds.getHelpIdString(helpURL++),
Integer.valueOf(pos.Width),
Integer.valueOf(pos.Height + (m_aButtonSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1),
step,
@@ -177,7 +176,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
btnNext = dialog.insertButton(m_aControlName + "_btnNext", "nextPage", this, pNames1, new Object[]
{
btnSize,
- "HID:" + helpURL++,
+ HelpIds.getHelpIdString(helpURL++),
Integer.valueOf(pos.Width + (m_aButtonSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1),
Integer.valueOf(pos.Height + (m_aButtonSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1),
step,
@@ -256,7 +255,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
/* Short.valueOf((short) 1), */ /* NO_BORDER, */
/* BACKGROUND_COLOR, */
m_aButtonHeight,
- "HID:" + helpURL++,
+ HelpIds.getHelpIdString(helpURL++),
/* "Test", */
Integer.valueOf(nButtonX),
Integer.valueOf(nButtonY),
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 5bb10f184..16e6fd900 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -152,7 +152,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator
},
new Object[]
{
- Boolean.TRUE, Boolean.FALSE, new Integer(12), "HID:" + (super.FirstHelpIndex - 1), new Short(UnoDialog.getListBoxLineCount()), new Integer(95), new Integer(37), IStep, new Short((short) 4), getListboxWidth()
+ Boolean.TRUE, Boolean.FALSE, new Integer(12), HelpIds.getHelpIdString(super.FirstHelpIndex - 1), new Short(UnoDialog.getListBoxLineCount()), new Integer(95), new Integer(37), IStep, new Short((short) 4), getListboxWidth()
});
// XWindow xTableListBoxWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, xTableListBox);
fillupCommandListBox();
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index 037ad93ff..ae1e2269f 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -32,6 +32,7 @@ import com.sun.star.beans.*;
import com.sun.star.awt.*;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.wizards.common.*;
+import com.sun.star.wizards.common.HelpIds;
import java.util.*;
@@ -133,7 +134,7 @@ public abstract class ControlScroller
},
new Object[]
{
- new Short((short) 0), new Boolean(true), new Integer(ScrollHeight), "HID:" + curHelpIndex, new Integer(ScrollBarOrientation.VERTICAL), new Integer(iCompPosX + iCompWidth - iScrollBarWidth - 1), new Integer(iCompPosY + 1), IStep, new Integer(iScrollBarWidth)
+ new Short((short) 0), new Boolean(true), new Integer(ScrollHeight), HelpIds.getHelpIdString(curHelpIndex), new Integer(ScrollBarOrientation.VERTICAL), new Integer(iCompPosX + iCompWidth - iScrollBarWidth - 1), new Integer(iCompPosY + 1), IStep, new Integer(iScrollBarWidth)
});
scrollfields = new Vector();
int ypos = iStartPosY + SORELFIRSTPOSY;
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 021526622..75c97c685 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -28,7 +28,7 @@ package com.sun.star.wizards.ui;
import com.sun.star.awt.FontDescriptor;
import com.sun.star.awt.XListBox;
-// import com.sun.star.wizards.common.*;
+import com.sun.star.wizards.common.*;
import com.sun.star.wizards.common.JavaTools;
import java.util.*;
@@ -241,7 +241,7 @@ public class FieldSelection
},
new Object[]
{
- ListBoxHeight, "HID:" + Integer.toString(_FirstHelpIndex), Boolean.TRUE, new Integer(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth
+ ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex), Boolean.TRUE, new Integer(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth
});
Object btnmoveselected = CurUnoDialog.insertButton("cmdMoveSelected" + sIncSuffix, SOCMDMOVESEL, new ActionListenerImpl(),
@@ -251,7 +251,7 @@ public class FieldSelection
},
new Object[]
{
- Boolean.FALSE, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
+ Boolean.FALSE, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
});
if (bshowFourButtons == true)
@@ -263,7 +263,7 @@ public class FieldSelection
},
new Object[]
{
- new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
+ new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
});
}
Object btnremoveselected = CurUnoDialog.insertButton("cmdRemoveSelected" + sIncSuffix, SOCMDREMOVESEL, new ActionListenerImpl(),
@@ -273,7 +273,7 @@ public class FieldSelection
},
new Object[]
{
- Boolean.FALSE, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
+ Boolean.FALSE, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
});
if (bshowFourButtons == true)
@@ -285,7 +285,7 @@ public class FieldSelection
},
new Object[]
{
- new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
+ new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth
});
}
@@ -311,7 +311,7 @@ public class FieldSelection
},
new Object[]
{
- ListBoxHeight, "HID:" + Integer.toString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, new Short(curtabindex++), ListBoxWidth
+ ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, new Short(curtabindex++), ListBoxWidth
});
Object btnmoveup = CurUnoDialog.insertButton("cmdMoveUp" + sIncSuffix, SOCMDMOVEUP, new ActionListenerImpl(),
@@ -321,7 +321,7 @@ public class FieldSelection
},
new Object[]
{
- Boolean.FALSE, oFontDesc, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, new Short(curtabindex++), CmdButtonWidth
+ Boolean.FALSE, oFontDesc, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, new Short(curtabindex++), CmdButtonWidth
});
Object btnmovedown = CurUnoDialog.insertButton("cmdMoveDown" + sIncSuffix, SOCMDMOVEDOWN, new ActionListenerImpl(),
@@ -331,7 +331,7 @@ public class FieldSelection
},
new Object[]
{
- Boolean.FALSE, oFontDesc, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, new Short(curtabindex++), CmdButtonWidth
+ Boolean.FALSE, oFontDesc, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, new Short(curtabindex++), CmdButtonWidth
});
CurUnoDialog.getPeerConfiguration().setAccessibleName(btnmoveselected, AccessTextMoveSelected);
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 25c0f8dc2..1416a90a3 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -27,7 +27,6 @@
package com.sun.star.wizards.ui;
// import java.util.Vector;
-import com.sun.star.awt.ItemEvent;
import com.sun.star.awt.TextEvent;
import com.sun.star.awt.VclWindowPeerAttribute;
import com.sun.star.awt.XControl;
@@ -40,20 +39,22 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.EventObject;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lib.uno.helper.PropertySet;
+import com.sun.star.sdb.SQLFilterOperator;
import com.sun.star.sdbc.DataType;
import com.sun.star.uno.Any;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Exception;
import com.sun.star.uno.Type;
+import com.sun.star.uno.TypeClass;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.wizards.common.NumberFormatter;
import com.sun.star.wizards.common.Helper;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.wizards.common.JavaTools;
-import com.sun.star.wizards.common.Properties;
import com.sun.star.wizards.db.FieldColumn;
import com.sun.star.wizards.db.QueryMetaData;
+import com.sun.star.wizards.db.SQLQueryComposer;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -61,19 +62,9 @@ public class FilterComponent
{
private Integer IStep;
- // private int iStartPosX;
- // private int iStartPosY;
- // int Count;
private int RowCount;
- // private int FilterCount;
private static String[] sLogicOperators;
- private static String[] sBooleanValues;
- // private /* public */ String[] FieldNames;
- private XRadioButton optMatchAll;
private XRadioButton optMatchAny;
- // private String soptMatchAll;
- // private String soptMatchAny;
- // private String[] sHeadLines;
private String slblFieldNames;
private String slblOperators;
private String slblValue;
@@ -81,7 +72,6 @@ public class FilterComponent
private int BaseID = 2300;
private String sIncSuffix;
private ControlRow[] oControlRows;
- // private Vector FilterNames;
private String sDuplicateCondition;
final int SOOPTORMODE = 100;
final int SOOPTANDMODE = 101;
@@ -127,20 +117,16 @@ public class FilterComponent
final int SO_OPTQUERYMODE = 5;
int SOI_MATCHALL = 0;
int SOI_MATCHANY = 1;
- // int ifilterstate = SOI_MATCHALL;
int curHelpID;
class ItemListenerImpl implements com.sun.star.awt.XItemListener
{
-
public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
{
int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList);
String sControlName = "";
switch (iKey)
{
- // case SOOPTQUERYMODE:
- // getfilterstate();
case SO_FIRSTFIELDNAME:
case SO_SECONDFIELDNAME:
case SO_THIRDFIELDNAME:
@@ -152,24 +138,11 @@ public class FilterComponent
FieldColumn CurFieldColumn = new FieldColumn(oQueryMetaData, CurDisplayFieldName);
String sControlNameTextValue = "txtValue" + sControlNameSuffix;
-// String sControlNameBooleanList = "lstBoolean" + sControlNameSuffix;
-// if (aFieldColumn.FieldType == DataType.BOOLEAN)
-// {
-// // scheint aufgrund eines Fehlers in Toolkit nicht zu funktionieren
-// CurUnoDialog.setControlVisible(sControlNameTextValue, false);
-// CurUnoDialog.setControlVisible(sControlNameBooleanList, true);
-// }
-// else
-// {
-// CurUnoDialog.setControlVisible(sControlNameTextValue, true);
-// CurUnoDialog.setControlVisible(sControlNameBooleanList, false);
-
XControl xValueControl = CurUnoDialog.xDlgContainer.getControl(sControlNameTextValue);
XInterface xValueModel = (XInterface) UnoDialog.getModel(xValueControl);
Helper.setUnoPropertyValue(xValueModel, "TreatAsNumber", Boolean.valueOf(CurFieldColumn.isNumberFormat()));
final NumberFormatter aNumberFormatter = oQueryMetaData.getNumberFormatter();
aNumberFormatter.setNumberFormat(xValueModel, CurFieldColumn.getDBFormatKey(), aNumberFormatter);
-// }
break;
case SO_FIRSTCONDITION:
@@ -180,7 +153,6 @@ public class FilterComponent
break;
case SOOPTORMODE:
case SOOPTANDMODE:
- // getfilterstate();
return;
case SO_FIRSTBOOLFIELDNAME:
@@ -210,24 +182,6 @@ public class FilterComponent
togglefollowingControlRow(sName);
}
- public void disposing(EventObject EventObject)
- {
- }
- }
-
- public void fieldconditionchanged(ItemEvent EventObject)
- {
- String sName = getControlName(EventObject.Source);
- togglefollowingControlRow(sName);
- }
-
- public void disposing(com.sun.star.lang.EventObject eventObject)
- {
- }
-
- class ActionListenerImpl implements com.sun.star.awt.XActionListener
- {
-
public void disposing(EventObject eventObject)
{
}
@@ -284,6 +238,7 @@ public class FilterComponent
int nFilterCount = getFilterCount();
if (nFilterCount > 0)
{
+ final SQLQueryComposer composer = oQueryMetaData.getSQLQueryComposer();
try
{
final String serviceName = "com.sun.star.beans.PropertyBag";
@@ -291,31 +246,32 @@ public class FilterComponent
column.addProperty("Type", PropertyAttribute.BOUND, DataType.VARCHAR);
column.addProperty("Name", PropertyAttribute.BOUND, "");
+ column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), null );
final XPropertySet columnSet = UnoRuntime.queryInterface(XPropertySet.class, column);
- if ( oQueryMetaData.getSQLQueryComposer().getQuery().length() == 0)
+ if ( composer.getQuery().length() == 0)
{
- final String fromClause = oQueryMetaData.getSQLQueryComposer().getFromClause();
- StringBuffer sql = new StringBuffer();
- sql.append(oQueryMetaData.getSQLQueryComposer().getSelectClause(true));
+ final String fromClause = composer.getFromClause();
+ StringBuilder sql = new StringBuilder();
+ sql.append(composer.getSelectClause(true));
sql.append(' ');
sql.append(fromClause);
- oQueryMetaData.getSQLQueryComposer().getQueryComposer().setElementaryQuery(sql.toString());
+ composer.getQueryComposer().setElementaryQuery(sql.toString());
}
- int a = 0;
+ composer.getQueryComposer().setStructuredFilter( new PropertyValue[][] {} );
for (int i = 0; i < RowCount; i++)
{
- ControlRow CurControlRow = oControlRows[i];
- if (CurControlRow.isEnabled())
+ ControlRow currentControlRow = oControlRows[i];
+ if (currentControlRow.isEnabled())
{
- if (CurControlRow.isConditionComplete())
+ if (currentControlRow.isConditionComplete())
{
- String sFieldName = CurControlRow.getSelectedFieldName();
- int nOperator = (int) CurControlRow.getSelectedOperator();
+ String sFieldName = currentControlRow.getSelectedFieldName();
+ int nOperator = (int) currentControlRow.getSelectedOperator();
FieldColumn aFieldColumn = oQueryMetaData.getFieldColumnByDisplayName(sFieldName);
columnSet.setPropertyValue("Name", aFieldColumn.getFieldName());
columnSet.setPropertyValue("Type", aFieldColumn.getXColumnPropertySet().getPropertyValue("Type"));
- Object value = CurControlRow.getValue();
+ Object value = currentControlRow.getValue();
switch(aFieldColumn.getFieldType())
{
case DataType.TIMESTAMP:
@@ -323,13 +279,24 @@ public class FilterComponent
value = ((Double)value) - oQueryMetaData.getNullDateCorrection();
break;
}
- column.addProperty("Value", PropertyAttribute.MAYBEVOID, value);
+ column.removeProperty( "Value" );
+ final short operator = currentControlRow.getSelectedOperator();
+ if ( ( operator == SQLFilterOperator.SQLNULL )
+ || ( operator == SQLFilterOperator.NOT_SQLNULL )
+ || AnyConverter.isVoid( value )
+ )
+ {
+ column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), new String() );
+ value = new Any( new Type( TypeClass.VOID ), null );
+ }
+ else
+ column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), value );
columnSet.setPropertyValue("Value", value);
- oQueryMetaData.getSQLQueryComposer().getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator);
+ composer.getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator);
}
}
}
- filterconditions = oQueryMetaData.getSQLQueryComposer().getQueryComposer().getStructuredFilter();
+ filterconditions = composer.getNormalizedStructuredFilter();
int[] iduplicate = JavaTools.getDuplicateFieldIndex(filterconditions);
if (iduplicate[0] != -1)
{
@@ -337,9 +304,7 @@ public class FilterComponent
String smsgDuplicateCondition = getDisplayCondition(sDuplicateCondition, aduplicatecondition, null);
CurUnoDialog.showMessageBox("WarningBox", VclWindowPeerAttribute.OK, smsgDuplicateCondition);
CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", Integer.valueOf(1), Integer.valueOf(2)));
- return new PropertyValue[][]
- {
- };
+ return new PropertyValue[][]{};
}
}
catch (Exception ex)
@@ -402,22 +367,6 @@ public class FilterComponent
return ifilterstate;
}
- private void addfiltercondition(int _index, String _curFieldName, Object _curValue, int _curOperator)
- {
- String ValString = String.valueOf(_curValue);
- PropertyValue oPropertyValue = Properties.createProperty(_curFieldName, ValString, _curOperator);
- getfilterstate();
- if (getfilterstate() == this.SOI_MATCHALL)
- {
- if (_index == 0)
- {
- filterconditions[0] = new PropertyValue[getFilterCount()];
- }
- filterconditions[0][_index] = new PropertyValue();
- filterconditions[0][_index] = oPropertyValue;
- }
- }
-
private int getFilterCount()
{
int a = 0;
@@ -429,8 +378,6 @@ public class FilterComponent
}
}
return a;
- // FilterCount = a;
- // return FilterCount;
}
/** Creates a new instance of FilterComponent
@@ -456,8 +403,6 @@ public class FilterComponent
this.oQueryMetaData = _oQueryMetaData;
boolean bEnabled;
sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll");
- // iStartPosX = iPosX;
- // iStartPosY = iPosY;
String soptMatchAll = CurUnoDialog.m_oResource.getResText(BaseID + 9);
String soptMatchAny = CurUnoDialog.m_oResource.getResText(BaseID + 10);
@@ -465,14 +410,13 @@ public class FilterComponent
slblOperators = CurUnoDialog.m_oResource.getResText(BaseID + 24);
slblValue = CurUnoDialog.m_oResource.getResText(BaseID + 25);
sLogicOperators = CurUnoDialog.m_oResource.getResArray(BaseID + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null
- sBooleanValues = CurUnoDialog.m_oResource.getResArray(BaseID + 36, 2); // true, false
sDuplicateCondition = CurUnoDialog.m_oResource.getResText(BaseID + 89);
// create Radiobuttons
// * match all
// * match one
- optMatchAll = CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(),
+ CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(),
new String[]
{
"Height",
@@ -488,7 +432,7 @@ public class FilterComponent
new Object[]
{
Integer.valueOf(9),
- "HID:" + curHelpID++,
+ HelpIds.getHelpIdString(curHelpID++),
soptMatchAll,
Integer.valueOf(iPosX),
Integer.valueOf(iPosY),
@@ -512,7 +456,7 @@ public class FilterComponent
new Object[]
{
Integer.valueOf(9),
- "HID:" + curHelpID++,
+ HelpIds.getHelpIdString(curHelpID++),
soptMatchAny,
Integer.valueOf(iPosX),
Integer.valueOf(iPosY + 12),
@@ -533,13 +477,6 @@ public class FilterComponent
public void initialize(PropertyValue[][] _filterconditions, String[] _fieldnames)
{
- // String aFieldNamesWithAdditionalEmpty[] = new String[_fieldnames.length + 1];
- // for (int i = 0; i < _fieldnames.length; i++)
- // {
- // aFieldNamesWithAdditionalEmpty[i] = _fieldnames[i];
- // }
- // aFieldNamesWithAdditionalEmpty[_fieldnames.length] = "";
-
int i;
for (i = 0; i < RowCount; i++)
{
@@ -592,9 +529,8 @@ public class FilterComponent
//
//
// -------------------------------------------------------------------------
- class ControlRow
+ final class ControlRow
{
-
private final static int SOLSTFIELDNAME = 3;
private final static int SOLSTOPERATOR = 4;
private final static int SOTXTVALUE = 5;
@@ -713,7 +649,7 @@ public class FilterComponent
Boolean.valueOf(isEnabled()),
Boolean.TRUE,
Integer.valueOf(13),
- "HID:" + _firstRowHelpID++,
+ HelpIds.getHelpIdString(_firstRowHelpID++),
Short.valueOf(UnoDialog.getListBoxLineCount() /* 7 */),
Integer.valueOf(nPosX1),
Integer.valueOf(iCompPosY + 23),
@@ -743,7 +679,7 @@ public class FilterComponent
Boolean.valueOf(isEnabled()),
Boolean.TRUE,
Integer.valueOf(13),
- "HID:" + _firstRowHelpID++,
+ HelpIds.getHelpIdString(_firstRowHelpID++),
Short.valueOf((short) sLogicOperators.length /* 7 */),
Integer.valueOf(nPosX2),
Integer.valueOf(iCompPosY + 23),
@@ -768,37 +704,13 @@ public class FilterComponent
{
Boolean.valueOf(isEnabled()),
Integer.valueOf(13),
- "HID:" + _firstRowHelpID++,
+ HelpIds.getHelpIdString(_firstRowHelpID++),
Integer.valueOf(nPosX3),
Integer.valueOf(iCompPosY + 23),
IStep,
Short.valueOf(curtabindex++),
Integer.valueOf(nValueWidth)
});
-
-// ControlElements[6] = CurUnoDialog.insertListBox((new StringBuilder()).append("lstBoolean").append(sCompSuffix).toString(), SO_BOOLEANLIST[Index], null, new ItemListenerImpl(), new String[] {
-// "Enabled",
-// "Dropdown",
-// "Height",
-// "HelpURL",
-// "LineCount",
-// "PositionX", "PositionY",
-// "Step",
-// "StringItemList",
-// "TabIndex",
-// "Width"
-// }, new Object[] {
-// new Boolean(bEnabled),
-// Boolean.TRUE,
-// new Integer(13),
-// "HID:" + _firstRowHelpID++,
-// new Short((short) 2),
-// new Integer(nPosX3 + 44), new Integer(iCompPosY + 23),
-// IStep,
-// FilterComponent.sBooleanValues,
-// new Short(curtabindex++),
-// new Integer(nValueWidth)
-// });
}
catch (Exception exception)
{
@@ -843,13 +755,6 @@ public class FilterComponent
String sValue = (String.valueOf(oValue));
return (!sValue.equals(""));
}
-// String sBoolValue="";
-// short aSelectedBoolValue[] = (short[])Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[6]), "SelectedItems");
-// if (aSelectedBoolValue.length > 0)
-// {
-// sBoolValue = String.valueOf(aSelectedBoolValue[0] == 1);
-// return !sBoolValue.equals("");
-// }
}
}
return false;
@@ -861,16 +766,10 @@ public class FilterComponent
}
}
- private void fieldnamechanged(ItemEvent EventObject)
- {
- int i = 0;
- }
-
protected void setCondition(PropertyValue _filtercondition)
{
try
{
- int ikey;
XListBox xFieldsListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, ControlElements[SOLSTFIELDNAME]);
xFieldsListBox.selectItem(_filtercondition.Name, true);
XListBox xOperatorListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, ControlElements[SOLSTOPERATOR]);
@@ -940,8 +839,8 @@ public class FilterComponent
private void settovoid()
{
- CurUnoDialog.deselectListBox(ControlElements[SOLSTFIELDNAME]);
- CurUnoDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
+ WizardDialog.deselectListBox(ControlElements[SOLSTFIELDNAME]);
+ WizardDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", com.sun.star.uno.Any.VOID);
}
@@ -976,7 +875,7 @@ public class FilterComponent
}
else if (!isConditionComplete())
{
- CurUnoDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
+ WizardDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
}
}
@@ -1047,43 +946,9 @@ public class FilterComponent
protected String getDateTimeString(boolean bgetDate)
{
- double dblValue = ((Double) getValue()).doubleValue();
- NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter();
- return oNumberFormatter.convertNumberToString(iDateTimeFormat, dblValue);
+ double dblValue = ((Double) getValue()).doubleValue();
+ NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter();
+ return oNumberFormatter.convertNumberToString(iDateTimeFormat, dblValue);
}
}
}
-// com.sun.star.sdb.SQLFilterOperator.EQUAL
-// com.sun.star.sdb.SQLFilterOperator.NOT_EQUAL
-// com.sun.star.sdb.SQLFilterOperator.LESS
-// com.sun.star.sdb.SQLFilterOperator.GREATER
-// com.sun.star.sdb.SQLFilterOperator.LESS_EQUAL
-// com.sun.star.sdb.SQLFilterOperator.GREATER_EQUAL
-// com.sun.star.sdb.SQLFilterOperator.LIKE
-// com.sun.star.sdb.SQLFilterOperator.NOT_LIKE
-// com.sun.star.sdb.SQLFilterOperator.SQLNULL
-// com.sun.star.sdb.SQLFilterOperator.NOT_SQLNULL
-
-/* constants SQLFilterOperator
-{
-/// equal to
-const long EQUAL = 1;
-/// not equal to
-const long NOT_EQUAL = 2;
-/// less than
-const long LESS = 3;
-/// greater than
-const long GREATER = 4;
-/// less or eqal than
-const long LESS_EQUAL = 5;
-/// greater or eqal than
-const long GREATER_EQUAL = 6;
-/// like
-const long LIKE = 7;
-/// not like
-const long NOT_LIKE = 8;
-/// is null
-const long SQLNULL = 9;
-/// is not null
-const long NOT_SQLNULL = 10;
-}; */
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index 0fb4a4e93..2e1db6a7c 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -43,6 +43,7 @@ import com.sun.star.awt.XWindow;
import com.sun.star.lang.EventObject;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.wizards.common.Helper;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.wizards.common.IRenderer;
import com.sun.star.wizards.ui.event.*;
@@ -255,7 +256,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
btnBack = dialog.insertButton(name + "_btnBack", "prevPage", this, pNames1, new Object[]
{
btnSize,
- "HID:" + helpURL++,
+ HelpIds.getHelpIdString(helpURL++),
new Integer(pos.Width),
new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1),
step,
@@ -267,7 +268,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
btnNext = dialog.insertButton(name + "_btnNext", "nextPage", this, pNames1, new Object[]
{
btnSize,
- "HID:" + helpURL++,
+ HelpIds.getHelpIdString(helpURL++),
new Integer(pos.Width + (imageSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1),
new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1),
step,
@@ -354,7 +355,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
NO_BORDER,
BACKGROUND_COLOR,
m_imageHeight,
- "HID:" + helpURL++,
+ HelpIds.getHelpIdString(helpURL++),
new Integer(getImagePosX(_col)),
new Integer(getImagePosY(_row)),
scaleImages,
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index 3e4b45c2c..4334974e9 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -105,7 +105,7 @@ public class SortingComponent
new Boolean(bDoEnable), new Integer(8), sSortHeader[i], new Integer(0), ICompPosX, new Integer(iCurPosY), IStep, new Short(curtabindex++), ICompWidth
});
- HIDString = "HID:" + Integer.toString(FirstHelpIndex);
+ HIDString = HelpIds.getHelpIdString(FirstHelpIndex);
xSortListBox[i] = CurUnoDialog.insertListBox("lstSort" + new Integer(i + 1).toString(), SOSORTLST[i], null, new ItemListenerImpl(), new String[]
{
"Dropdown", "Enabled", "Height", "HelpURL", "LineCount", "Name", "PositionX", "PositionY", "Step", "TabIndex", "Width"
@@ -114,7 +114,7 @@ public class SortingComponent
new Boolean(true), new Boolean(bDoEnable), new Integer(12), HIDString, new Short(UnoDialog.getListBoxLineCount()), "lstSort" + new Integer(i + 1), IListBoxPosX, new Integer(iCurPosY + 14), IStep, new Short(curtabindex++), IListBoxWidth
}); //new Short((short) (17+i*4))
- HIDString = "HID:" + Integer.toString(FirstHelpIndex + 1);
+ HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 1);
XRadioButton xRadioButtonAsc = CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[]
{
"Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Tag", "Width"
@@ -123,7 +123,7 @@ public class SortingComponent
new Boolean(bDoEnable), new Integer(10), HIDString, sSortAscend[i], IOptButtonPosX, new Integer(iCurPosY + 10), new Short((short) 1), IStep, new Short(curtabindex++), new String("ASC"), IOptButtonWidth
}); //, new Short((short) (18+i*4))
- HIDString = "HID:" + Integer.toString(FirstHelpIndex + 2);
+ HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 2);
XRadioButton xRadioButtonDesc = CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[]
{
"Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Tag", "Width"
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index f42dac35a..bc6d1d4ac 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
@@ -121,7 +121,7 @@ public class TitlesComponent extends ControlScroller
},
new Object[]
{
- new Integer(12), "HID:" + curHelpIndex++, new Integer(iLabelPosX + 30), new Integer(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(iCompWidth - 90 - 20)
+ new Integer(12), HelpIds.getHelpIdString(curHelpIndex++), new Integer(iLabelPosX + 30), new Integer(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(iCompWidth - 90 - 20)
});
}
}
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 5a8434148..b7f7d98ba 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -32,7 +32,6 @@ import com.sun.star.wizards.ui.event.CommonListener;
import com.sun.star.wizards.ui.event.EventNames;
import com.sun.star.wizards.ui.event.MethodInvocation;
import com.sun.star.uno.UnoRuntime;
-// import com.sun.star.awt.XItemEventBroadcaster;
import com.sun.star.awt.*;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.XInterface;
@@ -47,6 +46,7 @@ import com.sun.star.frame.XTerminateListener;
import com.sun.star.frame.TerminationVetoException;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.beans.*;
+import com.sun.star.wizards.common.HelpIds;
public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeListener, XTerminateListener, XCompletion
{
@@ -488,7 +488,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
"Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "PushButtonType", "Step", "TabIndex", "Width"
};
- Helper.setUnoPropertyValue(super.xDialogModel, "HelpURL", "HID:" + hid);
+ Helper.setUnoPropertyValue(super.xDialogModel, "HelpURL", HelpIds.getHelpIdString(hid));
insertButton("btnWizardHelp", HELP_ACTION_PERFORMED, new String[]
{
"Enabled", "Height", "Label", "PositionX", "PositionY", "PushButtonType", "Step", "TabIndex", "Width"
@@ -500,25 +500,25 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
insertButton("btnWizardBack", BACK_ACTION_PERFORMED, propNames,
new Object[]
{
- new Boolean(false), IButtonHeight, "HID:" + (hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
+ new Boolean(false), IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
});
insertButton("btnWizardNext", NEXT_ACTION_PERFORMED, propNames,
new Object[]
{
- new Boolean(true), IButtonHeight, "HID:" + (hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), new Integer(iNextPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
+ new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), new Integer(iNextPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
});
insertButton("btnWizardFinish", FINISH_ACTION_PERFORMED, propNames,
new Object[]
{
- new Boolean(true), IButtonHeight, "HID:" + (hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), new Integer(iFinishPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
+ new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), new Integer(iFinishPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
});
insertButton("btnWizardCancel", CANCEL_ACTION_PERFORMED, propNames,
new Object[]
{
- new Boolean(true), IButtonHeight, "HID:" + (hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), new Integer(iCancelPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
+ new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), new Integer(iCancelPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth
});
setControlProperty("btnWizardNext", "DefaultButton", Boolean.TRUE);
diff --git a/wizards/com/sun/star/wizards/web/CallWizard.java b/wizards/com/sun/star/wizards/web/CallWizard.java
index 4b9d7a368..1d18149e9 100644
--- a/wizards/com/sun/star/wizards/web/CallWizard.java
+++ b/wizards/com/sun/star/wizards/web/CallWizard.java
@@ -42,8 +42,7 @@ import com.sun.star.wizards.common.Resource;
/**
* This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the
- * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>).
+ * creating the service (<CODE>__getServiceFactory</CODE>).
*
* @author rpiterman
* @version $Revision: 1.10.52.1 $
@@ -79,22 +78,6 @@ public class CallWizard
}
/**
- * Writes the service information into the given registry key. This method is called
- * by the <code>JavaLoader</code>.
- *
- * @param xregistrykey Makes structural information (except regarding tree
- * structures) of a single registry key accessible.
- *
- * @return returns true if the operation succeeded
- *
- * @see com.sun.star.comp.loader.JavaLoader#
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey)
- {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
- }
-
- /**
* This class implements the component. At least the interfaces XServiceInfo,
* XTypeProvider, and XInitialization should be provided by the service.
*/
diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java
index fc11e1779..4d7d6571e 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.java
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.java
@@ -53,6 +53,7 @@ import com.sun.star.wizards.ui.event.DataAware;
import com.sun.star.wizards.ui.event.UnoDataAware;
import com.sun.star.wizards.web.data.CGPublish;
import com.sun.star.wizards.web.data.CGSettings;
+import com.sun.star.wizards.common.HelpIds;
/**
* This is the FTP Dialog. <br/>
@@ -200,7 +201,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
},
new Object[]
{
- Boolean.TRUE, new Integer(160), "HID:" + HID_FTP, Boolean.TRUE, "FTPDialog", new Integer(167), new Integer(82), resources.resFTPDialog_title, new Integer(222)
+ Boolean.TRUE, new Integer(160), HelpIds.getHelpIdString(HID_FTP), Boolean.TRUE, "FTPDialog", new Integer(167), new Integer(82), resources.resFTPDialog_title, new Integer(222)
});
//add controls to dialog
@@ -248,7 +249,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
},
new Object[]
{
- INTEGER_12, "HID:" + HID_FTP_SERVER, "txtIP", new Integer(110), new Integer(18), new Short((short) 2), new Integer(106)
+ INTEGER_12, HelpIds.getHelpIdString(HID_FTP_SERVER), "txtIP", new Integer(110), new Integer(18), new Short((short) 2), new Integer(106)
});
lblUsername = insertLabel("lblUsername",
PROPNAMES_LABEL,
@@ -263,7 +264,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
},
new Object[]
{
- INTEGER_12, "HID:" + HID_FTP_USERNAME, "txtUsername", new Integer(110), new Integer(34), new Short((short) 4), new Integer(106)
+ INTEGER_12, HelpIds.getHelpIdString(HID_FTP_USERNAME), "txtUsername", new Integer(110), new Integer(34), new Short((short) 4), new Integer(106)
});
lblPassword = insertLabel("lblPassword",
PROPNAMES_LABEL,
@@ -278,7 +279,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
},
new Object[]
{
- new Short((short) 42), INTEGER_12, "HID:" + HID_FTP_PASS, "txtPassword", new Integer(110), new Integer(50), new Short((short) 6), new Integer(106)
+ new Short((short) 42), INTEGER_12, HelpIds.getHelpIdString(HID_FTP_PASS), "txtPassword", new Integer(110), new Integer(50), new Short((short) 6), new Integer(106)
});
ln2 = insertFixedLine("ln2",
PROPNAMES_LABEL,
@@ -290,7 +291,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID_FTP_TEST, resources.resbtnConnect_value, "btnConnect", INTEGER_12, new Integer(80), new Short((short) 8), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID_FTP_TEST), resources.resbtnConnect_value, "btnConnect", INTEGER_12, new Integer(80), new Short((short) 8), INTEGER_50
});
imgStatus = insertImage("imgStatus",
@@ -324,27 +325,27 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
},
new Object[]
{
- new Boolean(false), INTEGER_12, "HID:" + HID_FTP_TXT_PATH, "txtDir", INTEGER_12, new Integer(113), new Short((short) 11), resources.restxtDir_value, new Integer(184)
+ new Boolean(false), INTEGER_12, HelpIds.getHelpIdString(HID_FTP_TXT_PATH), "txtDir", INTEGER_12, new Integer(113), new Short((short) 11), resources.restxtDir_value, new Integer(184)
});
btnDir = insertButton("btnDir", "chooseDirectory",
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID_FTP_BTN_PATH, resources.resbtnDir_value, "btnDir", new Integer(199), new Integer(112), new Short((short) 12), INTEGER_16
+ INTEGER_14, HelpIds.getHelpIdString(HID_FTP_BTN_PATH), resources.resbtnDir_value, "btnDir", new Integer(199), new Integer(112), new Short((short) 12), INTEGER_16
});
btnOK = insertButton("btnOK", null,
PROPNAMES_BUTTON2,
new Object[]
{
- INTEGER_14, "HID:" + HID_FTP_OK, resources.resbtnOK_value, "btnOK", new Integer(165), new Integer(142), new Short((short) PushButtonType.OK_value), new Short((short) 13), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID_FTP_OK), resources.resbtnOK_value, "btnOK", new Integer(165), new Integer(142), new Short((short) PushButtonType.OK_value), new Short((short) 13), INTEGER_50
});
btnCancel = insertButton("btnCancel",
null, PROPNAMES_BUTTON2,
new Object[]
{
- INTEGER_14, "HID:" + HID_FTP_CANCEL, resources.resbtnCancel_value, "btnCancel", new Integer(113), new Integer(142), new Short((short) PushButtonType.CANCEL_value), new Short((short) 14), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID_FTP_CANCEL), resources.resbtnCancel_value, "btnCancel", new Integer(113), new Integer(142), new Short((short) PushButtonType.CANCEL_value), new Short((short) 14), INTEGER_50
});
btnHelp = insertButton("btnHelp", null,
diff --git a/wizards/com/sun/star/wizards/web/ImageListDialog.java b/wizards/com/sun/star/wizards/web/ImageListDialog.java
index a31f8ed73..89fb46e4b 100644
--- a/wizards/com/sun/star/wizards/web/ImageListDialog.java
+++ b/wizards/com/sun/star/wizards/web/ImageListDialog.java
@@ -32,6 +32,7 @@ import com.sun.star.awt.XButton;
import com.sun.star.awt.XFixedText;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.wizards.common.Helper;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.wizards.common.JavaTools;
import com.sun.star.wizards.common.IRenderer;
import com.sun.star.wizards.ui.ImageList;
@@ -135,7 +136,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
},
new Object[]
{
- Boolean.TRUE, new Integer(dialogHeight), "HID:" + hid, Boolean.TRUE, "imgDialog", new Integer(59), new Integer(24), INTEGERS[1], resources[RES_TITLE], new Integer(dialogWidth)
+ Boolean.TRUE, new Integer(dialogHeight), HelpIds.getHelpIdString(hid), Boolean.TRUE, "imgDialog", new Integer(59), new Integer(24), INTEGERS[1], resources[RES_TITLE], new Integer(dialogWidth)
});
//Set member- FontDescriptors...
fontDescriptor1.Weight = 150;
@@ -151,13 +152,13 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
PROPNAMES,
new Object[]
{
- Boolean.TRUE, INTEGER_14, "HID:" + (hid + 3), resources[RES_OK], "btnOK", iButtonsX, new Integer(22), new Short((short) com.sun.star.awt.PushButtonType.OK_value), new Short((short) 7), INTEGER_50
+ Boolean.TRUE, INTEGER_14, HelpIds.getHelpIdString(hid + 3), resources[RES_OK], "btnOK", iButtonsX, new Integer(22), new Short((short) com.sun.star.awt.PushButtonType.OK_value), new Short((short) 7), INTEGER_50
});
btnCancel = insertButton("btnCancel", null,
PROPNAMES,
new Object[]
{
- Boolean.FALSE, INTEGER_14, "HID:" + (hid + 4), resources[RES_CANCEL], "btnCancel", iButtonsX, new Integer(41), new Short((short) com.sun.star.awt.PushButtonType.CANCEL_value), new Short((short) 8), INTEGER_50
+ Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 4), resources[RES_CANCEL], "btnCancel", iButtonsX, new Integer(41), new Short((short) com.sun.star.awt.PushButtonType.CANCEL_value), new Short((short) 8), INTEGER_50
});
btnHelp = insertButton("btnHelp", null,
PROPNAMES,
@@ -175,7 +176,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
PROPNAMES,
new Object[]
{
- Boolean.FALSE, INTEGER_14, "HID:" + (hid + 1), resources[RES_OTHER], "btnOther", iButtonsX, new Integer(otherY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 5), INTEGER_50
+ Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 1), resources[RES_OTHER], "btnOther", iButtonsX, new Integer(otherY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 5), INTEGER_50
});
}
@@ -188,7 +189,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
PROPNAMES,
new Object[]
{
- Boolean.FALSE, INTEGER_14, "HID:" + (hid + 2), resources[RES_DESELECT], "btnNoImage", iButtonsX, new Integer(deselectY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 4), INTEGER_50
+ Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 2), resources[RES_DESELECT], "btnNoImage", iButtonsX, new Integer(deselectY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 4), INTEGER_50
});
}
diff --git a/wizards/com/sun/star/wizards/web/WWD_General.java b/wizards/com/sun/star/wizards/web/WWD_General.java
index 4617a10ba..c9b060772 100644
--- a/wizards/com/sun/star/wizards/web/WWD_General.java
+++ b/wizards/com/sun/star/wizards/web/WWD_General.java
@@ -31,6 +31,7 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.util.XStringSubstitution;
import com.sun.star.wizards.common.FileAccess;
import com.sun.star.wizards.common.Helper;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.wizards.common.JavaTools;
import com.sun.star.wizards.common.SystemDialog;
import com.sun.star.wizards.ui.event.ListModelBinder;
@@ -63,7 +64,7 @@ public abstract class WWD_General extends WebWizardDialog
StatusDialog statusDialog = new StatusDialog(xMSF, StatusDialog.STANDARD_WIDTH, resources.resLoadingSession, false, new String[]
{
resources.prodName, "", "", "", "", ""
- }, "HID:" + HID0_STATUS_DIALOG);
+ }, HelpIds.getHelpIdString(HID0_STATUS_DIALOG));
try
{
statusDialog.createWindowPeer(xControl.getPeer());
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.java b/wizards/com/sun/star/wizards/web/WebWizardDialog.java
index a65132714..e32778cfa 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialog.java
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.java
@@ -39,6 +39,7 @@ import com.sun.star.awt.XRadioButton;
import com.sun.star.awt.XTextComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.wizards.common.Helper;
+import com.sun.star.wizards.common.HelpIds;
import com.sun.star.wizards.ui.ImageList;
import com.sun.star.wizards.ui.UIConsts;
import com.sun.star.wizards.ui.WizardDialog;
@@ -221,7 +222,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.TRUE, new Integer(210), "HID:" + HID0_WEBWIZARD, Boolean.TRUE, "WebWizardDialog", new Integer(102), new Integer(52), INTEGERS[1], new Short((short) 6), resources.resWebWizardDialog_title, new Integer(330)
+ Boolean.TRUE, new Integer(210), HelpIds.getHelpIdString(HID0_WEBWIZARD), Boolean.TRUE, "WebWizardDialog", new Integer(102), new Integer(52), INTEGERS[1], new Short((short) 6), resources.resWebWizardDialog_title, new Integer(330)
});
//Set member- FontDescriptors...
@@ -286,7 +287,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + HID1_LST_SESSIONS, new Short((short) 14), "lstLoadSettings", new Integer(97), new Integer(165), INTEGERS[1], new Short(tabIndex++), new Integer(173)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID1_LST_SESSIONS), new Short((short) 14), "lstLoadSettings", new Integer(97), new Integer(165), INTEGERS[1], new Short(tabIndex++), new Integer(173)
});
btnDelSession = insertButton("btnDelSession", BTNDELSESSION_ACTION_PERFORMED,
new String[]
@@ -295,7 +296,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.FALSE, INTEGER_14, "HID:" + HID1_BTN_DEL_SES, new Short(com.sun.star.awt.ImageAlign.LEFT), resources.resbtnDelSession_value, "btnDelSession", new Integer(274), new Integer(164), INTEGERS[1], new Short(tabIndex++), INTEGER_50
+ Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(HID1_BTN_DEL_SES), new Short(com.sun.star.awt.ImageAlign.LEFT), resources.resbtnDelSession_value, "btnDelSession", new Integer(274), new Integer(164), INTEGERS[1], new Short(tabIndex++), INTEGER_50
});
}
@@ -322,19 +323,19 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- new Integer(123), "HID:" + HID2_LST_DOCS, new Short((short) 9), "lstDocuments", new Integer(97), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(103)
+ new Integer(123), HelpIds.getHelpIdString(HID2_LST_DOCS), new Short((short) 9), "lstDocuments", new Integer(97), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(103)
});
btnAddDoc = insertButton("btnAddDoc", BTNADDDOC_ACTION_PERFORMED,
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID2_BTN_ADD_DOC, resources.resbtnAddDoc_value, "btnAddDoc", new Integer(97), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_ADD_DOC), resources.resbtnAddDoc_value, "btnAddDoc", new Integer(97), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50
});
btnRemoveDoc = insertButton("btnRemoveDoc", BTNREMOVEDOC_ACTION_PERFORMED,
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID2_BTN_REM_DOC, resources.resbtnRemoveDoc_value, "btnRemoveDoc", new Integer(150), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_REM_DOC), resources.resbtnRemoveDoc_value, "btnRemoveDoc", new Integer(150), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50
});
btnDocUp = insertButton("btnDocUp", BTNDOCUP_ACTION_PERFORMED,
new String[]
@@ -343,7 +344,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- fontDescriptor7, INTEGER_14, "HID:" + HID2_BTN_DOC_UP, resources.resbtnDocUp_value, "btnDocUp", new Integer(205), new Integer(87), INTEGERS[2], new Short(tabIndex++), new Integer(18)
+ fontDescriptor7, INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_DOC_UP), resources.resbtnDocUp_value, "btnDocUp", new Integer(205), new Integer(87), INTEGERS[2], new Short(tabIndex++), new Integer(18)
});
btnDocDown = insertButton("btnDocDown", BTNDOCDOWN_ACTION_PERFORMED,
new String[]
@@ -352,7 +353,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- fontDescriptor7, INTEGER_14, "HID:" + HID2_BTN_DOC_DOWN, resources.resbtnDocDown_value, "btnDocDown", new Integer(205), new Integer(105), INTEGERS[2], new Short(tabIndex++), new Integer(18)
+ fontDescriptor7, INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_DOC_DOWN), resources.resbtnDocDown_value, "btnDocDown", new Integer(205), new Integer(105), INTEGERS[2], new Short(tabIndex++), new Integer(18)
});
lblDocExportFormat = insertLabel("lblDocExportFormat",
@@ -368,7 +369,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + HID2_LST_DOC_EXPORT, new Short((short) 14), "lstDocTargetType", new Integer(235), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(89)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID2_LST_DOC_EXPORT), new Short((short) 14), "lstDocTargetType", new Integer(235), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(89)
});
@@ -390,7 +391,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID2_TXT_DOC_TITLE, "txtDocTitle", new Integer(235), new Integer(88), INTEGERS[2], new Short(tabIndex++), new Integer(89)
+ INTEGER_12, HelpIds.getHelpIdString(HID2_TXT_DOC_TITLE), "txtDocTitle", new Integer(235), new Integer(88), INTEGERS[2], new Short(tabIndex++), new Integer(89)
});
lblDocInfo = insertLabel("lblDocInfo",
PROPNAMES_LBL,
@@ -405,7 +406,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- INTEGER_40, "HID:" + HID2_TXT_DOC_DESC, Boolean.TRUE, "txtDocInfo", new Integer(235), new Integer(113), INTEGERS[2], new Short(tabIndex++), new Integer(89)
+ INTEGER_40, HelpIds.getHelpIdString(HID2_TXT_DOC_DESC), Boolean.TRUE, "txtDocInfo", new Integer(235), new Integer(113), INTEGERS[2], new Short(tabIndex++), new Integer(89)
});
lblDocAuthor = insertLabel("lblDocAuthor",
PROPNAMES_LBL,
@@ -417,7 +418,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID2_TXT_DOC_AUTHOR, "txtDocAuthor", new Integer(235), new Integer(165), INTEGERS[2], new Short(tabIndex++), new Integer(89)
+ INTEGER_12, HelpIds.getHelpIdString(HID2_TXT_DOC_AUTHOR), "txtDocAuthor", new Integer(235), new Integer(165), INTEGERS[2], new Short(tabIndex++), new Integer(89)
});
}
@@ -459,56 +460,56 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_FILENAME, resources.reschkDocFilename_value, "chkDocFilename", new Integer(103), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 35), new Integer(99)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_FILENAME), resources.reschkDocFilename_value, "chkDocFilename", new Integer(103), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 35), new Integer(99)
});
chbDocDesc = insertCheckBox("chbDocDesc", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_DESCRIPTION, resources.reschbDocDesc_value, "chbDocDesc", new Integer(103), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 36), new Integer(99)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_DESCRIPTION), resources.reschbDocDesc_value, "chbDocDesc", new Integer(103), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 36), new Integer(99)
});
chbDocAuthor = insertCheckBox("chbDocAuthor", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_AUTHOR, resources.reschbDocAuthor_value, "chbDocAuthor", new Integer(103), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 37), new Integer(99)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_AUTHOR), resources.reschbDocAuthor_value, "chbDocAuthor", new Integer(103), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 37), new Integer(99)
});
chkDocCreated = insertCheckBox("chkDocCreated", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_CR_DATE, resources.reschkDocCreated_value, "chkDocCreated", new Integer(103), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 38), new Integer(99)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_CR_DATE), resources.reschkDocCreated_value, "chkDocCreated", new Integer(103), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 38), new Integer(99)
});
chkDocChanged = insertCheckBox("chkDocChanged", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_UP_DATE, resources.reschkDocChanged_value, "chkDocChanged", new Integer(103), new Integer(90), new Short((short) 0), INTEGERS[4], new Short((short) 39), new Integer(99)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_UP_DATE), resources.reschkDocChanged_value, "chkDocChanged", new Integer(103), new Integer(90), new Short((short) 0), INTEGERS[4], new Short((short) 39), new Integer(99)
});
chkDocFormat = insertCheckBox("chkDocFormat", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_FORMAT, resources.reschkDocFormat_value, "chkDocFormat", new Integer(200), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 40), new Integer(110)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_FORMAT), resources.reschkDocFormat_value, "chkDocFormat", new Integer(200), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 40), new Integer(110)
});
chkDocFormatIcon = insertCheckBox("chkDocFormatIcon", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_F_ICON, resources.reschkDocFormatIcon_value, "chkDocFormatIcon", new Integer(200), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 41), new Integer(110)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_F_ICON), resources.reschkDocFormatIcon_value, "chkDocFormatIcon", new Integer(200), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 41), new Integer(110)
});
chkDocPages = insertCheckBox("chkDocPages", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_PAGES, resources.reschkDocPages_value, "chkDocPages", new Integer(200), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 42), new Integer(110)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_PAGES), resources.reschkDocPages_value, "chkDocPages", new Integer(200), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 42), new Integer(110)
});
chkDocSize = insertCheckBox("chkDocSize", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_SIZE, resources.reschkDocSize_value, "chkDocSize", new Integer(200), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 43), new Integer(110)
+ INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_SIZE), resources.reschkDocSize_value, "chkDocSize", new Integer(200), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 43), new Integer(110)
});
lblOptimizeFor = insertLabel("lblOptimizeFor",
PROPNAMES_LBL,
@@ -520,19 +521,19 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_BUTTON,
new Object[]
{
- INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_640, resources.resoptOptimize640x480_value, "optOptimize640x480", new Integer(103), new Integer(133), INTEGERS[4], new Short((short) 45), new Integer(44)
+ INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_640), resources.resoptOptimize640x480_value, "optOptimize640x480", new Integer(103), new Integer(133), INTEGERS[4], new Short((short) 45), new Integer(44)
});
optOptimize800x600 = insertRadioButton("optOptimize800x600", null,
PROPNAMES_BUTTON,
new Object[]
{
- INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_800, resources.resoptOptimize800x600_value, "optOptimize800x600", new Integer(103), new Integer(146), INTEGERS[4], new Short((short) 46), new Integer(44)
+ INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_800), resources.resoptOptimize800x600_value, "optOptimize800x600", new Integer(103), new Integer(146), INTEGERS[4], new Short((short) 46), new Integer(44)
});
optOptimize1024x768 = insertRadioButton("optOptimize1024x768", null,
PROPNAMES_BUTTON,
new Object[]
{
- INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_1024, resources.resoptOptimize1024x768_value, "optOptimize1024x768", new Integer(103), new Integer(158), INTEGERS[4], new Short((short) 47), new Integer(44)
+ INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_1024), resources.resoptOptimize1024x768_value, "optOptimize1024x768", new Integer(103), new Integer(158), INTEGERS[4], new Short((short) 47), new Integer(44)
});
}
@@ -557,7 +558,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + HID5_LST_STYLES, new Short((short) 14), "lstStyles", new Integer(179), new Integer(26), INTEGERS[5], new Short((short) 52), new Integer(145)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID5_LST_STYLES), new Short((short) 14), "lstStyles", new Integer(179), new Integer(26), INTEGERS[5], new Short((short) 52), new Integer(145)
});
insertLabel("lblBackground", PROPNAMES_LBL,
@@ -577,7 +578,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
btnBackgrounds = insertButton("btnBackgrounds", BTNBACKGROUNDS_ACTION_PERFORMED, PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID5_BTN_BACKGND, resources.resBtnChooseBackground, "btnBackgrounds", new Integer(274), new Integer(43), INTEGERS[5], new Short((short) 53), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID5_BTN_BACKGND), resources.resBtnChooseBackground, "btnBackgrounds", new Integer(274), new Integer(43), INTEGERS[5], new Short((short) 53), INTEGER_50
});
insertLabel("lblIconset", PROPNAMES_LBL,
@@ -598,7 +599,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID5_BTN_ICONS, resources.resBtnChooseIconset, "btnIconSets", new Integer(274), new Integer(61), INTEGERS[5], new Short((short) 54), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID5_BTN_ICONS), resources.resBtnChooseIconset, "btnIconSets", new Integer(274), new Integer(61), INTEGERS[5], new Short((short) 54), INTEGER_50
});
insertLabel("lblIconsetInfo",
new String[]
@@ -642,7 +643,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID6_TXT_SITE_TITLE, "txtSiteTitle", new Integer(179), new Integer(26), INTEGERS[6], new Short(tabIndex++), new Integer(145)
+ INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_TITLE), "txtSiteTitle", new Integer(179), new Integer(26), INTEGERS[6], new Short(tabIndex++), new Integer(145)
});
@@ -664,7 +665,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID6_TXT_SITE_DESC, "txtSiteDesc", new Integer(179), new Integer(70), INTEGERS[6], new Short(tabIndex++), new Integer(145)
+ INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_DESC), "txtSiteDesc", new Integer(179), new Integer(70), INTEGERS[6], new Short(tabIndex++), new Integer(145)
});
lblEmail = insertLabel("lblEmail", PROPNAMES_LBL,
@@ -675,7 +676,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
txtEmail = insertTextField("txtEmail", null, PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID6_TXT_SITE_EMAIL, "txtEmail", new Integer(179), new Integer(87), INTEGERS[6], new Short(tabIndex++), new Integer(145)
+ INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_EMAIL), "txtEmail", new Integer(179), new Integer(87), INTEGERS[6], new Short(tabIndex++), new Integer(145)
});
lblCopyright = insertLabel("lblCopyright", PROPNAMES_LBL,
@@ -686,7 +687,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
txtCopyright = insertTextField("txtCopyright", null, PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID6_TXT_SITE_COPYRIGHT, "txtCopyright", new Integer(179), new Integer(106), INTEGERS[6], new Short(tabIndex++), new Integer(145)
+ INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_COPYRIGHT), "txtCopyright", new Integer(179), new Integer(106), INTEGERS[6], new Short(tabIndex++), new Integer(145)
});
@@ -703,7 +704,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + HID6_DATE_SITE_CREATED, "dateSiteCreated", new Integer(179), new Integer(124), INTEGERS[6], new Short(tabIndex++), new Integer(49)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID6_DATE_SITE_CREATED), "dateSiteCreated", new Integer(179), new Integer(124), INTEGERS[6], new Short(tabIndex++), new Integer(49)
});
lblSiteUpdated = insertLabel("lblSiteUpdated",
PROPNAMES_LBL,
@@ -719,7 +720,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.TRUE, INTEGER_12, "HID:" + HID6_DATE_SITE_UPDATED, "dateSiteUpdate", new Integer(179), new Integer(142), INTEGERS[6], new Short(tabIndex++), new Integer(49)
+ Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID6_DATE_SITE_UPDATED), "dateSiteUpdate", new Integer(179), new Integer(142), INTEGERS[6], new Short(tabIndex++), new Integer(49)
});
@@ -748,7 +749,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID7_BTN_PREVIEW, resources.resbtnPreview_value, "btnPreview", new Integer(103), new Integer(40), INTEGERS[7], new Short(tabIndex++), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_PREVIEW), resources.resbtnPreview_value, "btnPreview", new Integer(103), new Integer(40), INTEGERS[7], new Short(tabIndex++), INTEGER_50
});
lblCreateSite = insertFixedLine("lblCreateSite",
@@ -762,45 +763,45 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID7_CHK_PUBLISH_LOCAL, resources.reschkLocalDir_value, "chkLocalDir", new Integer(103), new Integer(68), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215)
+ INTEGERS[8], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_LOCAL), resources.reschkLocalDir_value, "chkLocalDir", new Integer(103), new Integer(68), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215)
});
txtLocalDir = insertTextField("txtLocalDir", null,
PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID7_TXT_LOCAL, "txtLocalDir", new Integer(113), new Integer(78), INTEGERS[7], new Short(tabIndex++), new Integer(190)
+ INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_LOCAL), "txtLocalDir", new Integer(113), new Integer(78), INTEGERS[7], new Short(tabIndex++), new Integer(190)
});
btnLocalDir = insertButton("btnLocalDir", BTNLOCALDIR_ACTION_PERFORMED,
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID7_BTN_LOCAL, resources.resbtnLocalDir_value, "btnLocalDir", new Integer(308), new Integer(77), INTEGERS[7], new Short(tabIndex++), INTEGER_16
+ INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_LOCAL), resources.resbtnLocalDir_value, "btnLocalDir", new Integer(308), new Integer(77), INTEGERS[7], new Short(tabIndex++), INTEGER_16
});
chkZip = insertCheckBox("chkZip", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[9], "HID:" + HID7_CHK_PUBLISH_ZIP, resources.reschkZip_value, "chkZip", new Integer(103), new Integer(96), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215)
+ INTEGERS[9], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_ZIP), resources.reschkZip_value, "chkZip", new Integer(103), new Integer(96), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215)
});
txtZip = insertTextField("txtZip", null,
PROPNAMES_TXT,
new Object[]
{
- INTEGER_12, "HID:" + HID7_TXT_ZIP, "txtZip", new Integer(113), new Integer(108), INTEGERS[7], new Short(tabIndex++), new Integer(190)
+ INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_ZIP), "txtZip", new Integer(113), new Integer(108), INTEGERS[7], new Short(tabIndex++), new Integer(190)
});
btnZip = insertButton("btnZip", BTNZIP_ACTION_PERFORMED,
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID7_BTN_ZIP, resources.resbtnZip_value, "btnZip", new Integer(308), new Integer(107), INTEGERS[7], new Short(tabIndex++), INTEGER_16
+ INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_ZIP), resources.resbtnZip_value, "btnZip", new Integer(308), new Integer(107), INTEGERS[7], new Short(tabIndex++), INTEGER_16
});
chkFTP = insertCheckBox("chkFTP", null,
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[8], "HID:" + HID7_CHK_PUBLISH_FTP, resources.reschkFTP_value, "chkFTP", new Integer(103), new Integer(124), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215)
+ INTEGERS[8], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_FTP), resources.reschkFTP_value, "chkFTP", new Integer(103), new Integer(124), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215)
});
Integer FTP_STEP = disableFTP ? new Integer(99) : INTEGERS[7];
@@ -819,7 +820,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_BUTTON,
new Object[]
{
- INTEGER_14, "HID:" + HID7_BTN_FTP, resources.resbtnFTP_value, "btnFTP", new Integer(274), new Integer(133), FTP_STEP, new Short(tabIndex++), INTEGER_50
+ INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_FTP), resources.resbtnFTP_value, "btnFTP", new Integer(274), new Integer(133), FTP_STEP, new Short(tabIndex++), INTEGER_50
});
if (disableFTP)
@@ -857,7 +858,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
PROPNAMES_CHKBOX,
new Object[]
{
- INTEGERS[9], "HID:" + HID7_CHK_SAVE, resources.reschkSaveSettings_value, "chkSaveSettings", new Integer(97), new Integer(157), new Short((short) 1), INTEGERS[7], new Short(tabIndex++), new Integer(215)
+ INTEGERS[9], HelpIds.getHelpIdString(HID7_CHK_SAVE), resources.reschkSaveSettings_value, "chkSaveSettings", new Integer(97), new Integer(157), new Short((short) 1), INTEGERS[7], new Short(tabIndex++), new Integer(215)
});
lblSaveSettings = insertLabel("lblSaveSettings",
PROPNAMES_LBL,
@@ -872,7 +873,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
},
new Object[]
{
- Boolean.TRUE, Boolean.TRUE, INTEGER_12, "HID:" + HID7_TXT_SAVE, new Short((short) 14), "txtSaveSettings", new Integer(179), new Integer(167), INTEGERS[7], new Short(tabIndex++), new Integer(145)
+ Boolean.TRUE, Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_SAVE), new Short((short) 14), "txtSaveSettings", new Integer(179), new Integer(167), INTEGERS[7], new Short(tabIndex++), new Integer(145)
});
}
diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk
index 9cc97e1b8..2e0394d29 100644
--- a/wizards/com/sun/star/wizards/web/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/makefile.mk
@@ -83,3 +83,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/web.component
+
+$(MISC)/web.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ web.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt web.component
diff --git a/wizards/com/sun/star/wizards/web/web.component b/wizards/com/sun/star/wizards/web/web.component
new file mode 100644
index 000000000..763438f96
--- /dev/null
+++ b/wizards/com/sun/star/wizards/web/web.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation
+ name="com.sun.star.wizards.web.CallWizard$WizardImplementation">
+ <service name="com.sun.star.wizards.web.CallWizard"/>
+ </implementation>
+</component>
diff --git a/wizards/prj/d.lst b/wizards/prj/d.lst
index 4d1ad83d1..f8ab876ba 100644
--- a/wizards/prj/d.lst
+++ b/wizards/prj/d.lst
@@ -13,3 +13,11 @@ mkdir: %_DEST%\pck%_EXT%
REM ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+..\%__SRC%\misc\agenda.component %_DEST%\xml%_EXT%\agenda.component
+..\%__SRC%\misc\fax.component %_DEST%\xml%_EXT%\fax.component
+..\%__SRC%\misc\form.component %_DEST%\xml%_EXT%\form.component
+..\%__SRC%\misc\letter.component %_DEST%\xml%_EXT%\letter.component
+..\%__SRC%\misc\query.component %_DEST%\xml%_EXT%\query.component
+..\%__SRC%\misc\report.component %_DEST%\xml%_EXT%\report.component
+..\%__SRC%\misc\table.component %_DEST%\xml%_EXT%\table.component
+..\%__SRC%\misc\web.component %_DEST%\xml%_EXT%\web.component
diff --git a/wizards/source/depot/Dialog2.xdl b/wizards/source/depot/Dialog2.xdl
index a46fe9f5b..652acaa19 100644
--- a/wizards/source/depot/Dialog2.xdl
+++ b/wizards/source/depot/Dialog2.xdl
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog2" dlg:tab-index="0" dlg:left="91" dlg:top="24" dlg:width="220" dlg:height="128" dlg:page="1" dlg:help-url="HID:34520" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog2" dlg:tab-index="0" dlg:left="91" dlg:top="24" dlg:width="220" dlg:height="128" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
<dlg:text dlg:id="lblStockNames" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="102" dlg:height="8" dlg:value="lblStockNames"/>
- <dlg:menulist dlg:id="lstSellStocks" dlg:tab-index="1" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="1" dlg:help-url="HID:34530" dlg:spin="true">
+ <dlg:menulist dlg:id="lstSellStocks" dlg:tab-index="1" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS" dlg:spin="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Depot.Depot.SelectStockname?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
- <dlg:combobox dlg:id="lstBuyStocks" dlg:tab-index="2" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="2" dlg:help-url="HID:34531" dlg:spin="true">
+ <dlg:combobox dlg:id="lstBuyStocks" dlg:tab-index="2" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS" dlg:spin="true">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.Depot.SelectStockname?language=Basic&amp;location=application" script:language="Script"/>
</dlg:combobox>
<dlg:text dlg:id="lblStockID" dlg:tab-index="3" dlg:left="150" dlg:top="6" dlg:width="66" dlg:height="8" dlg:value="lblStockID"/>
- <dlg:textfield dlg:id="txtStockID" dlg:tab-index="4" dlg:left="150" dlg:top="17" dlg:width="40" dlg:height="12" dlg:help-url="HID:34521"/>
+ <dlg:textfield dlg:id="txtStockID" dlg:tab-index="4" dlg:left="150" dlg:top="17" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY"/>
<dlg:text dlg:id="lblQuantity" dlg:tab-index="5" dlg:left="6" dlg:top="36" dlg:width="57" dlg:height="8" dlg:value="lblQuantity"/>
- <dlg:numericfield dlg:id="txtQuantity" dlg:tab-index="6" dlg:left="6" dlg:top="47" dlg:width="46" dlg:height="12" dlg:help-url="HID:34522" dlg:decimal-accuracy="0" dlg:value-min="1"/>
- <dlg:currencyfield dlg:id="txtRate" dlg:tab-index="7" dlg:left="68" dlg:top="47" dlg:width="40" dlg:height="12" dlg:help-url="HID:34523" dlg:value-min="0"/>
- <dlg:datefield dlg:id="txtDate" dlg:tab-index="8" dlg:left="150" dlg:top="47" dlg:width="50" dlg:height="12" dlg:tag="Dialog2" dlg:help-url="HID:34524" dlg:strict-format="true" dlg:spin="true">
+ <dlg:numericfield dlg:id="txtQuantity" dlg:tab-index="6" dlg:left="6" dlg:top="47" dlg:width="46" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY" dlg:decimal-accuracy="0" dlg:value-min="1"/>
+ <dlg:currencyfield dlg:id="txtRate" dlg:tab-index="7" dlg:left="68" dlg:top="47" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTRATE" dlg:value-min="0"/>
+ <dlg:datefield dlg:id="txtDate" dlg:tab-index="8" dlg:left="150" dlg:top="47" dlg:width="50" dlg:height="12" dlg:tag="Dialog2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTDATE" dlg:strict-format="true" dlg:spin="true">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&amp;location=application" script:language="Script"/>
</dlg:datefield>
<dlg:text dlg:id="lblRate" dlg:tab-index="9" dlg:left="68" dlg:top="36" dlg:width="77" dlg:height="8" dlg:value="lblRate"/>
<dlg:text dlg:id="lblDate" dlg:tab-index="10" dlg:left="150" dlg:top="37" dlg:width="66" dlg:height="8" dlg:value="lblDate"/>
- <dlg:formattedfield dlg:id="txtCommission" dlg:tab-index="11" dlg:left="6" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:34525" dlg:format-code="0,00%" dlg:format-locale="de;DE"/>
+ <dlg:formattedfield dlg:id="txtCommission" dlg:tab-index="11" dlg:left="6" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION" dlg:format-code="0,00%" dlg:format-locale="de;DE"/>
<dlg:text dlg:id="lblCommission" dlg:tab-index="12" dlg:left="6" dlg:top="79" dlg:width="60" dlg:height="8" dlg:value="lblCommission"/>
- <dlg:currencyfield dlg:id="txtFix" dlg:tab-index="13" dlg:left="68" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:34526" dlg:value-min="0"/>
- <dlg:currencyfield dlg:id="txtMinimum" dlg:tab-index="14" dlg:left="150" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:34527" dlg:value-min="0"/>
+ <dlg:currencyfield dlg:id="txtFix" dlg:tab-index="13" dlg:left="68" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTFIX" dlg:value-min="0"/>
+ <dlg:currencyfield dlg:id="txtMinimum" dlg:tab-index="14" dlg:left="150" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM" dlg:value-min="0"/>
<dlg:text dlg:id="lblFix" dlg:tab-index="15" dlg:left="68" dlg:top="79" dlg:width="71" dlg:height="8" dlg:value="lblFix"/>
<dlg:text dlg:id="lblMinimum" dlg:tab-index="16" dlg:left="150" dlg:top="79" dlg:width="66" dlg:height="8" dlg:value="lblMinimum"/>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="17" dlg:left="58" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:34528" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="17" dlg:left="58" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.CancelTransaction?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="18" dlg:left="111" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:34529" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="18" dlg:left="111" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.TransactionOk?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:fixedline dlg:id="hlnCommission" dlg:tab-index="19" dlg:left="6" dlg:top="66" dlg:width="210" dlg:height="8" dlg:value="hlnCommission"/>
diff --git a/wizards/source/depot/Dialog3.xdl b/wizards/source/depot/Dialog3.xdl
index 4c6cabd20..87bda0197 100644
--- a/wizards/source/depot/Dialog3.xdl
+++ b/wizards/source/depot/Dialog3.xdl
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog3" dlg:left="161" dlg:top="81" dlg:width="176" dlg:height="119" dlg:page="3" dlg:help-url="HID:34532" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog3" dlg:left="161" dlg:top="81" dlg:width="176" dlg:height="119" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
<dlg:text dlg:id="lblStockNames" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="98" dlg:height="8" dlg:value="lblStockNames"/>
- <dlg:menulist dlg:id="lstStockNames" dlg:tab-index="1" dlg:left="5" dlg:top="17" dlg:width="102" dlg:height="12" dlg:help-url="HID:34533" dlg:spin="true">
+ <dlg:menulist dlg:id="lstStockNames" dlg:tab-index="1" dlg:left="5" dlg:top="17" dlg:width="102" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES" dlg:spin="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Depot.Depot.SelectStockNameForRates?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
- <dlg:textfield dlg:id="txtStockID" dlg:tab-index="2" dlg:left="120" dlg:top="17" dlg:width="50" dlg:height="12" dlg:help-url="HID:34534"/>
- <dlg:datefield dlg:id="txtStartDate" dlg:tab-index="3" dlg:left="63" dlg:top="37" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:34543" dlg:spin="true">
+ <dlg:textfield dlg:id="txtStockID" dlg:tab-index="2" dlg:left="120" dlg:top="17" dlg:width="50" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT"/>
+ <dlg:datefield dlg:id="txtStartDate" dlg:tab-index="3" dlg:left="63" dlg:top="37" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE" dlg:spin="true">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&amp;location=application" script:language="Script"/>
</dlg:datefield>
- <dlg:datefield dlg:id="txtEndDate" dlg:tab-index="4" dlg:left="63" dlg:top="53" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:34544" dlg:spin="true">
+ <dlg:datefield dlg:id="txtEndDate" dlg:tab-index="4" dlg:left="63" dlg:top="53" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_TXTENDDATE" dlg:spin="true">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&amp;location=application" script:language="Script"/>
</dlg:datefield>
<dlg:radiogroup>
- <dlg:radio dlg:id="optDaily" dlg:tab-index="5" dlg:left="12" dlg:top="83" dlg:width="75" dlg:height="10" dlg:page="3" dlg:help-url="HID:34545" dlg:value="optDaily"/>
- <dlg:radio dlg:id="optWeekly" dlg:tab-index="6" dlg:left="101" dlg:top="83" dlg:width="69" dlg:height="10" dlg:page="3" dlg:help-url="HID:34546" dlg:value="optWeekly"/>
+ <dlg:radio dlg:id="optDaily" dlg:tab-index="5" dlg:left="12" dlg:top="83" dlg:width="75" dlg:height="10" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_OPTDAILY" dlg:value="optDaily"/>
+ <dlg:radio dlg:id="optWeekly" dlg:tab-index="6" dlg:left="101" dlg:top="83" dlg:width="69" dlg:height="10" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY" dlg:value="optWeekly"/>
</dlg:radiogroup>
- <dlg:datefield dlg:id="txtDate" dlg:tab-index="7" dlg:left="71" dlg:top="73" dlg:width="50" dlg:height="12" dlg:page="2" dlg:help-url="HID:34542" dlg:spin="true">
+ <dlg:datefield dlg:id="txtDate" dlg:tab-index="7" dlg:left="71" dlg:top="73" dlg:width="50" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_TXTDATE" dlg:spin="true">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&amp;location=application" script:language="Script"/>
</dlg:datefield>
<dlg:radiogroup>
- <dlg:radio dlg:id="optPerShare" dlg:tab-index="8" dlg:left="6" dlg:top="37" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:34537" dlg:value="optPerShare"/>
- <dlg:radio dlg:id="optTotal" dlg:tab-index="9" dlg:left="6" dlg:top="51" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:34538" dlg:value="optTotal"/>
+ <dlg:radio dlg:id="optPerShare" dlg:tab-index="8" dlg:left="6" dlg:top="37" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE" dlg:value="optPerShare"/>
+ <dlg:radio dlg:id="optTotal" dlg:tab-index="9" dlg:left="6" dlg:top="51" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_OPTTOTAL" dlg:value="optTotal"/>
</dlg:radiogroup>
- <dlg:currencyfield dlg:id="txtDividend" dlg:tab-index="10" dlg:left="6" dlg:top="80" dlg:width="50" dlg:height="12" dlg:page="1" dlg:help-url="HID:34539" dlg:value-min="0" dlg:spin="true"/>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="41" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:34535" dlg:value="cmdCancel">
+ <dlg:currencyfield dlg:id="txtDividend" dlg:tab-index="10" dlg:left="6" dlg:top="80" dlg:width="50" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND" dlg:value-min="0" dlg:spin="true"/>
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="41" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.CancelStockRate?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="12" dlg:left="94" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:34536" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="12" dlg:left="94" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.CommitStockRate?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:text dlg:id="lblStockID" dlg:tab-index="13" dlg:left="120" dlg:top="6" dlg:width="50" dlg:height="8" dlg:value="lblStockID"/>
@@ -39,7 +39,7 @@
<dlg:fixedline dlg:id="hlnInterval" dlg:tab-index="18" dlg:left="6" dlg:top="72" dlg:width="164" dlg:height="8" dlg:page="3" dlg:value="hlnInterval"/>
<dlg:text dlg:id="lblStartDate" dlg:tab-index="19" dlg:left="6" dlg:top="39" dlg:width="53" dlg:height="8" dlg:page="3" dlg:value="lblStartDate"/>
<dlg:text dlg:id="lblEndDate" dlg:tab-index="20" dlg:left="6" dlg:top="55" dlg:width="53" dlg:height="8" dlg:page="3" dlg:value="lblEndDate"/>
- <dlg:numericfield dlg:id="txtOldRate" dlg:tab-index="21" dlg:left="6" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34540" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/>
- <dlg:numericfield dlg:id="txtNewRate" dlg:tab-index="22" dlg:left="50" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34541" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/>
+ <dlg:numericfield dlg:id="txtOldRate" dlg:tab-index="21" dlg:left="6" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/>
+ <dlg:numericfield dlg:id="txtNewRate" dlg:tab-index="22" dlg:left="50" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/>
</dlg:bulletinboard>
</dlg:window> \ No newline at end of file
diff --git a/wizards/source/depot/Dialog4.xdl b/wizards/source/depot/Dialog4.xdl
index 4f71be0da..f5c86ce47 100644
--- a/wizards/source/depot/Dialog4.xdl
+++ b/wizards/source/depot/Dialog4.xdl
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog4" dlg:left="161" dlg:top="81" dlg:width="160" dlg:height="120" dlg:page="1" dlg:help-url="HID:34547" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog4" dlg:left="161" dlg:top="81" dlg:width="160" dlg:height="120" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
<dlg:text dlg:id="lblWelcome" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="148" dlg:height="49" dlg:value="lblWelcome" dlg:multiline="true"/>
<dlg:text dlg:id="lblHint" dlg:tab-index="1" dlg:left="6" dlg:top="73" dlg:width="148" dlg:height="26" dlg:value="lblHint" dlg:multiline="true"/>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="2" dlg:left="28" dlg:top="100" dlg:width="50" dlg:height="14" dlg:help-url="HID:34549" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="2" dlg:left="28" dlg:top="100" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Currency.CloseStartUpDialog?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="3" dlg:left="84" dlg:top="100" dlg:width="52" dlg:height="14" dlg:help-url="HID:34550" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="3" dlg:left="84" dlg:top="100" dlg:width="52" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Currency.ChooseMarket?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:menulist dlg:id="lstMarkets" dlg:tab-index="4" dlg:left="6" dlg:top="57" dlg:width="148" dlg:height="12" dlg:help-url="HID:34548" dlg:spin="true">
+ <dlg:menulist dlg:id="lstMarkets" dlg:tab-index="4" dlg:left="6" dlg:top="57" dlg:width="148" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_LSTMARKETS" dlg:spin="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Depot.Currency.EnableGoOnButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
</dlg:bulletinboard>
diff --git a/wizards/source/euro/DlgConvert.xdl b/wizards/source/euro/DlgConvert.xdl
index 43bfeea34..18f3caef0 100644
--- a/wizards/source/euro/DlgConvert.xdl
+++ b/wizards/source/euro/DlgConvert.xdl
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogConvert" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2" dlg:help-url="HID:34660" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogConvert" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_DIALOG" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
<dlg:text dlg:id="lblCurrencies" dlg:tab-index="1" dlg:left="170" dlg:top="39" dlg:width="89" dlg:height="8" dlg:value="lblCurrencies"/>
- <dlg:checkbox dlg:id="chkComplete" dlg:tab-index="0" dlg:left="12" dlg:top="43" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:34661" dlg:value="chkComplete" dlg:checked="true">
+ <dlg:checkbox dlg:id="chkComplete" dlg:tab-index="0" dlg:left="12" dlg:top="43" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHECKBOX1" dlg:value="chkComplete" dlg:checked="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Euro.ConvertRun.RetrieveEnableValue?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="2" dlg:left="170" dlg:top="51" dlg:width="90" dlg:height="12" dlg:help-url="HID:34669" dlg:spin="true" dlg:linecount="12">
+ <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="2" dlg:left="170" dlg:top="51" dlg:width="90" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1" dlg:spin="true" dlg:linecount="12">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Euro.Common.SelectCurrency?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
<dlg:radiogroup>
- <dlg:radio dlg:id="optCellTemplates" dlg:tab-index="3" dlg:left="12" dlg:top="96" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:34662" dlg:value="optCellTemplates">
+ <dlg:radio dlg:id="optCellTemplates" dlg:tab-index="3" dlg:left="12" dlg:top="96" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1" dlg:value="optCellTemplates">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Soft.CreateStyleEnumeration?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optSheetRanges" dlg:tab-index="4" dlg:left="12" dlg:top="110" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:34663" dlg:value="optSheetRanges">
+ <dlg:radio dlg:id="optSheetRanges" dlg:tab-index="4" dlg:left="12" dlg:top="110" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2" dlg:value="optSheetRanges">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Hard.CreateRangeList?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optDocRanges" dlg:tab-index="5" dlg:left="12" dlg:top="124" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:34664" dlg:value="optDocRanges">
+ <dlg:radio dlg:id="optDocRanges" dlg:tab-index="5" dlg:left="12" dlg:top="124" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3" dlg:value="optDocRanges">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Hard.CreateRangeList?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optSelRange" dlg:tab-index="6" dlg:left="12" dlg:top="138" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:34665" dlg:value="optSelRange">
+ <dlg:radio dlg:id="optSelRange" dlg:tab-index="6" dlg:left="12" dlg:top="138" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4" dlg:value="optSelRange">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.ConvertRun.CheckRangeSelection?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
</dlg:radiogroup>
<dlg:text dlg:id="lblSelection" dlg:tab-index="7" dlg:left="170" dlg:top="84" dlg:width="73" dlg:height="8" dlg:page="1" dlg:value="lblSelection"/>
- <dlg:menulist dlg:id="lstSelection" dlg:tab-index="8" dlg:left="170" dlg:top="96" dlg:width="90" dlg:height="52" dlg:page="1" dlg:help-url="HID:34666" dlg:multiselection="true">
+ <dlg:menulist dlg:id="lstSelection" dlg:tab-index="8" dlg:left="170" dlg:top="96" dlg:width="90" dlg:height="52" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_LISTBOX1" dlg:multiselection="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Euro.ConvertRun.SelectListItem?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
<dlg:radiogroup>
- <dlg:radio dlg:id="optSingleFile" dlg:tab-index="9" dlg:left="12" dlg:top="51" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:34667" dlg:value="optSingleFile">
+ <dlg:radio dlg:id="optSingleFile" dlg:tab-index="9" dlg:left="12" dlg:top="51" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OBFILE" dlg:value="optSingleFile">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.SwapExtent?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optWholeDir" dlg:tab-index="10" dlg:left="12" dlg:top="65" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:34668" dlg:value="optWholeDir" dlg:checked="true">
+ <dlg:radio dlg:id="optWholeDir" dlg:tab-index="10" dlg:left="12" dlg:top="65" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OBDIR" dlg:value="optWholeDir" dlg:checked="true">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.SwapExtent?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
</dlg:radiogroup>
<dlg:textfield dlg:id="txtConfig" dlg:tab-index="11" dlg:left="6" dlg:top="50" dlg:width="258" dlg:height="55" dlg:page="3" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true"/>
- <dlg:textfield dlg:id="txtSource" dlg:tab-index="12" dlg:left="80" dlg:top="82" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:34670">
+ <dlg:textfield dlg:id="txtSource" dlg:tab-index="12" dlg:left="80" dlg:top="82" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_TBSOURCE">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.ToggleGoOnButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:textfield>
- <dlg:button dlg:id="cmdCallSourceDialog" dlg:tab-index="13" dlg:left="249" dlg:top="81" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:34677" dlg:value="...">
+ <dlg:button dlg:id="cmdCallSourceDialog" dlg:tab-index="13" dlg:left="249" dlg:top="81" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN" dlg:value="...">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.CallFilePicker?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:checkbox dlg:id="chkRecursive" dlg:tab-index="14" dlg:left="12" dlg:top="98" dlg:width="252" dlg:height="10" dlg:page="2" dlg:help-url="HID:34671" dlg:value="chkRecursive" dlg:checked="false"/>
- <dlg:checkbox dlg:id="chkTextDocuments" dlg:tab-index="15" dlg:left="12" dlg:top="112" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:34680" dlg:value="chkTextDocuments" dlg:checked="false"/>
- <dlg:checkbox dlg:id="chkProtect" dlg:tab-index="16" dlg:left="12" dlg:top="126" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:34679" dlg:value="chkProtect" dlg:checked="false"/>
- <dlg:textfield dlg:id="txtTarget" dlg:tab-index="17" dlg:left="80" dlg:top="143" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:34672"/>
- <dlg:button dlg:id="cmdCallTargetDialog" dlg:tab-index="18" dlg:left="249" dlg:top="142" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:34678" dlg:value="...">
+ <dlg:checkbox dlg:id="chkRecursive" dlg:tab-index="14" dlg:left="12" dlg:top="98" dlg:width="252" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE" dlg:value="chkRecursive" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="chkTextDocuments" dlg:tab-index="15" dlg:left="12" dlg:top="112" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS" dlg:value="chkTextDocuments" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="chkProtect" dlg:tab-index="16" dlg:left="12" dlg:top="126" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHKPROTECT" dlg:value="chkProtect" dlg:checked="false"/>
+ <dlg:textfield dlg:id="txtTarget" dlg:tab-index="17" dlg:left="80" dlg:top="143" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_TBTARGET"/>
+ <dlg:button dlg:id="cmdCallTargetDialog" dlg:tab-index="18" dlg:left="249" dlg:top="142" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBTARGETOPEN" dlg:value="...">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.CallFolderPicker?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:progressmeter dlg:id="ProgressBar" dlg:tab-index="19" dlg:left="85" dlg:top="152" dlg:width="179" dlg:height="10" dlg:page="3"/>
@@ -63,14 +63,14 @@
<dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="30" dlg:left="6" dlg:top="108" dlg:width="258" dlg:height="8" dlg:page="3" dlg:value="hlnProgress"/>
<dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="31" dlg:left="6" dlg:top="152" dlg:width="258" dlg:height="9" dlg:page="1"/>
<dlg:text dlg:id="lblProgress" dlg:tab-index="32" dlg:left="6" dlg:top="153" dlg:width="79" dlg:height="8" dlg:page="3" dlg:value="lblProgress"/>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="33" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34673" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="33" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBCANCEL" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Common.CancelTask?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:button dlg:id="cmdHelp" dlg:tab-index="34" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdHelp" dlg:button-type="help"/>
- <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34675" dlg:value="cmdBack">
+ <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBBACK" dlg:value="cmdBack">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.PreviousStep?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34676" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBGOON" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Common.StartConversion?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
</dlg:bulletinboard>
diff --git a/wizards/source/euro/DlgPassword.xdl b/wizards/source/euro/DlgPassword.xdl
index def861d97..976891a48 100644
--- a/wizards/source/euro/DlgPassword.xdl
+++ b/wizards/source/euro/DlgPassword.xdl
@@ -2,14 +2,14 @@
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgPassword" dlg:left="77" dlg:top="93" dlg:width="310" dlg:height="65" dlg:closeable="true" dlg:moveable="true" dlg:title="DlgPassword">
<dlg:bulletinboard>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="0" dlg:left="251" dlg:top="6" dlg:width="53" dlg:height="14" dlg:help-url="HID:34690" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="0" dlg:left="251" dlg:top="6" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGPASSWORD_CMDGOON" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Protect.ReadPassword?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="1" dlg:left="251" dlg:top="24" dlg:width="53" dlg:height="14" dlg:help-url="HID:34691" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="1" dlg:left="251" dlg:top="24" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGPASSWORD_CMDCANCEL" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Protect.RejectPassword?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:button dlg:id="cmdHelp" dlg:tab-index="2" dlg:left="251" dlg:top="45" dlg:width="53" dlg:height="14" dlg:tag="34692" dlg:value="cmdHelp" dlg:button-type="help"/>
- <dlg:textfield dlg:id="txtPassword" dlg:tab-index="3" dlg:left="11" dlg:top="18" dlg:width="232" dlg:height="12" dlg:help-url="HID:34693" dlg:echochar="*"/>
+ <dlg:textfield dlg:id="txtPassword" dlg:tab-index="3" dlg:left="11" dlg:top="18" dlg:width="232" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGPASSWORD_TXTPASSWORD" dlg:echochar="*"/>
<dlg:fixedline dlg:id="hlnPassword" dlg:tab-index="4" dlg:left="6" dlg:top="6" dlg:width="238" dlg:height="8" dlg:value="hlnPassword"/>
</dlg:bulletinboard>
</dlg:window> \ No newline at end of file
diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl
index ade138e06..269b7e618 100644
--- a/wizards/source/formwizard/DlgFormDB.xdl
+++ b/wizards/source/formwizard/DlgFormDB.xdl
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgFormDB" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1" dlg:help-url="HID:34400" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgFormDB" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_DIALOG" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
<dlg:text dlg:id="lblSelFields" dlg:tab-index="10" dlg:left="154" dlg:top="70" dlg:width="110" dlg:height="8" dlg:page="1" dlg:value="lblSelFields"/>
- <dlg:menulist dlg:id="lstTables" dlg:tab-index="3" dlg:left="6" dlg:top="51" dlg:width="110" dlg:height="12" dlg:page="1" dlg:help-url="HID:34411" dlg:spin="true">
+ <dlg:menulist dlg:id="lstTables" dlg:tab-index="3" dlg:left="6" dlg:top="51" dlg:width="110" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_MASTER_LBTABLES" dlg:spin="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.FormGetFields?language=Basic&amp;location=application" script:language="Script"/>
<script:event script:event-name="on-mousedown" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.DeleteFirstTableListBoxEntry?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
<dlg:img dlg:id="imgTheme" dlg:tab-index="1" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26" dlg:scale-image="false"/>
<dlg:button dlg:id="cmdCancel" dlg:tab-index="33" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34401" dlg:value="cmdCancel" dlg:button-type="cancel"/>
<dlg:button dlg:id="cmdHelp" dlg:tab-index="34" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:tag="34400" dlg:value="cmdHelp" dlg:button-type="help"/>
- <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34402" dlg:value="cmdBack">
+ <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGFORM_CMDPREV" dlg:value="cmdBack">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.PreviousStep?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34403" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGFORM_CMDNEXT" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.NextStep?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:text dlg:id="lblTables" dlg:tab-index="2" dlg:left="6" dlg:top="40" dlg:width="72" dlg:height="8" dlg:page="1" dlg:value="lblTables"/>
<dlg:text dlg:id="lblFields" dlg:tab-index="4" dlg:left="6" dlg:top="70" dlg:width="109" dlg:height="8" dlg:page="1" dlg:value="lblFields"/>
- <dlg:button dlg:id="cmdMoveSelected" dlg:tab-index="6" dlg:left="122" dlg:top="84" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34422" dlg:value="-&gt;">
+ <dlg:button dlg:id="cmdMoveSelected" dlg:tab-index="6" dlg:left="122" dlg:top="84" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION" dlg:value="-&gt;">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormMoveSelected?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdMoveAll" dlg:tab-index="7" dlg:left="122" dlg:top="101" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34423" dlg:value="=&gt;&gt;">
+ <dlg:button dlg:id="cmdMoveAll" dlg:tab-index="7" dlg:left="122" dlg:top="101" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY" dlg:value="=&gt;&gt;">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormMoveAll?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdRemoveSelected" dlg:tab-index="8" dlg:left="122" dlg:top="118" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34424" dlg:value="&lt;-">
+ <dlg:button dlg:id="cmdRemoveSelected" dlg:tab-index="8" dlg:left="122" dlg:top="118" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_lstRELATIONS" dlg:value="&lt;-">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormRemoveSelected?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:button dlg:id="cmdRemoveAll" dlg:tab-index="9" dlg:left="122" dlg:top="135" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34425" dlg:value="&lt;&lt;=">
@@ -42,34 +42,34 @@
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormMoveSelected?language=Basic&amp;location=application" script:language="Script"/>
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormSetMoveRights?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
- <dlg:menulist dlg:id="lstSelFields" dlg:tab-index="11" dlg:left="154" dlg:top="81" dlg:width="110" dlg:height="70" dlg:page="1" dlg:help-url="HID:34421" dlg:multiselection="true">
+ <dlg:menulist dlg:id="lstSelFields" dlg:tab-index="11" dlg:left="154" dlg:top="81" dlg:width="110" dlg:height="70" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM" dlg:multiselection="true">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormRemoveSelected?language=Basic&amp;location=application" script:language="Script"/>
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormSetMoveRights?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
<dlg:text dlg:id="lblStyles" dlg:tab-index="25" dlg:left="150" dlg:top="39" dlg:width="114" dlg:height="8" dlg:page="2" dlg:value="lblStyles"/>
- <dlg:button dlg:id="cmdArrange1" dlg:tab-index="16" dlg:left="12" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="1" dlg:help-url="HID:34431">
+ <dlg:button dlg:id="cmdArrange1" dlg:tab-index="16" dlg:left="12" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_LBTABLES">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange2" dlg:tab-index="17" dlg:left="39" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2" dlg:help-url="HID:34432">
+ <dlg:button dlg:id="cmdArrange2" dlg:tab-index="17" dlg:left="39" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange3" dlg:tab-index="18" dlg:left="66" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="3" dlg:help-url="HID:34433">
+ <dlg:button dlg:id="cmdArrange3" dlg:tab-index="18" dlg:left="66" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="3" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange4" dlg:tab-index="19" dlg:left="93" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="4" dlg:help-url="HID:34434">
+ <dlg:button dlg:id="cmdArrange4" dlg:tab-index="19" dlg:left="93" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="4" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange5" dlg:tab-index="20" dlg:left="120" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="5" dlg:help-url="HID:34435">
+ <dlg:button dlg:id="cmdArrange5" dlg:tab-index="20" dlg:left="120" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="5" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:menulist dlg:id="lstStyles" dlg:tab-index="26" dlg:left="150" dlg:top="50" dlg:width="114" dlg:height="86" dlg:page="2" dlg:help-url="HID:34443">
+ <dlg:menulist dlg:id="lstStyles" dlg:tab-index="26" dlg:left="150" dlg:top="50" dlg:width="114" dlg:height="86" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:FormWizard.tools.ImportStyles?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
<dlg:radiogroup>
- <dlg:radio dlg:id="optBorder0" dlg:tab-index="22" dlg:left="12" dlg:top="95" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34438" dlg:value="optBorder0">
+ <dlg:radio dlg:id="optBorder0" dlg:tab-index="22" dlg:left="12" dlg:top="95" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP" dlg:value="optBorder0">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeBorderLayouts?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optBorder1" dlg:tab-index="23" dlg:left="12" dlg:top="109" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34439" dlg:value="optBorder1">
+ <dlg:radio dlg:id="optBorder1" dlg:tab-index="23" dlg:left="12" dlg:top="109" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN" dlg:value="optBorder1">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeBorderLayouts?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
<dlg:radio dlg:id="optBorder2" dlg:tab-index="24" dlg:left="12" dlg:top="123" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34440" dlg:value="optBorder2">
@@ -78,10 +78,10 @@
</dlg:radiogroup>
<dlg:fixedline dlg:id="hlnBinaries" dlg:tab-index="12" dlg:left="6" dlg:top="158" dlg:width="258" dlg:height="8" dlg:page="1" dlg:value="hlnBinaries"/>
<dlg:radiogroup>
- <dlg:radio dlg:id="optTiled" dlg:tab-index="31" dlg:left="156" dlg:top="154" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="11" dlg:help-url="HID:34444" dlg:value="optTiled" dlg:checked="true">
+ <dlg:radio dlg:id="optTiled" dlg:tab-index="31" dlg:left="156" dlg:top="154" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="11" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2" dlg:value="optTiled" dlg:checked="true">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optArea" dlg:tab-index="32" dlg:left="156" dlg:top="168" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="10" dlg:help-url="HID:34445" dlg:value="optArea">
+ <dlg:radio dlg:id="optArea" dlg:tab-index="32" dlg:left="156" dlg:top="168" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="10" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3" dlg:value="optArea">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
</dlg:radiogroup>
@@ -90,10 +90,10 @@
<dlg:fixedline dlg:id="hlnBorderLayout" dlg:tab-index="21" dlg:left="6" dlg:top="83" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnBorderLayout"/>
<dlg:fixedline dlg:id="hlnArrangements" dlg:tab-index="15" dlg:left="6" dlg:top="39" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnArrangements"/>
<dlg:radiogroup>
- <dlg:radio dlg:id="optAlign0" dlg:tab-index="28" dlg:left="12" dlg:top="154" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34441" dlg:value="optAlign0">
+ <dlg:radio dlg:id="optAlign0" dlg:tab-index="28" dlg:left="12" dlg:top="154" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1" dlg:value="optAlign0">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeLabelAlignments?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optAlign2" dlg:tab-index="29" dlg:left="12" dlg:top="168" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34442" dlg:value="optAlign2">
+ <dlg:radio dlg:id="optAlign2" dlg:tab-index="29" dlg:left="12" dlg:top="168" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1" dlg:value="optAlign2">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeLabelAlignments?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
</dlg:radiogroup>
diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl
index 082c06bc8..f28bc1192 100644
--- a/wizards/source/importwizard/ImportDialog.xdl
+++ b/wizards/source/importwizard/ImportDialog.xdl
@@ -1,90 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="ImportDialog" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="4" dlg:help-url="HID:34570" dlg:closeable="true" dlg:moveable="true" dlg:title="ImportDialog">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="ImportDialog" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="4" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_DIALOG" dlg:closeable="true" dlg:moveable="true" dlg:title="ImportDialog">
<dlg:bulletinboard>
<dlg:text dlg:id="lblTemplateExport" dlg:tab-index="0" dlg:left="12" dlg:top="94" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblTemplateExport"/>
- <dlg:textfield dlg:id="txtTemplateImportPath" dlg:tab-index="1" dlg:left="73" dlg:top="76" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34583">
+ <dlg:textfield dlg:id="txtTemplateImportPath" dlg:tab-index="1" dlg:left="73" dlg:top="76" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:textfield>
- <dlg:textfield dlg:id="txtTemplateExportPath" dlg:tab-index="2" dlg:left="73" dlg:top="92" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34584"/>
- <dlg:checkbox dlg:id="chkDocumentPath" dlg:tab-index="3" dlg:left="12" dlg:top="121" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Document" dlg:help-url="HID:34586" dlg:value="chkDocumentPath" dlg:checked="true">
+ <dlg:textfield dlg:id="txtTemplateExportPath" dlg:tab-index="2" dlg:left="73" dlg:top="92" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH"/>
+ <dlg:checkbox dlg:id="chkDocumentPath" dlg:tab-index="3" dlg:left="12" dlg:top="121" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Document" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT" dlg:value="chkDocumentPath" dlg:checked="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.ToggleInputPaths?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkDocumentSearchSubDir" dlg:tab-index="4" dlg:left="12" dlg:top="134" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:34587" dlg:value="chkDocumentSearchSubDir" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="chkDocumentSearchSubDir" dlg:tab-index="4" dlg:left="12" dlg:top="134" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE" dlg:value="chkDocumentSearchSubDir" dlg:checked="false"/>
<dlg:text dlg:id="lblDocumentImport" dlg:tab-index="5" dlg:left="10" dlg:top="151" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblDocumentImport"/>
<dlg:text dlg:id="lblDocumentExport" dlg:tab-index="6" dlg:left="10" dlg:top="167" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblDocumentExport"/>
- <dlg:textfield dlg:id="txtDocumentImportPath" dlg:tab-index="7" dlg:left="73" dlg:top="149" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34588">
+ <dlg:textfield dlg:id="txtDocumentImportPath" dlg:tab-index="7" dlg:left="73" dlg:top="149" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:textfield>
- <dlg:textfield dlg:id="txtDocumentExportPath" dlg:tab-index="8" dlg:left="73" dlg:top="165" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34589"/>
+ <dlg:textfield dlg:id="txtDocumentExportPath" dlg:tab-index="8" dlg:left="73" dlg:top="165" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH"/>
<dlg:text dlg:id="SummaryHeaderLabel" dlg:tab-index="9" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="3" dlg:value="SummaryHeaderLabel"/>
- <dlg:textfield dlg:id="SummaryTextbox" dlg:tab-index="10" dlg:left="5" dlg:top="48" dlg:width="259" dlg:height="125" dlg:page="3" dlg:help-url="HID:34595" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true"/>
+ <dlg:textfield dlg:id="SummaryTextbox" dlg:tab-index="10" dlg:left="5" dlg:top="48" dlg:width="259" dlg:height="125" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_3_TBSUMMARY" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true"/>
<dlg:text dlg:id="LabelRetrieval" dlg:tab-index="11" dlg:left="10" dlg:top="67" dlg:width="255" dlg:height="8" dlg:page="4" dlg:value="LabelRetrieval"/>
<dlg:text dlg:id="LabelCurTemplateRetrieval" dlg:tab-index="12" dlg:left="15" dlg:top="79" dlg:width="249" dlg:height="8" dlg:page="4" dlg:value="LabelCurTemplateRetrieval"/>
<dlg:text dlg:id="LabelCurDocumentRetrieval" dlg:tab-index="13" dlg:left="15" dlg:top="91" dlg:width="249" dlg:height="8" dlg:page="4" dlg:value="LabelCurDocumentRetrieval"/>
<dlg:text dlg:id="LabelCurProgress" dlg:tab-index="14" dlg:left="10" dlg:top="106" dlg:width="255" dlg:height="8" dlg:page="4" dlg:value="LabelCurProgress"/>
<dlg:text dlg:id="LabelCurDocument" dlg:tab-index="15" dlg:left="15" dlg:top="118" dlg:width="249" dlg:height="20" dlg:page="4" dlg:value="LabelCurDocument" dlg:multiline="true"/>
<dlg:img dlg:id="ImportPreview" dlg:tab-index="16" dlg:left="5" dlg:top="6" dlg:width="258" dlg:height="26" dlg:scale-image="false"/>
- <dlg:button dlg:id="cmdBack" dlg:tab-index="17" dlg:left="155" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34573" dlg:value="cmdBack">
+ <dlg:button dlg:id="cmdBack" dlg:tab-index="17" dlg:left="155" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CMDPREV" dlg:value="cmdBack">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.PrevStep?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34572" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.CancelTask?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:button dlg:id="cmdHelp" dlg:tab-index="19" dlg:left="65" dlg:top="190" dlg:width="50" dlg:height="14" dlg:value="cmdHelp" dlg:button-type="help"/>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="20" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34574" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="20" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CMDNEXT" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.NextStep?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:text dlg:id="WelcomeTextLabel" dlg:tab-index="21" dlg:left="6" dlg:top="38" dlg:width="258" dlg:height="20" dlg:page="1" dlg:value="WelcomeTextLabel" dlg:multiline="true"/>
<dlg:text dlg:id="WelcomeTextLabel3" dlg:tab-index="22" dlg:left="6" dlg:top="58" dlg:width="258" dlg:height="12" dlg:page="1" dlg:value="WelcomeTextLabel3"/>
- <dlg:button dlg:id="cmdTemplateImport" dlg:tab-index="23" dlg:left="248" dlg:top="75" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateImportPath" dlg:help-url="HID:34585" dlg:value="...">
+ <dlg:button dlg:id="cmdTemplateImport" dlg:tab-index="23" dlg:left="248" dlg:top="75" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateImportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT" dlg:value="...">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdTemplateExport" dlg:tab-index="24" dlg:left="248" dlg:top="91" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateExportPath" dlg:help-url="HID:34600" dlg:value="...">
+ <dlg:button dlg:id="cmdTemplateExport" dlg:tab-index="24" dlg:left="248" dlg:top="91" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateExportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2" dlg:value="...">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdDocumentImport" dlg:tab-index="25" dlg:left="248" dlg:top="148" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentImportPath" dlg:help-url="HID:34590" dlg:value="...">
+ <dlg:button dlg:id="cmdDocumentImport" dlg:tab-index="25" dlg:left="248" dlg:top="148" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentImportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT" dlg:value="...">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdDocumentExport" dlg:tab-index="26" dlg:left="248" dlg:top="164" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentExportPath" dlg:help-url="HID:34601" dlg:value="...">
+ <dlg:button dlg:id="cmdDocumentExport" dlg:tab-index="26" dlg:left="248" dlg:top="164" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentExportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2" dlg:value="...">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:radiogroup>
- <dlg:radio dlg:id="optSODocuments" dlg:tab-index="27" dlg:left="6" dlg:top="72" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="SO" dlg:help-url="HID:34575" dlg:value="optSODocuments" dlg:checked="true">
+ <dlg:radio dlg:id="optSODocuments" dlg:tab-index="27" dlg:left="6" dlg:top="72" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="SO" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS" dlg:value="optSODocuments" dlg:checked="true">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleCheckboxes?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optMSDocuments" dlg:tab-index="28" dlg:left="6" dlg:top="113" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="MS" dlg:help-url="HID:34576" dlg:value="optMSDocuments">
+ <dlg:radio dlg:id="optMSDocuments" dlg:tab-index="28" dlg:left="6" dlg:top="113" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="MS" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS" dlg:value="optMSDocuments">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleCheckboxes?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
</dlg:radiogroup>
- <dlg:checkbox dlg:id="chkSOApplication1" dlg:tab-index="29" dlg:left="12" dlg:top="85" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34596" dlg:value="chkSOApplication1" dlg:checked="false">
+ <dlg:checkbox dlg:id="chkSOApplication1" dlg:tab-index="29" dlg:left="12" dlg:top="85" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKWRITER" dlg:value="chkSOApplication1" dlg:checked="false">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkSOApplication2" dlg:tab-index="30" dlg:left="155" dlg:top="85" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:34597" dlg:value="chkSOApplication2" dlg:checked="false">
+ <dlg:checkbox dlg:id="chkSOApplication2" dlg:tab-index="30" dlg:left="155" dlg:top="85" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKCALC" dlg:value="chkSOApplication2" dlg:checked="false">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkSOApplication3" dlg:tab-index="31" dlg:left="12" dlg:top="98" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34598" dlg:value="chkSOApplication3" dlg:checked="false">
+ <dlg:checkbox dlg:id="chkSOApplication3" dlg:tab-index="31" dlg:left="12" dlg:top="98" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS" dlg:value="chkSOApplication3" dlg:checked="false">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkSOApplication4" dlg:tab-index="32" dlg:left="155" dlg:top="98" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:34599" dlg:value="chkSOApplication4" dlg:checked="false">
+ <dlg:checkbox dlg:id="chkSOApplication4" dlg:tab-index="32" dlg:left="155" dlg:top="98" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL" dlg:value="chkSOApplication4" dlg:checked="false">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkMSApplication1" dlg:tab-index="33" dlg:disabled="true" dlg:left="12" dlg:top="126" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34578" dlg:value="chkMSApplication1" dlg:checked="false">
+ <dlg:checkbox dlg:id="chkMSApplication1" dlg:tab-index="33" dlg:disabled="true" dlg:left="12" dlg:top="126" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKWORD" dlg:value="chkMSApplication1" dlg:checked="false">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkMSApplication2" dlg:tab-index="34" dlg:disabled="true" dlg:left="155" dlg:top="126" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:34579" dlg:value="chkMSApplication2" dlg:checked="false">
+ <dlg:checkbox dlg:id="chkMSApplication2" dlg:tab-index="34" dlg:disabled="true" dlg:left="155" dlg:top="126" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKEXCEL" dlg:value="chkMSApplication2" dlg:checked="false">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkMSApplication3" dlg:tab-index="35" dlg:disabled="true" dlg:left="12" dlg:top="139" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34580" dlg:value="chkMSApplication3" dlg:checked="false">
+ <dlg:checkbox dlg:id="chkMSApplication3" dlg:tab-index="35" dlg:disabled="true" dlg:left="12" dlg:top="139" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT" dlg:value="chkMSApplication3" dlg:checked="false">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
<dlg:text dlg:id="WelcomeTextLabel2" dlg:tab-index="36" dlg:disabled="true" dlg:left="6" dlg:top="152" dlg:width="258" dlg:height="18" dlg:page="1" dlg:value="WelcomeTextLabel2" dlg:multiline="true"/>
- <dlg:checkbox dlg:id="chkTemplatePath" dlg:tab-index="37" dlg:left="12" dlg:top="48" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Template" dlg:help-url="HID:34581" dlg:value="chkTemplatePath" dlg:checked="true">
+ <dlg:checkbox dlg:id="chkTemplatePath" dlg:tab-index="37" dlg:left="12" dlg:top="48" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Template" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE" dlg:value="chkTemplatePath" dlg:checked="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.ToggleInputPaths?language=Basic&amp;location=application" script:language="Script"/>
</dlg:checkbox>
- <dlg:checkbox dlg:id="chkTemplateSearchSubDir" dlg:tab-index="38" dlg:left="12" dlg:top="61" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:34582" dlg:value="chkTemplateSearchSubDir" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="chkTemplateSearchSubDir" dlg:tab-index="38" dlg:left="12" dlg:top="61" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE" dlg:value="chkTemplateSearchSubDir" dlg:checked="false"/>
<dlg:text dlg:id="lblTemplateImport" dlg:tab-index="39" dlg:left="12" dlg:top="78" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblTemplateImport"/>
- <dlg:checkbox dlg:id="chkLogfile" dlg:tab-index="40" dlg:left="6" dlg:top="171" dlg:width="136" dlg:height="9" dlg:page="1" dlg:help-url="HID:34577" dlg:value="chkLogfile" dlg:checked="true"/>
+ <dlg:checkbox dlg:id="chkLogfile" dlg:tab-index="40" dlg:left="6" dlg:top="171" dlg:width="136" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE" dlg:value="chkLogfile" dlg:checked="true"/>
<dlg:fixedline dlg:id="hlnTemplates" dlg:tab-index="41" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnTemplates"/>
<dlg:fixedline dlg:id="hlnDocuments" dlg:tab-index="42" dlg:left="6" dlg:top="110" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnDocuments"/>
<dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="43" dlg:left="6" dlg:top="181" dlg:width="258" dlg:height="6"/>
diff --git a/wizards/source/schedule/DlgCalendar.xdl b/wizards/source/schedule/DlgCalendar.xdl
index 7f1b68d89..2936a5ebe 100644
--- a/wizards/source/schedule/DlgCalendar.xdl
+++ b/wizards/source/schedule/DlgCalendar.xdl
@@ -1,64 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="1" dlg:help-url="HID:34700" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG" dlg:closeable="true" dlg:moveable="true">
<dlg:styles>
<dlg:style dlg:style-id="0" dlg:border="none"/>
<dlg:style dlg:style-id="1" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/>
<dlg:style dlg:style-id="2" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/>
</dlg:styles>
<dlg:bulletinboard>
- <dlg:menulist dlg:id="lstHolidays" dlg:tab-index="0" dlg:left="6" dlg:top="17" dlg:width="95" dlg:height="12" dlg:page="1" dlg:help-url="HID:34708" dlg:spin="true"/>
+ <dlg:menulist dlg:id="lstHolidays" dlg:tab-index="0" dlg:left="6" dlg:top="17" dlg:width="95" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE" dlg:spin="true"/>
<dlg:fixedline dlg:id="hlnCalendar" dlg:tab-index="1" dlg:left="6" dlg:top="36" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnCalendar"/>
<dlg:radiogroup>
- <dlg:radio dlg:id="optYear" dlg:tab-index="2" dlg:left="12" dlg:top="47" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34702" dlg:value="optYear">
+ <dlg:radio dlg:id="optYear" dlg:tab-index="2" dlg:left="12" dlg:top="47" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR" dlg:value="optYear">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalChooseCalendar?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optMonth" dlg:tab-index="3" dlg:left="12" dlg:top="61" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34703" dlg:value="optMonth">
+ <dlg:radio dlg:id="optMonth" dlg:tab-index="3" dlg:left="12" dlg:top="61" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH" dlg:value="optMonth">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalChooseCalendar?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
</dlg:radiogroup>
<dlg:text dlg:id="lblHolidays" dlg:tab-index="4" dlg:left="6" dlg:top="6" dlg:width="96" dlg:height="8" dlg:page="1" dlg:value="lblHolidays"/>
- <dlg:img dlg:style-id="0" dlg:id="imgCountry" dlg:tab-index="5" dlg:left="106" dlg:top="6" dlg:width="95" dlg:height="113" dlg:page="1" dlg:help-url="HID:34701">
+ <dlg:img dlg:style-id="0" dlg:id="imgCountry" dlg:tab-index="5" dlg:left="106" dlg:top="6" dlg:width="95" dlg:height="113" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW">
<script:event script:event-name="on-mousedown" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.SelectState?language=Basic&amp;location=application" script:language="Script"/>
<script:event script:event-name="on-mouseout" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.MouseLeavesImage?language=Basic&amp;location=application" script:language="Script"/>
<script:event script:event-name="on-mousemove" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalMouseMoved?language=Basic&amp;location=application" script:language="Script"/>
</dlg:img>
<dlg:fixedline dlg:id="hlnTime" dlg:tab-index="6" dlg:left="5" dlg:top="78" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnTime"/>
- <dlg:menulist dlg:id="lstMonth" dlg:tab-index="7" dlg:left="62" dlg:top="106" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34705" dlg:spin="true"/>
+ <dlg:menulist dlg:id="lstMonth" dlg:tab-index="7" dlg:left="62" dlg:top="106" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH" dlg:spin="true"/>
<dlg:text dlg:id="lblYear" dlg:tab-index="8" dlg:left="12" dlg:top="91" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblYear"/>
<dlg:text dlg:id="lblMonth" dlg:tab-index="9" dlg:left="12" dlg:top="108" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblMonth"/>
<dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="10" dlg:left="6" dlg:top="125" dlg:width="196" dlg:height="4"/>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="6" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34721" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="6" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalcmdCancel?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdOwnData" dlg:tab-index="12" dlg:left="99" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34720" dlg:value="cmdOwnData">
+ <dlg:button dlg:id="cmdOwnData" dlg:tab-index="12" dlg:left="99" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA" dlg:value="cmdOwnData">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalmdSwitchOwnDataOrGeneral?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdGoOn" dlg:tab-index="13" dlg:left="152" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34722" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="13" dlg:left="152" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" dlg:value="cmdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalcmdOk?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:text dlg:id="lblEvent" dlg:tab-index="14" dlg:left="12" dlg:top="17" dlg:width="67" dlg:height="8" dlg:page="2" dlg:value="lblEvent"/>
<dlg:fixedline dlg:id="hlnNewEvent" dlg:tab-index="15" dlg:left="6" dlg:top="6" dlg:width="196" dlg:height="8" dlg:page="2" dlg:value="hlnNewEvent"/>
- <dlg:textfield dlg:style-id="1" dlg:id="txtEvent" dlg:tab-index="16" dlg:left="12" dlg:top="28" dlg:width="107" dlg:height="12" dlg:page="2" dlg:help-url="HID:34712">
+ <dlg:textfield dlg:style-id="1" dlg:id="txtEvent" dlg:tab-index="16" dlg:left="12" dlg:top="28" dlg:width="107" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.CheckInsertedDates?language=Basic&amp;location=application" script:language="Script"/>
</dlg:textfield>
- <dlg:numericfield dlg:id="txtOwnEventDay" dlg:tab-index="17" dlg:left="13" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34714" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true">
+ <dlg:numericfield dlg:id="txtOwnEventDay" dlg:tab-index="17" dlg:left="13" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.CheckInsertedDates?language=Basic&amp;location=application" script:language="Script"/>
</dlg:numericfield>
- <dlg:menulist dlg:id="lstOwnEventMonth" dlg:tab-index="18" dlg:left="60" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34716" dlg:spin="true">
+ <dlg:menulist dlg:id="lstOwnEventMonth" dlg:tab-index="18" dlg:left="60" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH" dlg:spin="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.GetOwnMonth?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
- <dlg:button dlg:id="cmdInsert" dlg:tab-index="19" dlg:left="99" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34710" dlg:value="cmdInsert">
+ <dlg:button dlg:id="cmdInsert" dlg:tab-index="19" dlg:left="99" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT" dlg:value="cmdInsert">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.CalcmdInsertData?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdDelete" dlg:tab-index="20" dlg:left="152" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34711" dlg:value="cmdDelete">
+ <dlg:button dlg:id="cmdDelete" dlg:tab-index="20" dlg:left="152" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE" dlg:value="cmdDelete">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalcmdDeleteSelect?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:menulist dlg:style-id="2" dlg:id="lstOwnData" dlg:tab-index="21" dlg:left="12" dlg:top="86" dlg:width="190" dlg:height="34" dlg:page="2" dlg:help-url="HID:34709">
+ <dlg:menulist dlg:style-id="2" dlg:id="lstOwnData" dlg:tab-index="21" dlg:left="12" dlg:top="86" dlg:width="190" dlg:height="34" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalUpdateNewEventFrame?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
<dlg:text dlg:id="lblEventDay" dlg:tab-index="22" dlg:left="12" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventDay"/>
<dlg:text dlg:id="lblEventMonth" dlg:tab-index="23" dlg:left="60" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventMonth"/>
- <dlg:numericfield dlg:id="txtYear" dlg:tab-index="24" dlg:left="62" dlg:top="89" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34704" dlg:decimal-accuracy="0" dlg:value-min="1582" dlg:value-max="9957" dlg:spin="true"/>
+ <dlg:numericfield dlg:id="txtYear" dlg:tab-index="24" dlg:left="62" dlg:top="89" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR" dlg:decimal-accuracy="0" dlg:value-min="1582" dlg:value-max="9957" dlg:spin="true"/>
</dlg:bulletinboard>
</dlg:window> \ No newline at end of file
diff --git a/wizards/source/template/DialogStyles.xdl b/wizards/source/template/DialogStyles.xdl
index a28beb14c..35042849c 100644
--- a/wizards/source/template/DialogStyles.xdl
+++ b/wizards/source/template/DialogStyles.xdl
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogStyles" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169" dlg:help-url="HID:34650" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogStyles" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_DIALOG" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
- <dlg:button dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:help-url="HID:34652" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_CANCEL" dlg:value="cmdCancel">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Template.Samples.RestoreCurrentStyles?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:button dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:help-url="HID:34653" dlg:value="cmdOk">
+ <dlg:button dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_OKAY" dlg:value="cmdOk">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Template.Samples.CloseStyleDialog?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
- <dlg:menulist dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133" dlg:help-url="HID:34651">
+ <dlg:menulist dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_LISTBOX">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Template.Samples.SelectStyle?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
</dlg:bulletinboard>
diff --git a/wizards/source/template/TemplateDialog.xdl b/wizards/source/template/TemplateDialog.xdl
index eb4cc6969..4b8633f23 100644
--- a/wizards/source/template/TemplateDialog.xdl
+++ b/wizards/source/template/TemplateDialog.xdl
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="TemplateDialog" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1" dlg:help-url="HID:34630" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="TemplateDialog" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_DIALOG" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
<dlg:radiogroup>
- <dlg:radio dlg:id="OptAgenda1" dlg:tab-index="0" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP2;PT1" dlg:help-url="HID:34632" dlg:value="OptAgenda1">
+ <dlg:radio dlg:id="OptAgenda1" dlg:tab-index="0" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP2;PT1" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1" dlg:value="OptAgenda1">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Template.ModuleAgenda.GetOptionValues?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="OptAgenda2" dlg:tab-index="1" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP1;PT2" dlg:help-url="HID:34633" dlg:value="OptAgenda2">
+ <dlg:radio dlg:id="OptAgenda2" dlg:tab-index="1" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP1;PT2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2" dlg:value="OptAgenda2">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Template.ModuleAgenda.GetOptionValues?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
</dlg:radiogroup>
- <dlg:button dlg:id="CmdCorrGoOn" dlg:tab-index="2" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34637" dlg:value="CmdCorrGoOn">
+ <dlg:button dlg:id="CmdCorrGoOn" dlg:tab-index="2" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY" dlg:value="CmdCorrGoOn">
<script:event script:event-name="on-performaction" script:macro-name="Template.Correspondence.OK" script:language="StarBasic"/>
</dlg:button>
<dlg:radiogroup>
- <dlg:radio dlg:id="OptSingle" dlg:tab-index="3" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:34635" dlg:value="OptSingle"/>
- <dlg:radio dlg:id="Optmerge" dlg:tab-index="4" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:34636" dlg:value="Optmerge"/>
+ <dlg:radio dlg:id="OptSingle" dlg:tab-index="3" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1" dlg:value="OptSingle"/>
+ <dlg:radio dlg:id="Optmerge" dlg:tab-index="4" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2" dlg:value="Optmerge"/>
</dlg:radiogroup>
- <dlg:button dlg:id="CmdAgdGoon" dlg:tab-index="5" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="1" dlg:help-url="HID:34634" dlg:value="CmdAgdGoOn">
+ <dlg:button dlg:id="CmdAgdGoon" dlg:tab-index="5" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY" dlg:value="CmdAgdGoOn">
<script:event script:event-name="on-performaction" script:macro-name="Template.ModuleAgenda.ModifyTemplate" script:language="StarBasic"/>
</dlg:button>
- <dlg:button dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" dlg:height="14" dlg:help-url="HID:34631" dlg:value="CmdCancel" dlg:button-type="cancel">
+ <dlg:button dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL" dlg:value="CmdCancel" dlg:button-type="cancel">
<script:event script:event-name="on-performaction" script:macro-name="Template.ModuleAgenda.DisposeDocument" script:language="StarBasic"/>
</dlg:button>
<dlg:fixedline dlg:id="FrmLetter" dlg:tab-index="7" dlg:left="6" dlg:top="6" dlg:width="150" dlg:height="10" dlg:page="2" dlg:value="FrmLetter"/>
diff --git a/wizards/source/webwizard/WebWzrd.xdl b/wizards/source/webwizard/WebWzrd.xdl
index be1bec77e..ac826e242 100644
--- a/wizards/source/webwizard/WebWzrd.xdl
+++ b/wizards/source/webwizard/WebWzrd.xdl
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="WebWzrd" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:help-url="HID:34200" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="WebWzrd" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:help-url="HID:WIZARDS_HID0_WEBWIZARD" dlg:closeable="true" dlg:moveable="true">
<dlg:bulletinboard>
- <dlg:button dlg:id="cbCancel" dlg:tab-index="0" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34206" dlg:value="Cancel" dlg:button-type="cancel"/>
- <dlg:button dlg:id="cbHelp" dlg:tab-index="1" dlg:left="66" dlg:top="190" dlg:width="50" dlg:height="14" dlg:tag="HID:34200" dlg:value="cbHelp" dlg:button-type="help"/>
- <dlg:button dlg:id="cbGoOn" dlg:tab-index="2" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34205" dlg:default="true" dlg:value="cbGoOn" dlg:button-type="ok"/>
+ <dlg:button dlg:id="cbCancel" dlg:tab-index="0" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID0_STATUS_DIALOG" dlg:value="Cancel" dlg:button-type="cancel"/>
+ <dlg:button dlg:id="cbHelp" dlg:tab-index="1" dlg:left="66" dlg:top="190" dlg:width="50" dlg:height="14" dlg:tag="HID:WIZARDS_HID0_WEBWIZARD" dlg:value="cbHelp" dlg:button-type="help"/>
+ <dlg:button dlg:id="cbGoOn" dlg:tab-index="2" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID0_CANCEL" dlg:default="true" dlg:value="cbGoOn" dlg:button-type="ok"/>
<dlg:img dlg:id="ImagePreview" dlg:tab-index="3" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26" dlg:scale-image="false"/>
- <dlg:menulist dlg:id="lbTemplate" dlg:tab-index="4" dlg:left="6" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:34201">
+ <dlg:menulist dlg:id="lbTemplate" dlg:tab-index="4" dlg:left="6" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:WIZARDS_HID0_HELP">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:WebWizard.HtmlAutoPilotBasic.ReloadCurrentDocument?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
- <dlg:menulist dlg:id="lbStyles" dlg:tab-index="5" dlg:left="154" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:34202">
+ <dlg:menulist dlg:id="lbStyles" dlg:tab-index="5" dlg:left="154" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:WIZARDS_HID0_NEXT">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:WebWizard.HtmlAutoPilotBasic.LoadWebPageStyles?language=Basic&amp;location=application" script:language="Script"/>
</dlg:menulist>
<dlg:text dlg:id="lblTemplate" dlg:tab-index="6" dlg:left="6" dlg:top="42" dlg:width="110" dlg:height="10"/>
<dlg:text dlg:id="lblStyle" dlg:tab-index="7" dlg:left="154" dlg:top="42" dlg:width="110" dlg:height="10" dlg:value="lblStyle"/>
- <dlg:checkbox dlg:id="chkSaveasTemplate" dlg:tab-index="8" dlg:left="6" dlg:top="164" dlg:width="110" dlg:height="12" dlg:help-url="HID:34207" dlg:value="chkSaveasTemplate" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="chkSaveasTemplate" dlg:tab-index="8" dlg:left="6" dlg:top="164" dlg:width="110" dlg:height="12" dlg:help-url="HID:WIZARDS_HID1_LST_SESSIONS" dlg:value="chkSaveasTemplate" dlg:checked="false"/>
<dlg:radiogroup>
<dlg:radio dlg:id="optTiled" dlg:tab-index="9" dlg:left="161" dlg:top="164" dlg:width="96" dlg:height="10" dlg:tag="11" dlg:help-url="HID:34208" dlg:value="optTiled" dlg:checked="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optArea" dlg:tab-index="10" dlg:left="161" dlg:top="177" dlg:width="96" dlg:height="10" dlg:tag="10" dlg:help-url="HID:34209" dlg:value="optArea">
+ <dlg:radio dlg:id="optArea" dlg:tab-index="10" dlg:left="161" dlg:top="177" dlg:width="96" dlg:height="10" dlg:tag="10" dlg:help-url="HID:WIZARDS_HID1_BTN_DEL_SES" dlg:value="optArea">
<script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="WebWizard.HtmlAutoPilotBasic.SetBackGraphicStyle" script:language="StarBasic"/>
</dlg:radio>
</dlg:radiogroup>
diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h
new file mode 100644
index 000000000..c0376f962
--- /dev/null
+++ b/wizards/util/helpids.h
@@ -0,0 +1,859 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+//two ranges available:
+//34200 - 34767
+//40768 - 42767
+
+/*
+ * web wizard : 34200 - 34319
+ * report wizard : 34320 - 34399
+ * others to be listed...
+ *
+ * web wizard (cont.) : 41000 - 41050
+ * agenda wizard : 41051 - 41099
+ */
+
+
+// ***************
+// WEB WIZARD
+// 34200 - 34319
+// 41000 - 41050
+// ***************
+//webwizardgeneralcontrols
+
+#define HID0_WEBWIZARD "WIZARDS_HID0_WEBWIZARD"
+#define HID0_HELP "WIZARDS_HID0_HELP"
+#define HID0_NEXT "WIZARDS_HID0_NEXT"
+#define HID0_PREV "WIZARDS_HID0_PREV"
+#define HID0_CREATE "WIZARDS_HID0_CREATE"
+#define HID0_CANCEL "WIZARDS_HID0_CANCEL"
+#define HID0_STATUS_DIALOG "WIZARDS_HID0_STATUS_DIALOG"
+
+
+//step1
+#define HID1_LST_SESSIONS "WIZARDS_HID1_LST_SESSIONS"
+#define HID1_BTN_DEL_SES "WIZARDS_HID1_BTN_DEL_SES"
+
+//step2
+#define HID2_LST_DOCS "WIZARDS_HID2_LST_DOCS"
+#define HID2_BTN_ADD_DOC "WIZARDS_HID2_BTN_ADD_DOC"
+#define HID2_BTN_REM_DOC "WIZARDS_HID2_BTN_REM_DOC"
+#define HID2_BTN_DOC_UP "WIZARDS_HID2_BTN_DOC_UP"
+#define HID2_BTN_DOC_DOWN "WIZARDS_HID2_BTN_DOC_DOWN"
+#define HID2_TXT_DOC_TITLE "WIZARDS_HID2_TXT_DOC_TITLE"
+#define HID2_TXT_DOC_DESC "WIZARDS_HID2_TXT_DOC_DESC"
+#define HID2_TXT_DOC_AUTHOR "WIZARDS_HID2_TXT_DOC_AUTHOR"
+#define HID2_LST_DOC_EXPORT "WIZARDS_HID2_LST_DOC_EXPORT"
+#define HID2_STATUS_ADD_DOCS "WIZARDS_HID2_STATUS_ADD_DOCS"
+
+//step3
+#define HID3_IL_LAYOUTS_IMG1 "WIZARDS_HID3_IL_LAYOUTS_IMG1"
+#define HID3_IL_LAYOUTS_IMG2 "WIZARDS_HID3_IL_LAYOUTS_IMG2"
+#define HID3_IL_LAYOUTS_IMG3 "WIZARDS_HID3_IL_LAYOUTS_IMG3"
+#define HID3_IL_LAYOUTS_IMG4 "WIZARDS_HID3_IL_LAYOUTS_IMG4"
+#define HID3_IL_LAYOUTS_IMG5 "WIZARDS_HID3_IL_LAYOUTS_IMG5"
+#define HID3_IL_LAYOUTS_IMG6 "WIZARDS_HID3_IL_LAYOUTS_IMG6"
+#define HID3_IL_LAYOUTS_IMG7 "WIZARDS_HID3_IL_LAYOUTS_IMG7"
+#define HID3_IL_LAYOUTS_IMG8 "WIZARDS_HID3_IL_LAYOUTS_IMG8"
+#define HID3_IL_LAYOUTS_IMG9 "WIZARDS_HID3_IL_LAYOUTS_IMG9"
+#define HID3_IL_LAYOUTS_IMG10 "WIZARDS_HID3_IL_LAYOUTS_IMG10"
+#define HID3_IL_LAYOUTS_IMG11 "WIZARDS_HID3_IL_LAYOUTS_IMG11"
+#define HID3_IL_LAYOUTS_IMG12 "WIZARDS_HID3_IL_LAYOUTS_IMG12"
+#define HID3_IL_LAYOUTS_IMG13 "WIZARDS_HID3_IL_LAYOUTS_IMG13"
+#define HID3_IL_LAYOUTS_IMG14 "WIZARDS_HID3_IL_LAYOUTS_IMG14"
+#define HID3_IL_LAYOUTS_IMG15 "WIZARDS_HID3_IL_LAYOUTS_IMG15"
+
+//step4
+#define HID4_CHK_DISPLAY_FILENAME "WIZARDS_HID4_CHK_DISPLAY_FILENAME"
+#define HID4_CHK_DISPLAY_DESCRIPTION "WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION"
+#define HID4_CHK_DISPLAY_AUTHOR "WIZARDS_HID4_CHK_DISPLAY_AUTHOR"
+#define HID4_CHK_DISPLAY_CR_DATE "WIZARDS_HID4_CHK_DISPLAY_CR_DATE"
+#define HID4_CHK_DISPLAY_UP_DATE "WIZARDS_HID4_CHK_DISPLAY_UP_DATE"
+#define HID4_CHK_DISPLAY_FORMAT "WIZARDS_HID4_CHK_DISPLAY_FORMAT"
+#define HID4_CHK_DISPLAY_F_ICON "WIZARDS_HID4_CHK_DISPLAY_F_ICON"
+#define HID4_CHK_DISPLAY_PAGES "WIZARDS_HID4_CHK_DISPLAY_PAGES"
+#define HID4_CHK_DISPLAY_SIZE "WIZARDS_HID4_CHK_DISPLAY_SIZE"
+
+#define HID4_GRP_OPTIMAIZE_640 "WIZARDS_HID4_GRP_OPTIMAIZE_640"
+#define HID4_GRP_OPTIMAIZE_800 "WIZARDS_HID4_GRP_OPTIMAIZE_800"
+#define HID4_GRP_OPTIMAIZE_1024 "WIZARDS_HID4_GRP_OPTIMAIZE_1024"
+
+
+//step5
+#define HID5_LST_STYLES "WIZARDS_HID5_LST_STYLES"
+#define HID5_BTN_BACKGND "WIZARDS_HID5_BTN_BACKGND"
+#define HID5_BTN_ICONS "WIZARDS_HID5_BTN_ICONS"
+
+//step6
+#define HID6_TXT_SITE_TITLE "WIZARDS_HID6_TXT_SITE_TITLE"
+#define HID6_TXT_SITE_DESC "WIZARDS_HID6_TXT_SITE_DESC"
+#define HID6_DATE_SITE_CREATED "WIZARDS_HID6_DATE_SITE_CREATED"
+#define HID6_DATE_SITE_UPDATED "WIZARDS_HID6_DATE_SITE_UPDATED"
+#define HID6_TXT_SITE_EMAIL "WIZARDS_HID6_TXT_SITE_EMAIL"
+#define HID6_TXT_SITE_COPYRIGHT "WIZARDS_HID6_TXT_SITE_COPYRIGHT"
+
+//step7
+#define HID7_BTN_PREVIEW "WIZARDS_HID7_BTN_PREVIEW"
+#define HID7_CHK_PUBLISH_LOCAL "WIZARDS_HID7_CHK_PUBLISH_LOCAL"
+#define HID7_TXT_LOCAL "WIZARDS_HID7_TXT_LOCAL"
+#define HID7_BTN_LOCAL "WIZARDS_HID7_BTN_LOCAL"
+#define HID7_CHK_PUBLISH_ZIP "WIZARDS_HID7_CHK_PUBLISH_ZIP"
+#define HID7_TXT_ZIP "WIZARDS_HID7_TXT_ZIP"
+#define HID7_BTN_ZIP "WIZARDS_HID7_BTN_ZIP"
+#define HID7_CHK_PUBLISH_FTP "WIZARDS_HID7_CHK_PUBLISH_FTP"
+#define HID7_TXT_FTP "WIZARDS_HID7_TXT_FTP"
+#define HID7_BTN_FTP "WIZARDS_HID7_BTN_FTP"
+#define HID7_CHK_SAVE "WIZARDS_HID7_CHK_SAVE"
+#define HID7_TXT_SAVE "WIZARDS_HID7_TXT_SAVE"
+
+//web wizard backgrounds dialog
+#define HID_BG "WIZARDS_HID_BG"
+#define HID_BG_BTN_OTHER "WIZARDS_HID_BG_BTN_OTHER"
+#define HID_BG_BTN_NONE "WIZARDS_HID_BG_BTN_NONE"
+#define HID_BG_BTN_OK "WIZARDS_HID_BG_BTN_OK"
+#define HID_BG_BTN_CANCEL "WIZARDS_HID_BG_BTN_CANCEL"
+
+#define HID_BG_BTN_BACK "WIZARDS_HID_BG_BTN_BACK"
+#define HID_BG_BTN_FW "WIZARDS_HID_BG_BTN_FW"
+#define HID_BG_BTN_IMG1 "WIZARDS_HID_BG_BTN_IMG1"
+#define HID_BG_BTN_IMG2 "WIZARDS_HID_BG_BTN_IMG2"
+#define HID_BG_BTN_IMG3 "WIZARDS_HID_BG_BTN_IMG3"
+#define HID_BG_BTN_IMG4 "WIZARDS_HID_BG_BTN_IMG4"
+#define HID_BG_BTN_IMG5 "WIZARDS_HID_BG_BTN_IMG5"
+#define HID_BG_BTN_IMG6 "WIZARDS_HID_BG_BTN_IMG6"
+#define HID_BG_BTN_IMG7 "WIZARDS_HID_BG_BTN_IMG7"
+#define HID_BG_BTN_IMG8 "WIZARDS_HID_BG_BTN_IMG8"
+#define HID_BG_BTN_IMG9 "WIZARDS_HID_BG_BTN_IMG9"
+#define HID_BG_BTN_IMG10 "WIZARDS_HID_BG_BTN_IMG10"
+#define HID_BG_BTN_IMG11 "WIZARDS_HID_BG_BTN_IMG11"
+#define HID_BG_BTN_IMG12 "WIZARDS_HID_BG_BTN_IMG12"
+#define HID_BG_BTN_IMG13 "WIZARDS_HID_BG_BTN_IMG13"
+#define HID_BG_BTN_IMG14 "WIZARDS_HID_BG_BTN_IMG14"
+#define HID_BG_BTN_IMG15 "WIZARDS_HID_BG_BTN_IMG15"
+#define HID_BG_BTN_IMG16 "WIZARDS_HID_BG_BTN_IMG16"
+
+// ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// Note: Web Wizard continues on 41000 later in this file.
+// ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+// *************
+// REPORT WIZARD
+// *************
+
+#define HID_DLGREPORT_DIALOG "WIZARDS_HID_DLGREPORT_DIALOG"
+#define HID_DLGREPORT_0_CMDPREV "WIZARDS_HID_DLGREPORT_0_CMDPREV"
+#define HID_DLGREPORT_0_CMDNEXT "WIZARDS_HID_DLGREPORT_0_CMDNEXT"
+#define HID_DLGREPORT_0_CMDFINISH "WIZARDS_HID_DLGREPORT_0_CMDFINISH"
+#define HID_DLGREPORT_0_CMDCANCEL "WIZARDS_HID_DLGREPORT_0_CMDCANCEL"
+
+#define HID_DLGREPORT_1_LBTABLES "WIZARDS_HID_DLGREPORT_1_LBTABLES"
+#define HID_DLGREPORT_1_FIELDSAVAILABLE "WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE"
+#define HID_DLGREPORT_1_CMDMOVESELECTED "WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED"
+#define HID_DLGREPORT_1_CMDMOVEALL "WIZARDS_HID_DLGREPORT_1_CMDMOVEALL"
+#define HID_DLGREPORT_1_CMDREMOVESELECTED "WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED"
+#define HID_DLGREPORT_1_CMDREMOVEALL "WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL"
+#define HID_DLGREPORT_1_FIELDSSELECTED "WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED"
+#define HID_DLGREPORT_1_CMDMOVEUP "WIZARDS_HID_DLGREPORT_1_CMDMOVEUP"
+#define HID_DLGREPORT_1_CMDMOVEDOWN "WIZARDS_HID_DLGREPORT_1_CMDMOVEDOWN"
+
+
+#define HID_DLGREPORT_2_GROUPING "WIZARDS_HID_DLGREPORT_2_GROUPING"
+#define HID_DLGREPORT_2_CMDGROUP "WIZARDS_HID_DLGREPORT_2_CMDGROUP"
+#define HID_DLGREPORT_2_CMDUNGROUP "WIZARDS_HID_DLGREPORT_2_CMDUNGROUP"
+#define HID_DLGREPORT_2_PREGROUPINGDEST "WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST"
+#define HID_DLGREPORT_2_CMDMOVEUPGROUP "WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP"
+#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP "WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP"
+
+
+#define HID_DLGREPORT_3_SORT1 "WIZARDS_HID_DLGREPORT_3_SORT1"
+#define HID_DLGREPORT_3_OPTASCEND1 "WIZARDS_HID_DLGREPORT_3_OPTASCEND1"
+#define HID_DLGREPORT_3_OPTDESCEND1 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND1"
+#define HID_DLGREPORT_3_SORT2 "WIZARDS_HID_DLGREPORT_3_SORT2"
+#define HID_DLGREPORT_3_OPTASCEND2 "WIZARDS_HID_DLGREPORT_3_OPTASCEND2"
+#define HID_DLGREPORT_3_OPTDESCEND2 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND2"
+#define HID_DLGREPORT_3_SORT3 "WIZARDS_HID_DLGREPORT_3_SORT3"
+#define HID_DLGREPORT_3_OPTASCEND3 "WIZARDS_HID_DLGREPORT_3_OPTASCEND3"
+#define HID_DLGREPORT_3_OPTDESCEND3 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND3"
+#define HID_DLGREPORT_3_SORT4 "WIZARDS_HID_DLGREPORT_3_SORT4"
+#define HID_DLGREPORT_3_OPTASCEND4 "WIZARDS_HID_DLGREPORT_3_OPTASCEND4"
+#define HID_DLGREPORT_3_OPTDESCEND4 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND4"
+
+#define HID_DLGREPORT_4_TITLE "WIZARDS_HID_DLGREPORT_4_TITLE"
+#define HID_DLGREPORT_4_DATALAYOUT "WIZARDS_HID_DLGREPORT_4_DATALAYOUT"
+#define HID_DLGREPORT_4_PAGELAYOUT "WIZARDS_HID_DLGREPORT_4_PAGELAYOUT"
+#define HID_DLGREPORT_4_LANDSCAPE "WIZARDS_HID_DLGREPORT_4_LANDSCAPE"
+#define HID_DLGREPORT_4_PORTRAIT "WIZARDS_HID_DLGREPORT_4_PORTRAIT"
+
+#define HID_DLGREPORT_5_OPTDYNTEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE"
+#define HID_DLGREPORT_5_OPTSTATDOCUMENT "WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT"
+#define HID_DLGREPORT_5_TXTTEMPLATEPATH "WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH"
+#define HID_DLGREPORT_5_CMDTEMPLATEPATH "WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH"
+#define HID_DLGREPORT_5_OPTEDITTEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE"
+#define HID_DLGREPORT_5_OPTUSETEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE"
+#define HID_DLGREPORT_5_TXTDOCUMENTPATH "WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH"
+#define HID_DLGREPORT_5_CMDDOCUMENTPATH "WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH"
+#define HID_DLGREPORT_5_CHKLINKTODB "WIZARDS_HID_DLGREPORT_5_CHKLINKTODB"
+#define HID_DLGREPORT_6_TXTTITLE_1 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_1"
+#define HID_DLGREPORT_6_TXTTITLE_2 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_2"
+#define HID_DLGREPORT_6_TXTTITLE_3 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_3"
+#define HID_DLGREPORT_6_TXTTITLE_4 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_4"
+#define HID_DLGREPORT_6_TXTTITLE_5 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_5"
+#define HID_DLGREPORT_6_TXTTITLE_6 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_6"
+#define HID_DLGREPORT_6_TXTTITLE_7 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_7"
+
+
+/* ====================================
+ * FormWizard
+ * ====================================
+ */
+
+
+#define HID_DLGFORM_DIALOG "WIZARDS_HID_DLGFORM_DIALOG"
+#define HID_DLGFORM_CMDPREV "WIZARDS_HID_DLGFORM_CMDPREV"
+#define HID_DLGFORM_CMDNEXT "WIZARDS_HID_DLGFORM_CMDNEXT"
+#define HID_DLGFORM_CMDFINISH "WIZARDS_HID_DLGFORM_CMDFINISH"
+#define HID_DLGFORM_CMDCANCEL "WIZARDS_HID_DLGFORM_CMDCANCEL"
+
+#define HID_DLGFORM_MASTER_LBTABLES "WIZARDS_HID_DLGFORM_MASTER_LBTABLES"
+#define HID_DLGFORM_MASTER_FIELDSAVAILABLE "WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE"
+#define HID_DLGFORM_MASTER_CMDMOVESELECTED "WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED"
+#define HID_DLGFORM_MASTER_CMDMOVEALL "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL"
+#define HID_DLGFORM_MASTER_CMDREMOVESELECTED "WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED"
+#define HID_DLGFORM_MASTER_CMDREMOVEALL "WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL"
+#define HID_DLGFORM_MASTER_FIELDSSELECTED "WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED"
+#define HID_DLGFORM_MASTER_CMDMOVEUP "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP"
+#define HID_DLGFORM_MASTER_CMDMOVEDOWN "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN"
+
+
+#define HID_DLGFORM_CHKCREATESUBFORM "WIZARDS_HID_DLGFORM_CHKCREATESUBFORM"
+#define HID_DLGFORM_OPTONEXISTINGRELATION "WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION"
+#define HID_DLGFORM_OPTSELECTMANUALLY "WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY"
+#define HID_DLGFORM_lstRELATIONS "WIZARDS_HID_DLGFORM_lstRELATIONS"
+
+
+#define HID_DLGFORM_SUB_LBTABLES "WIZARDS_HID_DLGFORM_SUB_LBTABLES"
+#define HID_DLGFORM_SUB_FIELDSAVAILABLE "WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE"
+#define HID_DLGFORM_SUB_CMDMOVESELECTED "WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED"
+#define HID_DLGFORM_SUB_CMDMOVEALL "WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL"
+#define HID_DLGFORM_SUB_CMDREMOVESELECTED "WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED"
+#define HID_DLGFORM_SUB_CMDREMOVEALL "WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL"
+#define HID_DLGFORM_SUB_FIELDSSELECTED "WIZARDS_HID_DLGFORM_SUB_FIELDSSELECTED"
+#define HID_DLGFORM_SUB_CMDMOVEUP "WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP"
+#define HID_DLGFORM_SUB_CMDMOVEDOWN "WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN"
+
+
+#define HID_DLGFORM_LINKER_LSTSLAVELINK1 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1"
+#define HID_DLGFORM_LINKER_LSTMASTERLINK1 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1"
+#define HID_DLGFORM_LINKER_LSTSLAVELINK2 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2"
+#define HID_DLGFORM_LINKER_LSTMASTERLINK2 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2"
+#define HID_DLGFORM_LINKER_LSTSLAVELINK3 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3"
+#define HID_DLGFORM_LINKER_LSTMASTERLINK3 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3"
+#define HID_DLGFORM_LINKER_LSTSLAVELINK4 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4"
+#define HID_DLGFORM_LINKER_LSTMASTERLINK4 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4"
+
+#define HID_DLGFORM_CMDALIGNLEFT "WIZARDS_HID_DLGFORM_CMDALIGNLEFT"
+#define HID_DLGFORM_CMDALIGNRIGHT "WIZARDS_HID_DLGFORM_CMDALIGNRIGHT"
+
+
+#define HID_DLGFORM_CMDLEFTLABELED "WIZARDS_HID_DLGFORM_CMDLEFTLABELED"
+#define HID_DLGFORM_CMDTOPLABELED "WIZARDS_HID_DLGFORM_CMDTOPLABELED"
+#define HID_DLGFORM_CMDTABLESTYLE "WIZARDS_HID_DLGFORM_CMDTABLESTYLE"
+#define HID_DLGFORM_CMDTOPJUSTIFIED "WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED"
+
+#define HID_DLGFORM_CMDLEFTLABELED2 "WIZARDS_HID_DLGFORM_CMDLEFTLABELED2"
+#define HID_DLGFORM_CMDTOPLABELED2 "WIZARDS_HID_DLGFORM_CMDTOPLABELED2"
+#define HID_DLGFORM_CMDTABLESTYLE2 "WIZARDS_HID_DLGFORM_CMDTABLESTYLE2"
+#define HID_DLGFORM_CMDTOPJUSTIFIED2 "WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED2"
+
+#define HID_DLGFORM_OPTNEWDATAONLY "WIZARDS_HID_DLGFORM_OPTNEWDATAONLY"
+#define HID_DLGFORM_OPTDISPLAYALLDATA "WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA"
+#define HID_DLGFORM_CHKNOMODIFICATION "WIZARDS_HID_DLGFORM_CHKNOMODIFICATION"
+#define HID_DLGFORM_CHKNODELETION "WIZARDS_HID_DLGFORM_CHKNODELETION"
+#define HID_DLGFORM_CHKNOADDITION "WIZARDS_HID_DLGFORM_CHKNOADDITION"
+
+
+#define HID_DLGFORM_LSTSTYLES "WIZARDS_HID_DLGFORM_LSTSTYLES"
+#define HID_DLGFORM_CMDNOBORDER "WIZARDS_HID_DLGFORM_CMDNOBORDER"
+#define HID_DLGFORM_CMD3DBORDER "WIZARDS_HID_DLGFORM_CMD3DBORDER"
+#define HID_DLGFORM_CMDSIMPLEBORDER "WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER"
+
+#define HID_DLGFORM_TXTPATH "WIZARDS_HID_DLGFORM_TXTPATH"
+#define HID_DLGFORM_OPTWORKWITHFORM "WIZARDS_HID_DLGFORM_OPTWORKWITHFORM"
+#define HID_DLGFORM_OPTMODIFYFORM "WIZARDS_HID_DLGFORM_OPTMODIFYFORM"
+
+
+#define HID_DLGNEWSLTR_DIALOG "WIZARDS_HID_DLGNEWSLTR_DIALOG"
+#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT"
+#define HID_DLGNEWSLTR_OPTPARTYLAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT"
+#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT"
+#define HID_DLGNEWSLTR_OPTSINGLESIDED "WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED"
+#define HID_DLGNEWSLTR_OPTDOUBLESIDED "WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED"
+#define HID_DLGNEWSLTR_CMDGOON "WIZARDS_HID_DLGNEWSLTR_CMDGOON"
+
+
+#define HID_DLGDEPOT_DIALOG_SELLBUY "WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY"
+#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY "WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY"
+#define HID_DLGDEPOT_0_TXTQUANTITY "WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY"
+#define HID_DLGDEPOT_0_TXTRATE "WIZARDS_HID_DLGDEPOT_0_TXTRATE"
+#define HID_DLGDEPOT_0_TXTDATE "WIZARDS_HID_DLGDEPOT_0_TXTDATE"
+#define HID_DLGDEPOT_0_TXTCOMMISSION "WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION"
+#define HID_DLGDEPOT_0_TXTFIX "WIZARDS_HID_DLGDEPOT_0_TXTFIX"
+#define HID_DLGDEPOT_0_TXTMINIMUM "WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM"
+#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY"
+#define HID_DLGDEPOT_0_CMDGOON_SELLBUY "WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY"
+#define HID_DLGDEPOT_1_LSTSELLSTOCKS "WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS"
+#define HID_DLGDEPOT_2_LSTBUYSTOCKS "WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS"
+#define HID_DLGDEPOT_DIALOG_SPLIT "WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT"
+#define HID_DLGDEPOT_0_LSTSTOCKNAMES "WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES"
+#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT "WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT"
+#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT"
+#define HID_DLGDEPOT_0_CMDGOON_SPLIT "WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT"
+#define HID_DLGDEPOT_1_OPTPERSHARE "WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE"
+#define HID_DLGDEPOT_1_OPTTOTAL "WIZARDS_HID_DLGDEPOT_1_OPTTOTAL"
+#define HID_DLGDEPOT_1_TXTDIVIDEND "WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND"
+#define HID_DLGDEPOT_2_TXTOLDRATE "WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE"
+#define HID_DLGDEPOT_2_TXTNEWRATE "WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE"
+#define HID_DLGDEPOT_2_TXTDATE "WIZARDS_HID_DLGDEPOT_2_TXTDATE"
+#define HID_DLGDEPOT_3_TXTSTARTDATE "WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE"
+#define HID_DLGDEPOT_3_TXTENDDATE "WIZARDS_HID_DLGDEPOT_3_TXTENDDATE"
+#define HID_DLGDEPOT_3_OPTDAILY "WIZARDS_HID_DLGDEPOT_3_OPTDAILY"
+#define HID_DLGDEPOT_3_OPTWEEKLY "WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY"
+#define HID_DLGDEPOT_DIALOG_HISTORY "WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY"
+#define HID_DLGDEPOT_LSTMARKETS "WIZARDS_HID_DLGDEPOT_LSTMARKETS"
+#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY"
+#define HID_DLGDEPOT_0_CMDGOON_HISTORY "WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY"
+
+#define HID_DLGIMPORT_DIALOG "WIZARDS_HID_DLGIMPORT_DIALOG"
+#define HID_DLGIMPORT_0_CMDHELP "WIZARDS_HID_DLGIMPORT_0_CMDHELP"
+#define HID_DLGIMPORT_0_CMDCANCEL "WIZARDS_HID_DLGIMPORT_0_CMDCANCEL"
+#define HID_DLGIMPORT_0_CMDPREV "WIZARDS_HID_DLGIMPORT_0_CMDPREV"
+#define HID_DLGIMPORT_0_CMDNEXT "WIZARDS_HID_DLGIMPORT_0_CMDNEXT"
+#define HID_DLGIMPORT_0_OPTSODOCUMENTS "WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS"
+#define HID_DLGIMPORT_0_OPTMSDOCUMENTS "WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS"
+#define HID_DLGIMPORT_0_CHKLOGFILE "WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE"
+#define HID_DLGIMPORT_2_CHKWORD "WIZARDS_HID_DLGIMPORT_2_CHKWORD"
+#define HID_DLGIMPORT_2_CHKEXCEL "WIZARDS_HID_DLGIMPORT_2_CHKEXCEL"
+#define HID_DLGIMPORT_2_CHKPOWERPOINT "WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT"
+#define HID_DLGIMPORT_2_CBTEMPLATE "WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE"
+#define HID_DLGIMPORT_2_CBTEMPLATERECURSE "WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE"
+#define HID_DLGIMPORT_2_LBTEMPLATEPATH "WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH"
+#define HID_DLGIMPORT_2_EDTEMPLATEPATH "WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH"
+#define HID_DLGIMPORT_2_CBDOCUMENT "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT"
+#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT"
+#define HID_DLGIMPORT_2_CBDOCUMENT "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT"
+#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE"
+#define HID_DLGIMPORT_2_LBDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH"
+#define HID_DLGIMPORT_2_EDDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH"
+#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT"
+#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH"
+#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH"
+#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDEXPORTPATHSELECT"
+#define HID_DLGIMPORT_3_TBSUMMARY "WIZARDS_HID_DLGIMPORT_3_TBSUMMARY"
+
+#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 "WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2"
+#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 "WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2"
+
+
+#define HID_DLGIMPORT_0_CHKWRITER "WIZARDS_HID_DLGIMPORT_0_CHKWRITER"
+#define HID_DLGIMPORT_0_CHKCALC "WIZARDS_HID_DLGIMPORT_0_CHKCALC"
+#define HID_DLGIMPORT_0_CHKIMPRESS "WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS"
+#define HID_DLGIMPORT_0_CHKMATHGLOBAL "WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL"
+
+
+#define HID_DLGCORRESPONDENCE_DIALOG "WIZARDS_HID_DLGCORRESPONDENCE_DIALOG"
+#define HID_DLGCORRESPONDENCE_CANCEL "WIZARDS_HID_DLGCORRESPONDENCE_CANCEL"
+#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1"
+#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2"
+#define HID_DLGCORRESPONDENCE_AGENDAOKAY "WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY"
+#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1"
+#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2"
+#define HID_DLGCORRESPONDENCE_LETTEROKAY "WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY"
+
+#define HID_DLGSTYLES_DIALOG "WIZARDS_HID_DLGSTYLES_DIALOG"
+#define HID_DLGSTYLES_LISTBOX "WIZARDS_HID_DLGSTYLES_LISTBOX"
+#define HID_DLGSTYLES_CANCEL "WIZARDS_HID_DLGSTYLES_CANCEL"
+#define HID_DLGSTYLES_OKAY "WIZARDS_HID_DLGSTYLES_OKAY"
+
+#define HID_DLGCONVERT_DIALOG "WIZARDS_HID_DLGCONVERT_DIALOG"
+#define HID_DLGCONVERT_CHECKBOX1 "WIZARDS_HID_DLGCONVERT_CHECKBOX1"
+#define HID_DLGCONVERT_OPTIONBUTTON1 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1"
+#define HID_DLGCONVERT_OPTIONBUTTON2 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2"
+#define HID_DLGCONVERT_OPTIONBUTTON3 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3"
+#define HID_DLGCONVERT_OPTIONBUTTON4 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4"
+#define HID_DLGCONVERT_LISTBOX1 "WIZARDS_HID_DLGCONVERT_LISTBOX1"
+#define HID_DLGCONVERT_OBFILE "WIZARDS_HID_DLGCONVERT_OBFILE"
+#define HID_DLGCONVERT_OBDIR "WIZARDS_HID_DLGCONVERT_OBDIR"
+#define HID_DLGCONVERT_COMBOBOX1 "WIZARDS_HID_DLGCONVERT_COMBOBOX1"
+#define HID_DLGCONVERT_TBSOURCE "WIZARDS_HID_DLGCONVERT_TBSOURCE"
+#define HID_DLGCONVERT_CHECKRECURSIVE "WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE"
+#define HID_DLGCONVERT_TBTARGET "WIZARDS_HID_DLGCONVERT_TBTARGET"
+#define HID_DLGCONVERT_CBCANCEL "WIZARDS_HID_DLGCONVERT_CBCANCEL"
+#define HID_DLGCONVERT_CBHELP "WIZARDS_HID_DLGCONVERT_CBHELP"
+#define HID_DLGCONVERT_CBBACK "WIZARDS_HID_DLGCONVERT_CBBACK"
+#define HID_DLGCONVERT_CBGOON "WIZARDS_HID_DLGCONVERT_CBGOON"
+#define HID_DLGCONVERT_CBSOURCEOPEN "WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN"
+#define HID_DLGCONVERT_CBTARGETOPEN "WIZARDS_HID_DLGCONVERT_CBTARGETOPEN"
+#define HID_DLGCONVERT_CHKPROTECT "WIZARDS_HID_DLGCONVERT_CHKPROTECT"
+#define HID_DLGCONVERT_CHKTEXTDOCUMENTS "WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS"
+
+#define HID_DLGPASSWORD_CMDGOON "WIZARDS_HID_DLGPASSWORD_CMDGOON"
+#define HID_DLGPASSWORD_CMDCANCEL "WIZARDS_HID_DLGPASSWORD_CMDCANCEL"
+#define HID_DLGPASSWORD_CMDHELP "WIZARDS_HID_DLGPASSWORD_CMDHELP"
+#define HID_DLGPASSWORD_TXTPASSWORD "WIZARDS_HID_DLGPASSWORD_TXTPASSWORD"
+
+#define HID_DLGHOLIDAYCAL_DIALOG "WIZARDS_HID_DLGHOLIDAYCAL_DIALOG"
+#define HID_DLGHOLIDAYCAL_1_PREVIEW "WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW"
+#define HID_DLGHOLIDAYCAL_1_OPYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR"
+#define HID_DLGHOLIDAYCAL_1_OPMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH"
+#define HID_DLGHOLIDAYCAL_1_EDYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR"
+#define HID_DLGHOLIDAYCAL_1_EDMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH"
+#define HID_DLGHOLIDAYCAL_1_SPINYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_SPINYEAR"
+#define HID_DLGHOLIDAYCAL_1_SPINMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_SPINMONTH"
+#define HID_DLGHOLIDAYCAL_1_CMBSTATE "WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE"
+#define HID_DLGHOLIDAYCAL_2_LBOWNDATA "WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA"
+#define HID_DLGHOLIDAYCAL_2_CMDINSERT "WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT"
+#define HID_DLGHOLIDAYCAL_2_CMDDELETE "WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE"
+#define HID_DLGHOLIDAYCAL_2_EDEVENT "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT"
+#define HID_DLGHOLIDAYCAL_2_CHKEVENT "WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT"
+#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY"
+#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTDAY"
+#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH"
+#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH"
+#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR"
+#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR"
+#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA"
+#define HID_DLGHOLIDAYCAL_0_CMDCANCEL "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL"
+#define HID_DLGHOLIDAYCAL_0_CMDOK "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK"
+//End at 34767
+
+//Start at 40768
+
+//LetterWizard---------------------------
+
+#define HID_LTRWIZ_OPTBUSINESSLETTER "WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER"
+#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER "WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER"
+#define HID_LTRWIZ_OPTPRIVATELETTER "WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER"
+#define HID_LTRWIZ_LSTBUSINESSSTYLE "WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE"
+#define HID_LTRWIZ_CHKBUSINESSPAPER "WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER"
+#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE "WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE"
+#define HID_LTRWIZ_LSTPRIVATESTYLE "WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE"
+#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO "WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO"
+#define HID_LTRWIZ_NUMLOGOHEIGHT "WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT"
+#define HID_LTRWIZ_NUMLOGOX "WIZARDS_HID_LTRWIZ_NUMLOGOX"
+#define HID_LTRWIZ_NUMLOGOWIDTH "WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH"
+#define HID_LTRWIZ_NUMLOGOY "WIZARDS_HID_LTRWIZ_NUMLOGOY"
+#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS "WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS"
+#define HID_LTRWIZ_NUMADDRESSHEIGHT "WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT"
+#define HID_LTRWIZ_NUMADDRESSX "WIZARDS_HID_LTRWIZ_NUMADDRESSX"
+#define HID_LTRWIZ_NUMADDRESSWIDTH "WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH"
+#define HID_LTRWIZ_NUMADDRESSY "WIZARDS_HID_LTRWIZ_NUMADDRESSY"
+#define HID_LTRWIZ_CHKCOMPANYRECEIVER "WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER"
+#define HID_LTRWIZ_CHKPAPERFOOTER "WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER"
+#define HID_LTRWIZ_NUMFOOTERHEIGHT "WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT"
+#define HID_LTRWIZ_LSTLETTERNORM "WIZARDS_HID_LTRWIZ_LSTLETTERNORM"
+#define HID_LTRWIZ_CHKUSELOGO "WIZARDS_HID_LTRWIZ_CHKUSELOGO"
+#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER "WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER"
+#define HID_LTRWIZ_CHKUSESIGNS "WIZARDS_HID_LTRWIZ_CHKUSESIGNS"
+#define HID_LTRWIZ_CHKUSESUBJECT "WIZARDS_HID_LTRWIZ_CHKUSESUBJECT"
+#define HID_LTRWIZ_CHKUSESALUTATION "WIZARDS_HID_LTRWIZ_CHKUSESALUTATION"
+#define HID_LTRWIZ_LSTSALUTATION "WIZARDS_HID_LTRWIZ_LSTSALUTATION"
+#define HID_LTRWIZ_CHKUSEBENDMARKS "WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS"
+#define HID_LTRWIZ_CHKUSEGREETING "WIZARDS_HID_LTRWIZ_CHKUSEGREETING"
+#define HID_LTRWIZ_LSTGREETING "WIZARDS_HID_LTRWIZ_LSTGREETING"
+#define HID_LTRWIZ_CHKUSEFOOTER "WIZARDS_HID_LTRWIZ_CHKUSEFOOTER"
+#define HID_LTRWIZ_OPTSENDERPLACEHOLDER "WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER"
+#define HID_LTRWIZ_OPTSENDERDEFINE "WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE"
+#define HID_LTRWIZ_TXTSENDERNAME "WIZARDS_HID_LTRWIZ_TXTSENDERNAME"
+#define HID_LTRWIZ_TXTSENDERSTREET "WIZARDS_HID_LTRWIZ_TXTSENDERSTREET"
+#define HID_LTRWIZ_TXTSENDERPOSTCODE "WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE"
+#define HID_LTRWIZ_TXTSENDERSTATE_TEXT "WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT"
+#define HID_LTRWIZ_TXTSENDERCITY "WIZARDS_HID_LTRWIZ_TXTSENDERCITY"
+#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER "WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER"
+#define HID_LTRWIZ_OPTRECEIVERDATABASE "WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE"
+#define HID_LTRWIZ_TXTFOOTER "WIZARDS_HID_LTRWIZ_TXTFOOTER"
+#define HID_LTRWIZ_CHKFOOTERNEXTPAGES "WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES"
+#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS "WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS"
+#define HID_LTRWIZ_TXTTEMPLATENAME "WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME"
+#define HID_LTRWIZ_OPTCREATELETTER "WIZARDS_HID_LTRWIZ_OPTCREATELETTER"
+#define HID_LTRWIZ_OPTMAKECHANGES "WIZARDS_HID_LTRWIZ_OPTMAKECHANGES"
+#define HID_LTRWIZ_TXTPATH "WIZARDS_HID_LTRWIZ_TXTPATH"
+#define HID_LTRWIZ_CMDPATH "WIZARDS_HID_LTRWIZ_CMDPATH"
+
+#define HID_LTRWIZARD "WIZARDS_HID_LTRWIZARD"
+#define HID_LTRWIZARD_HELP "WIZARDS_HID_LTRWIZARD_HELP"
+#define HID_LTRWIZARD_BACK "WIZARDS_HID_LTRWIZARD_BACK"
+#define HID_LTRWIZARD_NEXT "WIZARDS_HID_LTRWIZARD_NEXT"
+#define HID_LTRWIZARD_CREATE "WIZARDS_HID_LTRWIZARD_CREATE"
+#define HID_LTRWIZARD_CANCEL "WIZARDS_HID_LTRWIZARD_CANCEL"
+
+#define HID_QUERYWIZARD_LSTTABLES "WIZARDS_HID_QUERYWIZARD_LSTTABLES"
+#define HID_QUERYWIZARD_LSTFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFIELDS"
+#define HID_QUERYWIZARD_CMDMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED"
+#define HID_QUERYWIZARD_CMDMOVEALL "WIZARDS_HID_QUERYWIZARD_CMDMOVEALL"
+#define HID_QUERYWIZARD_CMDREMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED"
+#define HID_QUERYWIZARD_CMDREMOVEALL "WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL"
+#define HID_QUERYWIZARD_LSTSELFIELDS "WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS"
+#define HID_QUERYWIZARD_CMDMOVEUP "WIZARDS_HID_QUERYWIZARD_CMDMOVEUP"
+#define HID_QUERYWIZARD_CMDMOVEDOWN "WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN"
+
+#define HID_QUERYWIZARD_SORT1 "WIZARDS_HID_QUERYWIZARD_SORT1"
+#define HID_QUERYWIZARD_OPTASCEND1 "WIZARDS_HID_QUERYWIZARD_OPTASCEND1"
+#define HID_QUERYWIZARD_OPTDESCEND1 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND1"
+#define HID_QUERYWIZARD_SORT2 "WIZARDS_HID_QUERYWIZARD_SORT2"
+#define HID_QUERYWIZARD_OPTASCEND2 "WIZARDS_HID_QUERYWIZARD_OPTASCEND2"
+#define HID_QUERYWIZARD_OPTDESCEND2 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND2"
+#define HID_QUERYWIZARD_SORT3 "WIZARDS_HID_QUERYWIZARD_SORT3"
+#define HID_QUERYWIZARD_OPTASCEND3 "WIZARDS_HID_QUERYWIZARD_OPTASCEND3"
+#define HID_QUERYWIZARD_OPTDESCEND3 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND3"
+#define HID_QUERYWIZARD_SORT4 "WIZARDS_HID_QUERYWIZARD_SORT4"
+#define HID_QUERYWIZARD_OPTASCEND4 "WIZARDS_HID_QUERYWIZARD_OPTASCEND4"
+#define HID_QUERYWIZARD_OPTDESCEND4 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND4"
+
+#define HID_QUERYWIZARD_OPTMATCHALL "WIZARDS_HID_QUERYWIZARD_OPTMATCHALL"
+#define HID_QUERYWIZARD_OPTMATCHANY "WIZARDS_HID_QUERYWIZARD_OPTMATCHANY"
+
+#define HID_QUERYWIZARD_LSTFIELDNAME_1 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1"
+#define HID_QUERYWIZARD_LSTOPERATOR_1 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1"
+#define HID_QUERYWIZARD_TXTVALUE_1 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_1"
+#define HID_QUERYWIZARD_LSTFIELDNAME_2 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2"
+#define HID_QUERYWIZARD_LSTOPERATOR_2 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2"
+#define HID_QUERYWIZARD_TXTVALUE_2 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_2"
+#define HID_QUERYWIZARD_LSTFIELDNAME_3 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3"
+#define HID_QUERYWIZARD_LSTOPERATOR_3 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3"
+#define HID_QUERYWIZARD_TXTVALUE_3 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_3"
+
+#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY "WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY"
+#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY "WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY"
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1"
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1"
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2"
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2"
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3"
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3"
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4"
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4"
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5"
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5"
+#define HID_QUERYWIZARD_BTNAGGREGATEPLUS "WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS"
+#define HID_QUERYWIZARD_BTNAGGREGATEMINUS "WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS"
+
+#define HID_QUERYWIZARD_LSTFILTERFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS"
+#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED"
+#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED"
+#define HID_QUERYWIZARD_LSTFILTERSELFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS"
+#define HID_QUERYWIZARD_CMDFILTERMOVEUP "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP"
+#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN"
+
+#define HID_QUERYWIZARD_OPTGROUPMATCHALL "WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL"
+#define HID_QUERYWIZARD_OPTGROUPMATCHANY "WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY"
+
+#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1"
+#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1"
+#define HID_QUERYWIZARD_TXTFILTERVALUE_1 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1"
+#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2"
+#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2"
+#define HID_QUERYWIZARD_TXTFILTERVALUE_2 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2"
+#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3"
+#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3"
+#define HID_QUERYWIZARD_TXTFILTERVALUE_3 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3"
+
+#define HID_QUERYWIZARD_TXTTITLE_1 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_1"
+#define HID_QUERYWIZARD_TXTTITLE_2 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_2"
+#define HID_QUERYWIZARD_TXTTITLE_3 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_3"
+#define HID_QUERYWIZARD_TXTTITLE_4 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_4"
+#define HID_QUERYWIZARD_TXTTITLE_5 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_5"
+#define HID_QUERYWIZARD_TXTTITLE_6 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_6"
+#define HID_QUERYWIZARD_TXTTITLE_7 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_7"
+
+#define HID_QUERYWIZARD_TXTQUERYTITLE "WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE"
+#define HID_QUERYWIZARD_OPTDISPLAYQUERY "WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY"
+#define HID_QUERYWIZARD_OPTMODIFYQUERY "WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY"
+#define HID_QUERYWIZARD_TXTSUMMARY "WIZARDS_HID_QUERYWIZARD_TXTSUMMARY"
+
+#define HID_QUERYWIZARD "WIZARDS_HID_QUERYWIZARD"
+#define HID_QUERYWIZARD_BACK "WIZARDS_HID_QUERYWIZARD_BACK"
+#define HID_QUERYWIZARD_NEXT "WIZARDS_HID_QUERYWIZARD_NEXT"
+#define HID_QUERYWIZARD_CREATE "WIZARDS_HID_QUERYWIZARD_CREATE"
+#define HID_QUERYWIZARD_CANCEL "WIZARDS_HID_QUERYWIZARD_CANCEL"
+
+// ++++++++++++++++++++++++++++++++++++++
+// +++ Web Wizard : Continued from 34312
+// ++++++++++++++++++++++++++++++++++++++
+// web wizard iconssets dialog
+#define HID_IS "WIZARDS_HID_IS"
+#define HID_IS_BTN_NONE "WIZARDS_HID_IS_BTN_NONE"
+#define HID_IS_BTN_OK "WIZARDS_HID_IS_BTN_OK"
+#define HID_IS_BTN_CANCEL "WIZARDS_HID_IS_BTN_CANCEL"
+
+#define HID_IS_BTN_IMG1 "WIZARDS_HID_IS_BTN_IMG1"
+#define HID_IS_BTN_IMG2 "WIZARDS_HID_IS_BTN_IMG2"
+#define HID_IS_BTN_IMG3 "WIZARDS_HID_IS_BTN_IMG3"
+#define HID_IS_BTN_IMG4 "WIZARDS_HID_IS_BTN_IMG4"
+#define HID_IS_BTN_IMG5 "WIZARDS_HID_IS_BTN_IMG5"
+#define HID_IS_BTN_IMG6 "WIZARDS_HID_IS_BTN_IMG6"
+#define HID_IS_BTN_IMG7 "WIZARDS_HID_IS_BTN_IMG7"
+#define HID_IS_BTN_IMG8 "WIZARDS_HID_IS_BTN_IMG8"
+#define HID_IS_BTN_IMG9 "WIZARDS_HID_IS_BTN_IMG9"
+#define HID_IS_BTN_IMG10 "WIZARDS_HID_IS_BTN_IMG10"
+#define HID_IS_BTN_IMG11 "WIZARDS_HID_IS_BTN_IMG11"
+#define HID_IS_BTN_IMG12 "WIZARDS_HID_IS_BTN_IMG12"
+#define HID_IS_BTN_IMG13 "WIZARDS_HID_IS_BTN_IMG13"
+#define HID_IS_BTN_IMG14 "WIZARDS_HID_IS_BTN_IMG14"
+#define HID_IS_BTN_IMG15 "WIZARDS_HID_IS_BTN_IMG15"
+#define HID_IS_BTN_IMG16 "WIZARDS_HID_IS_BTN_IMG16"
+#define HID_IS_BTN_IMG17 "WIZARDS_HID_IS_BTN_IMG17"
+#define HID_IS_BTN_IMG18 "WIZARDS_HID_IS_BTN_IMG18"
+#define HID_IS_BTN_IMG19 "WIZARDS_HID_IS_BTN_IMG19"
+#define HID_IS_BTN_IMG20 "WIZARDS_HID_IS_BTN_IMG20"
+#define HID_IS_BTN_IMG21 "WIZARDS_HID_IS_BTN_IMG21"
+#define HID_IS_BTN_IMG22 "WIZARDS_HID_IS_BTN_IMG22"
+#define HID_IS_BTN_IMG23 "WIZARDS_HID_IS_BTN_IMG23"
+#define HID_IS_BTN_IMG24 "WIZARDS_HID_IS_BTN_IMG24"
+#define HID_IS_BTN_IMG25 "WIZARDS_HID_IS_BTN_IMG25"
+#define HID_IS_BTN_IMG26 "WIZARDS_HID_IS_BTN_IMG26"
+#define HID_IS_BTN_IMG27 "WIZARDS_HID_IS_BTN_IMG27"
+#define HID_IS_BTN_IMG28 "WIZARDS_HID_IS_BTN_IMG28"
+#define HID_IS_BTN_IMG29 "WIZARDS_HID_IS_BTN_IMG29"
+#define HID_IS_BTN_IMG30 "WIZARDS_HID_IS_BTN_IMG30"
+#define HID_IS_BTN_IMG31 "WIZARDS_HID_IS_BTN_IMG31"
+#define HID_IS_BTN_IMG32 "WIZARDS_HID_IS_BTN_IMG32"
+
+// web wizard ftp dialog
+#define HID_FTP "WIZARDS_HID_FTP"
+#define HID_FTP_SERVER "WIZARDS_HID_FTP_SERVER"
+#define HID_FTP_USERNAME "WIZARDS_HID_FTP_USERNAME"
+#define HID_FTP_PASS "WIZARDS_HID_FTP_PASS"
+#define HID_FTP_TEST "WIZARDS_HID_FTP_TEST"
+#define HID_FTP_TXT_PATH "WIZARDS_HID_FTP_TXT_PATH"
+#define HID_FTP_BTN_PATH "WIZARDS_HID_FTP_BTN_PATH"
+#define HID_FTP_OK "WIZARDS_HID_FTP_OK"
+#define HID_FTP_CANCEL "WIZARDS_HID_FTP_CANCEL"
+
+
+/* ====================================
+ * AGENDA WIZARD
+ * 41051 - 41099
+ * ====================================
+ */
+
+// step 0 - navibar
+
+#define HID_AGWIZ "WIZARDS_HID_AGWIZ"
+#define HID_AGWIZ_HELP "WIZARDS_HID_AGWIZ_HELP"
+#define HID_AGWIZ_NEXT "WIZARDS_HID_AGWIZ_NEXT"
+#define HID_AGWIZ_PREV "WIZARDS_HID_AGWIZ_PREV"
+#define HID_AGWIZ_CREATE "WIZARDS_HID_AGWIZ_CREATE"
+#define HID_AGWIZ_CANCEL "WIZARDS_HID_AGWIZ_CANCEL"
+
+//step 1 - design
+
+#define HID_AGWIZ_1_LIST_PAGEDESIGN "WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN"
+#define HID_AGWIZ_1_CHK_MINUTES "WIZARDS_HID_AGWIZ_1_CHK_MINUTES"
+
+// step 2 - general attributes
+
+#define HID_AGWIZ_2_TXT_TIME "WIZARDS_HID_AGWIZ_2_TXT_TIME"
+#define HID_AGWIZ_2_TXT_DATE "WIZARDS_HID_AGWIZ_2_TXT_DATE"
+#define HID_AGWIZ_2_TXT_TITLE "WIZARDS_HID_AGWIZ_2_TXT_TITLE"
+#define HID_AGWIZ_2_TXT_LOCATION "WIZARDS_HID_AGWIZ_2_TXT_LOCATION"
+
+// step 3 - headings
+
+#define HID_AGWIZ_3_CHK_MEETING_TYPE "WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE"
+#define HID_AGWIZ_3_CHK_READ "WIZARDS_HID_AGWIZ_3_CHK_READ"
+#define HID_AGWIZ_3_CHK_BRING "WIZARDS_HID_AGWIZ_3_CHK_BRING"
+#define HID_AGWIZ_3_CHK_NOTES "WIZARDS_HID_AGWIZ_3_CHK_NOTES"
+
+// step 4 - names
+
+#define HID_AGWIZ_4_CHK_CALLED_BY "WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY"
+#define HID_AGWIZ_4_CHK_FACILITATOR "WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR"
+#define HID_AGWIZ_4_CHK_NOTETAKER "WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER"
+#define HID_AGWIZ_4_CHK_TIMEKEEPER "WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER"
+#define HID_AGWIZ_4_CHK_ATTENDEES "WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES"
+#define HID_AGWIZ_4_CHK_OBSERVERS "WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS"
+#define HID_AGWIZ_4_CHK_RESOURCEPERSONS "WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS"
+
+// step 5 - topics
+
+#define HID_AGWIZ_6_TXT_TEMPLATENAME "WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME"
+#define HID_AGWIZ_6_TXT_TEMPLATEPATH "WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH"
+#define HID_AGWIZ_6_BTN_TEMPLATEPATH "WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH"
+
+// step 6 - file info
+
+#define HID_AGWIZ_6_OPT_CREATEAGENDA "WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA"
+#define HID_AGWIZ_6_OPT_MAKECHANGES "WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES"
+
+// - again step 5 - buttons
+
+#define HID_AGWIZ_5_BTN_INSERT "WIZARDS_HID_AGWIZ_5_BTN_INSERT"
+#define HID_AGWIZ_5_BTN_REMOVE "WIZARDS_HID_AGWIZ_5_BTN_REMOVE"
+#define HID_AGWIZ_5_BTN_UP "WIZARDS_HID_AGWIZ_5_BTN_UP"
+#define HID_AGWIZ_5_BTN_DOWN "WIZARDS_HID_AGWIZ_5_BTN_DOWN"
+
+// again step 5 - scroll control
+
+#define HID_AGWIZ_5_SCROLL_BAR "WIZARDS_HID_AGWIZ_5_SCROLL_BAR"
+
+#define HID_AGWIZ_5_TXT_TOPIC_1 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1"
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1"
+#define HID_AGWIZ_5_TXT_MINUTES_1 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1"
+
+#define HID_AGWIZ_5_TXT_TOPIC_2 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2"
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2"
+#define HID_AGWIZ_5_TXT_MINUTES_2 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2"
+
+#define HID_AGWIZ_5_TXT_TOPIC_3 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3"
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3"
+#define HID_AGWIZ_5_TXT_MINUTES_3 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3"
+
+#define HID_AGWIZ_5_TXT_TOPIC_4 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4"
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4"
+#define HID_AGWIZ_5_TXT_MINUTES_4 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4"
+
+#define HID_AGWIZ_5_TXT_TOPIC_5 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5"
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5"
+#define HID_AGWIZ_5_TXT_MINUTES_5 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5"
+
+
+//FaxWizard---------------------------
+
+#define HID_FAXWIZ_OPTBUSINESSFAX "WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX"
+#define HID_FAXWIZ_LSTBUSINESSSTYLE "WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE"
+#define HID_FAXWIZ_OPTPRIVATEFAX "WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX"
+#define HID_LSTPRIVATESTYLE "WIZARDS_HID_LSTPRIVATESTYLE"
+#define HID_IMAGECONTROL3 "WIZARDS_HID_IMAGECONTROL3"
+#define HID_CHKUSELOGO "WIZARDS_HID_CHKUSELOGO"
+#define HID_CHKUSEDATE "WIZARDS_HID_CHKUSEDATE"
+#define HID_CHKUSECOMMUNICATIONTYPE "WIZARDS_HID_CHKUSECOMMUNICATIONTYPE"
+#define HID_LSTCOMMUNICATIONTYPE "WIZARDS_HID_LSTCOMMUNICATIONTYPE"
+#define HID_CHKUSESUBJECT "WIZARDS_HID_CHKUSESUBJECT"
+#define HID_CHKUSESALUTATION "WIZARDS_HID_CHKUSESALUTATION"
+#define HID_LSTSALUTATION "WIZARDS_HID_LSTSALUTATION"
+#define HID_CHKUSEGREETING "WIZARDS_HID_CHKUSEGREETING"
+#define HID_LSTGREETING "WIZARDS_HID_LSTGREETING"
+#define HID_CHKUSEFOOTER "WIZARDS_HID_CHKUSEFOOTER"
+#define HID_OPTSENDERPLACEHOLDER "WIZARDS_HID_OPTSENDERPLACEHOLDER"
+#define HID_OPTSENDERDEFINE "WIZARDS_HID_OPTSENDERDEFINE"
+#define HID_TXTSENDERNAME "WIZARDS_HID_TXTSENDERNAME"
+#define HID_TXTSENDERSTREET "WIZARDS_HID_TXTSENDERSTREET"
+#define HID_TXTSENDERPOSTCODE "WIZARDS_HID_TXTSENDERPOSTCODE"
+#define HID_TXTSENDERSTATE "WIZARDS_HID_TXTSENDERSTATE"
+#define HID_TXTSENDERCITY "WIZARDS_HID_TXTSENDERCITY"
+#define HID_TXTSENDERFAX "WIZARDS_HID_TXTSENDERFAX"
+#define HID_OPTRECEIVERPLACEHOLDER "WIZARDS_HID_OPTRECEIVERPLACEHOLDER"
+#define HID_OPTRECEIVERDATABASE "WIZARDS_HID_OPTRECEIVERDATABASE"
+#define HID_TXTFOOTER "WIZARDS_HID_TXTFOOTER"
+#define HID_CHKFOOTERNEXTPAGES "WIZARDS_HID_CHKFOOTERNEXTPAGES"
+#define HID_CHKFOOTERPAGENUMBERS "WIZARDS_HID_CHKFOOTERPAGENUMBERS"
+#define HID_TXTTEMPLATENAME "WIZARDS_HID_TXTTEMPLATENAME"
+#define HID_FILETEMPLATEPATH "WIZARDS_HID_FILETEMPLATEPATH"
+#define HID_OPTCREATEFAX "WIZARDS_HID_OPTCREATEFAX"
+#define HID_OPTMAKECHANGES "WIZARDS_HID_OPTMAKECHANGES"
+#define HID_IMAGECONTROL2 "WIZARDS_HID_IMAGECONTROL2"
+#define HID_FAXWIZ_TXTPATH "WIZARDS_HID_FAXWIZ_TXTPATH"
+#define HID_FAXWIZ_CMDPATH "WIZARDS_HID_FAXWIZ_CMDPATH"
+
+#define HID_FAXWIZARD "WIZARDS_HID_FAXWIZARD"
+#define HID_FAXWIZARD_HELP "WIZARDS_HID_FAXWIZARD_HELP"
+#define HID_FAXWIZARD_BACK "WIZARDS_HID_FAXWIZARD_BACK"
+#define HID_FAXWIZARD_NEXT "WIZARDS_HID_FAXWIZARD_NEXT"
+#define HID_FAXWIZARD_CREATE "WIZARDS_HID_FAXWIZARD_CREATE"
+#define HID_FAXWIZARD_CANCEL "WIZARDS_HID_FAXWIZARD_CANCEL"
+
+
+
+/* ====================================
+ * TableWizard
+ * ====================================
+ */
+
+#define HID_DLGTABLE_DIALOG "WIZARDS_HID_DLGTABLE_DIALOG"
+#define HID_DLGTABLE_CMDPREV "WIZARDS_HID_DLGTABLE_CMDPREV"
+#define HID_DLGTABLE_CMDNEXT "WIZARDS_HID_DLGTABLE_CMDNEXT"
+#define HID_DLGTABLE_CMDFINISH "WIZARDS_HID_DLGTABLE_CMDFINISH"
+#define HID_DLGTABLE_CMDCANCEL "WIZARDS_HID_DLGTABLE_CMDCANCEL"
+
+
+#define HID_DLGTABLE_OPTBUSINESS "WIZARDS_HID_DLGTABLE_OPTBUSINESS"
+#define HID_DLGTABLE_OPTPRIVATE "WIZARDS_HID_DLGTABLE_OPTPRIVATE"
+
+
+#define HID_DLGTABLE_LBTABLES "WIZARDS_HID_DLGTABLE_LBTABLES"
+#define HID_DLGTABLE_FIELDSAVAILABLE "WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE"
+#define HID_DLGTABLE_CMDMOVESELECTED "WIZARDS_HID_DLGTABLE_CMDMOVESELECTED"
+#define HID_DLGTABLE_CMDMOVEALL "WIZARDS_HID_DLGTABLE_CMDMOVEALL"
+#define HID_DLGTABLE_CMDREMOVESELECTED "WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED"
+#define HID_DLGTABLE_CMDREMOVEALL "WIZARDS_HID_DLGTABLE_CMDREMOVEALL"
+#define HID_DLGTABLE_FIELDSSELECTED "WIZARDS_HID_DLGTABLE_FIELDSSELECTED"
+
+#define HID_DLGTABLE_CMDMOVEUP "WIZARDS_HID_DLGTABLE_CMDMOVEUP"
+#define HID_DLGTABLE_CMDMOVEDOWN "WIZARDS_HID_DLGTABLE_CMDMOVEDOWN"
+
+
+#define HID_DLGTABLE_LB_SELFIELDNAMES "WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES"
+#define HID_DLGTABLE_CMDMOVEFIELDUP "WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP"
+#define HID_DLGTABLE_CMDMOVEFIELDDOWN "WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN"
+#define HID_DLGTABLE_CMDMINUS "WIZARDS_HID_DLGTABLE_CMDMINUS"
+#define HID_DLGTABLE_CMDPLUS "WIZARDS_HID_DLGTABLE_CMDPLUS"
+#define HID_DLGTABLE_COLNAME "WIZARDS_HID_DLGTABLE_COLNAME"
+#define HID_DLGTABLE_COLMODIFIER "WIZARDS_HID_DLGTABLE_COLMODIFIER"
+
+
+#define HID_DLGTABLE_CHK_USEPRIMEKEY "WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY"
+#define HID_DLGTABLE_OPT_PK_AUTOMATIC "WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC"
+
+#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC "WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC"
+
+#define HID_DLGTABLE_OPT_PK_SINGLE "WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE"
+#define HID_DLGTABLE_LB_PK_FIELDNAME "WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME"
+#define HID_DLGTABLE_CK_PK_AUTOVALUE "WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE"
+#define HID_DLGTABLE_OPT_PK_SEVERAL "WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL"
+#define HID_DLGTABLE_FIELDS_PK_AVAILABLE "WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE"
+#define HID_DLGTABLE_CMDMOVE_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED"
+#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED"
+#define HID_DLGTABLE_FIELDS_PK_SELECTED "WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED"
+
+#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED"
+#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED"
+
+
+
+
+#define HID_DLGTABLE_TXT_NAME "WIZARDS_HID_DLGTABLE_TXT_NAME"
+#define HID_DLGTABLE_OPT_MODIFYTABLE "WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE"
+#define HID_DLGTABLE_OPT_WORKWITHTABLE "WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE"
+#define HID_DLGTABLE_OPT_STARTFORMWIZARD "WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD"
+#define HID_DLGTABLE_LST_CATALOG "WIZARDS_HID_DLGTABLE_LST_CATALOG"
+#define HID_DLGTABLE_LST_SCHEMA "WIZARDS_HID_DLGTABLE_LST_SCHEMA"
+
+
+
+
+//End at 42767
diff --git a/wizards/util/hidother.src b/wizards/util/hidother.src
index 912d9d49d..bf1953e06 100644
--- a/wizards/util/hidother.src
+++ b/wizards/util/hidother.src
@@ -28,6 +28,7 @@
//34200 - 34767
//40768 - 42767
+#include "helpids.h"
/*
* web wizard : 34200 - 34319
* report wizard : 34320 - 34399
@@ -45,205 +46,205 @@
// ***************
//webwizardgeneralcontrols
-#define HID0_WEBWIZARD 34200
+// #define HID0_WEBWIZARD 34200
hidspecial HID { HelpID = HID0_WEBWIZARD; } ;
-#define HID0_HELP 34201
+// #define HID0_HELP 34201
hidspecial HID { HelpID = HID0_HELP; } ;
-#define HID0_NEXT 34202
+// #define HID0_NEXT 34202
hidspecial HID { HelpID = HID0_NEXT; } ;
-#define HID0_PREV 34203
+// #define HID0_PREV 34203
hidspecial HID { HelpID = HID0_PREV; } ;
-#define HID0_CREATE 34204
+// #define HID0_CREATE 34204
hidspecial HID { HelpID = HID0_CREATE; } ;
-#define HID0_CANCEL 34205
+// #define HID0_CANCEL 34205
hidspecial HID { HelpID = HID0_CANCEL; } ;
-#define HID0_STATUS_DIALOG 34206
+// #define HID0_STATUS_DIALOG 34206
hidspecial HID { HelpID = HID0_STATUS_DIALOG; } ;
//step1
-#define HID1_LST_SESSIONS 34207
+// #define HID1_LST_SESSIONS 34207
hidspecial HID { HelpID = HID1_LST_SESSIONS; } ;
-#define HID1_BTN_DEL_SES 34209
+// #define HID1_BTN_DEL_SES 34209
hidspecial HID { HelpID = HID1_BTN_DEL_SES; } ;
//step2
-#define HID2_LST_DOCS 34210
+// #define HID2_LST_DOCS 34210
hidspecial HID { HelpID = HID2_LST_DOCS; } ;
-#define HID2_BTN_ADD_DOC 34211
+// #define HID2_BTN_ADD_DOC 34211
hidspecial HID { HelpID = HID2_BTN_ADD_DOC; } ;
-#define HID2_BTN_REM_DOC 34212
+// #define HID2_BTN_REM_DOC 34212
hidspecial HID { HelpID = HID2_BTN_REM_DOC; } ;
-#define HID2_BTN_DOC_UP 34213
+// #define HID2_BTN_DOC_UP 34213
hidspecial HID { HelpID = HID2_BTN_DOC_UP; } ;
-#define HID2_BTN_DOC_DOWN 34214
+// #define HID2_BTN_DOC_DOWN 34214
hidspecial HID { HelpID = HID2_BTN_DOC_DOWN; } ;
-#define HID2_TXT_DOC_TITLE 34215
+// #define HID2_TXT_DOC_TITLE 34215
hidspecial HID { HelpID = HID2_TXT_DOC_TITLE; } ;
-#define HID2_TXT_DOC_DESC 34216
+// #define HID2_TXT_DOC_DESC 34216
hidspecial HID { HelpID = HID2_TXT_DOC_DESC; } ;
-#define HID2_TXT_DOC_AUTHOR 34217
+// #define HID2_TXT_DOC_AUTHOR 34217
hidspecial HID { HelpID = HID2_TXT_DOC_AUTHOR; } ;
-#define HID2_LST_DOC_EXPORT 34218
+// #define HID2_LST_DOC_EXPORT 34218
hidspecial HID { HelpID = HID2_LST_DOC_EXPORT; } ;
-#define HID2_STATUS_ADD_DOCS 34219
+// #define HID2_STATUS_ADD_DOCS 34219
hidspecial HID { HelpID = HID2_STATUS_ADD_DOCS; } ;
//step3
-#define HID3_IL_LAYOUTS_IMG1 34220
+// #define HID3_IL_LAYOUTS_IMG1 34220
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG1; } ;
-#define HID3_IL_LAYOUTS_IMG2 34221
+// #define HID3_IL_LAYOUTS_IMG2 34221
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG2; } ;
-#define HID3_IL_LAYOUTS_IMG3 34222
+// #define HID3_IL_LAYOUTS_IMG3 34222
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG3; } ;
-#define HID3_IL_LAYOUTS_IMG4 34223
+// #define HID3_IL_LAYOUTS_IMG4 34223
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG4; } ;
-#define HID3_IL_LAYOUTS_IMG5 34224
+// #define HID3_IL_LAYOUTS_IMG5 34224
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG5; } ;
-#define HID3_IL_LAYOUTS_IMG6 34225
+// #define HID3_IL_LAYOUTS_IMG6 34225
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG6; } ;
-#define HID3_IL_LAYOUTS_IMG7 34226
+// #define HID3_IL_LAYOUTS_IMG7 34226
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG7; } ;
-#define HID3_IL_LAYOUTS_IMG8 34227
+// #define HID3_IL_LAYOUTS_IMG8 34227
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG8; } ;
-#define HID3_IL_LAYOUTS_IMG9 34228
+// #define HID3_IL_LAYOUTS_IMG9 34228
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG9; } ;
-#define HID3_IL_LAYOUTS_IMG10 34229
+// #define HID3_IL_LAYOUTS_IMG10 34229
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG10; } ;
-#define HID3_IL_LAYOUTS_IMG11 34230
+// #define HID3_IL_LAYOUTS_IMG11 34230
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG11; } ;
-#define HID3_IL_LAYOUTS_IMG12 34231
+// #define HID3_IL_LAYOUTS_IMG12 34231
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG12; } ;
-#define HID3_IL_LAYOUTS_IMG13 34232
+// #define HID3_IL_LAYOUTS_IMG13 34232
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG13; } ;
-#define HID3_IL_LAYOUTS_IMG14 34233
+// #define HID3_IL_LAYOUTS_IMG14 34233
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG14; } ;
-#define HID3_IL_LAYOUTS_IMG15 34234
+// #define HID3_IL_LAYOUTS_IMG15 34234
hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG15; } ;
//step4
-#define HID4_CHK_DISPLAY_FILENAME 34235
+// #define HID4_CHK_DISPLAY_FILENAME 34235
hidspecial HID { HelpID = HID4_CHK_DISPLAY_FILENAME; } ;
-#define HID4_CHK_DISPLAY_DESCRIPTION 34236
+// #define HID4_CHK_DISPLAY_DESCRIPTION 34236
hidspecial HID { HelpID = HID4_CHK_DISPLAY_DESCRIPTION; } ;
-#define HID4_CHK_DISPLAY_AUTHOR 34237
+// #define HID4_CHK_DISPLAY_AUTHOR 34237
hidspecial HID { HelpID = HID4_CHK_DISPLAY_AUTHOR; } ;
-#define HID4_CHK_DISPLAY_CR_DATE 34238
+// #define HID4_CHK_DISPLAY_CR_DATE 34238
hidspecial HID { HelpID = HID4_CHK_DISPLAY_CR_DATE; } ;
-#define HID4_CHK_DISPLAY_UP_DATE 34239
+// #define HID4_CHK_DISPLAY_UP_DATE 34239
hidspecial HID { HelpID = HID4_CHK_DISPLAY_UP_DATE; } ;
-#define HID4_CHK_DISPLAY_FORMAT 34240
+// #define HID4_CHK_DISPLAY_FORMAT 34240
hidspecial HID { HelpID = HID4_CHK_DISPLAY_FORMAT; } ;
-#define HID4_CHK_DISPLAY_F_ICON 34241
+// #define HID4_CHK_DISPLAY_F_ICON 34241
hidspecial HID { HelpID = HID4_CHK_DISPLAY_F_ICON; } ;
-#define HID4_CHK_DISPLAY_PAGES 34242
+// #define HID4_CHK_DISPLAY_PAGES 34242
hidspecial HID { HelpID = HID4_CHK_DISPLAY_PAGES; } ;
-#define HID4_CHK_DISPLAY_SIZE 34243
+// #define HID4_CHK_DISPLAY_SIZE 34243
hidspecial HID { HelpID = HID4_CHK_DISPLAY_SIZE; } ;
-#define HID4_GRP_OPTIMAIZE_640 34244
+// #define HID4_GRP_OPTIMAIZE_640 34244
hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_640; } ;
-#define HID4_GRP_OPTIMAIZE_800 34245
+// #define HID4_GRP_OPTIMAIZE_800 34245
hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_800; } ;
-#define HID4_GRP_OPTIMAIZE_1024 34246
+// #define HID4_GRP_OPTIMAIZE_1024 34246
hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_1024; } ;
//step5
-#define HID5_LST_STYLES 34247
+// #define HID5_LST_STYLES 34247
hidspecial HID { HelpID = HID5_LST_STYLES; } ;
-#define HID5_BTN_BACKGND 34248
+// #define HID5_BTN_BACKGND 34248
hidspecial HID { HelpID = HID5_BTN_BACKGND; } ;
-#define HID5_BTN_ICONS 34249
+// #define HID5_BTN_ICONS 34249
hidspecial HID { HelpID = HID5_BTN_ICONS; } ;
//step6
-#define HID6_TXT_SITE_TITLE 34250
+// #define HID6_TXT_SITE_TITLE 34250
hidspecial HID { HelpID = HID6_TXT_SITE_TITLE; } ;
-#define HID6_TXT_SITE_DESC 34253
+// #define HID6_TXT_SITE_DESC 34253
hidspecial HID { HelpID = HID6_TXT_SITE_DESC; } ;
-#define HID6_DATE_SITE_CREATED 34255
+// #define HID6_DATE_SITE_CREATED 34255
hidspecial HID { HelpID = HID6_DATE_SITE_CREATED; } ;
-#define HID6_DATE_SITE_UPDATED 34256
+// #define HID6_DATE_SITE_UPDATED 34256
hidspecial HID { HelpID = HID6_DATE_SITE_UPDATED; } ;
-#define HID6_TXT_SITE_EMAIL 34258
+// #define HID6_TXT_SITE_EMAIL 34258
hidspecial HID { HelpID = HID6_TXT_SITE_EMAIL; } ;
-#define HID6_TXT_SITE_COPYRIGHT 34259
+// #define HID6_TXT_SITE_COPYRIGHT 34259
hidspecial HID { HelpID = HID6_TXT_SITE_COPYRIGHT; } ;
//step7
-#define HID7_BTN_PREVIEW 34260
+// #define HID7_BTN_PREVIEW 34260
hidspecial HID { HelpID = HID7_BTN_PREVIEW; } ;
-#define HID7_CHK_PUBLISH_LOCAL 34261
+// #define HID7_CHK_PUBLISH_LOCAL 34261
hidspecial HID { HelpID = HID7_CHK_PUBLISH_LOCAL; } ;
-#define HID7_TXT_LOCAL 34262
+// #define HID7_TXT_LOCAL 34262
hidspecial HID { HelpID = HID7_TXT_LOCAL; } ;
-#define HID7_BTN_LOCAL 34263
+// #define HID7_BTN_LOCAL 34263
hidspecial HID { HelpID = HID7_BTN_LOCAL; } ;
-#define HID7_CHK_PUBLISH_ZIP 34264
+// #define HID7_CHK_PUBLISH_ZIP 34264
hidspecial HID { HelpID = HID7_CHK_PUBLISH_ZIP; } ;
-#define HID7_TXT_ZIP 34265
+// #define HID7_TXT_ZIP 34265
hidspecial HID { HelpID = HID7_TXT_ZIP; } ;
-#define HID7_BTN_ZIP 34266
+// #define HID7_BTN_ZIP 34266
hidspecial HID { HelpID = HID7_BTN_ZIP; } ;
-#define HID7_CHK_PUBLISH_FTP 34267
+// #define HID7_CHK_PUBLISH_FTP 34267
hidspecial HID { HelpID = HID7_CHK_PUBLISH_FTP; } ;
-#define HID7_TXT_FTP 34268
+// #define HID7_TXT_FTP 34268
hidspecial HID { HelpID = HID7_TXT_FTP; } ;
-#define HID7_BTN_FTP 34269
+// #define HID7_BTN_FTP 34269
hidspecial HID { HelpID = HID7_BTN_FTP; } ;
-#define HID7_CHK_SAVE 34270
+// #define HID7_CHK_SAVE 34270
hidspecial HID { HelpID = HID7_CHK_SAVE; } ;
-#define HID7_TXT_SAVE 34271
+// #define HID7_TXT_SAVE 34271
hidspecial HID { HelpID = HID7_TXT_SAVE; } ;
//web wizard backgrounds dialog
-#define HID_BG 34290
+// #define HID_BG 34290
hidspecial HID { HelpID = HID_BG; } ;
-#define HID_BG_BTN_OTHER 34291
+// #define HID_BG_BTN_OTHER 34291
hidspecial HID { HelpID = HID_BG_BTN_OTHER; } ;
-#define HID_BG_BTN_NONE 34292
+// #define HID_BG_BTN_NONE 34292
hidspecial HID { HelpID = HID_BG_BTN_NONE; } ;
-#define HID_BG_BTN_OK 34293
+// #define HID_BG_BTN_OK 34293
hidspecial HID { HelpID = HID_BG_BTN_OK; } ;
-#define HID_BG_BTN_CANCEL 34294
+// #define HID_BG_BTN_CANCEL 34294
hidspecial HID { HelpID = HID_BG_BTN_CANCEL; } ;
-#define HID_BG_BTN_BACK 34295
+// #define HID_BG_BTN_BACK 34295
hidspecial HID { HelpID = HID_BG_BTN_BACK; } ;
-#define HID_BG_BTN_FW 34296
+// #define HID_BG_BTN_FW 34296
hidspecial HID { HelpID = HID_BG_BTN_FW; } ;
-#define HID_BG_BTN_IMG1 34297
+// #define HID_BG_BTN_IMG1 34297
hidspecial HID { HelpID = HID_BG_BTN_IMG1; } ;
-#define HID_BG_BTN_IMG2 34298
+// #define HID_BG_BTN_IMG2 34298
hidspecial HID { HelpID = HID_BG_BTN_IMG2; } ;
-#define HID_BG_BTN_IMG3 34299
+// #define HID_BG_BTN_IMG3 34299
hidspecial HID { HelpID = HID_BG_BTN_IMG3; } ;
-#define HID_BG_BTN_IMG4 34300
+// #define HID_BG_BTN_IMG4 34300
hidspecial HID { HelpID = HID_BG_BTN_IMG4; } ;
-#define HID_BG_BTN_IMG5 34301
+// #define HID_BG_BTN_IMG5 34301
hidspecial HID { HelpID = HID_BG_BTN_IMG5; } ;
-#define HID_BG_BTN_IMG6 34302
+// #define HID_BG_BTN_IMG6 34302
hidspecial HID { HelpID = HID_BG_BTN_IMG6; } ;
-#define HID_BG_BTN_IMG7 34303
+// #define HID_BG_BTN_IMG7 34303
hidspecial HID { HelpID = HID_BG_BTN_IMG7; } ;
-#define HID_BG_BTN_IMG8 34304
+// #define HID_BG_BTN_IMG8 34304
hidspecial HID { HelpID = HID_BG_BTN_IMG8; } ;
-#define HID_BG_BTN_IMG9 34305
+// #define HID_BG_BTN_IMG9 34305
hidspecial HID { HelpID = HID_BG_BTN_IMG9; } ;
-#define HID_BG_BTN_IMG10 34306
+// #define HID_BG_BTN_IMG10 34306
hidspecial HID { HelpID = HID_BG_BTN_IMG10; } ;
-#define HID_BG_BTN_IMG11 34307
+// #define HID_BG_BTN_IMG11 34307
hidspecial HID { HelpID = HID_BG_BTN_IMG11; } ;
-#define HID_BG_BTN_IMG12 34308
+// #define HID_BG_BTN_IMG12 34308
hidspecial HID { HelpID = HID_BG_BTN_IMG12; } ;
-#define HID_BG_BTN_IMG13 34309
+// #define HID_BG_BTN_IMG13 34309
hidspecial HID { HelpID = HID_BG_BTN_IMG13; } ;
-#define HID_BG_BTN_IMG14 34300
+// #define HID_BG_BTN_IMG14 34300
hidspecial HID { HelpID = HID_BG_BTN_IMG14; } ;
-#define HID_BG_BTN_IMG15 34311
+// #define HID_BG_BTN_IMG15 34311
hidspecial HID { HelpID = HID_BG_BTN_IMG15; } ;
-#define HID_BG_BTN_IMG16 34312
+// #define HID_BG_BTN_IMG16 34312
hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -255,118 +256,118 @@ hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ;
// REPORT WIZARD
// *************
-#define HID_DLGREPORT_DIALOG 34320
+// #define HID_DLGREPORT_DIALOG 34320
hidspecial HID { HelpID = HID_DLGREPORT_DIALOG; };
-#define HID_DLGREPORT_0_CMDPREV 34322
+// #define HID_DLGREPORT_0_CMDPREV 34322
hidspecial HID { HelpID = HID_DLGREPORT_0_CMDPREV; };
-#define HID_DLGREPORT_0_CMDNEXT 34323
+// #define HID_DLGREPORT_0_CMDNEXT 34323
hidspecial HID { HelpID = HID_DLGREPORT_0_CMDNEXT; };
-#define HID_DLGREPORT_0_CMDFINISH 34324
+// #define HID_DLGREPORT_0_CMDFINISH 34324
hidspecial HID { HelpID = HID_DLGREPORT_0_CMDFINISH; };
-#define HID_DLGREPORT_0_CMDCANCEL 34325
+// #define HID_DLGREPORT_0_CMDCANCEL 34325
hidspecial HID { HelpID = HID_DLGREPORT_0_CMDCANCEL; };
-#define HID_DLGREPORT_1_LBTABLES 34330
+// #define HID_DLGREPORT_1_LBTABLES 34330
hidspecial HID { HelpID = HID_DLGREPORT_1_LBTABLES; };
-#define HID_DLGREPORT_1_FIELDSAVAILABLE 34331
+// #define HID_DLGREPORT_1_FIELDSAVAILABLE 34331
hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSAVAILABLE; };
-#define HID_DLGREPORT_1_CMDMOVESELECTED 34332
+// #define HID_DLGREPORT_1_CMDMOVESELECTED 34332
hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVESELECTED; };
-#define HID_DLGREPORT_1_CMDMOVEALL 34333
+// #define HID_DLGREPORT_1_CMDMOVEALL 34333
hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEALL; };
-#define HID_DLGREPORT_1_CMDREMOVESELECTED 34334
+// #define HID_DLGREPORT_1_CMDREMOVESELECTED 34334
hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVESELECTED; };
-#define HID_DLGREPORT_1_CMDREMOVEALL 34335
+// #define HID_DLGREPORT_1_CMDREMOVEALL 34335
hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVEALL; };
-#define HID_DLGREPORT_1_FIELDSSELECTED 34336
+// #define HID_DLGREPORT_1_FIELDSSELECTED 34336
hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSSELECTED; };
-#define HID_DLGREPORT_1_CMDMOVEUP 34337
+// #define HID_DLGREPORT_1_CMDMOVEUP 34337
hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEUP; };
-#define HID_DLGREPORT_1_CMDMOVEDOWN 34338
+// #define HID_DLGREPORT_1_CMDMOVEDOWN 34338
hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEDOWN; };
-#define HID_DLGREPORT_2_GROUPING 34340
+// #define HID_DLGREPORT_2_GROUPING 34340
hidspecial HID { HelpID = HID_DLGREPORT_2_GROUPING; };
-#define HID_DLGREPORT_2_CMDGROUP 34341
+// #define HID_DLGREPORT_2_CMDGROUP 34341
hidspecial HID { HelpID = HID_DLGREPORT_2_CMDGROUP; };
-#define HID_DLGREPORT_2_CMDUNGROUP 34342
+// #define HID_DLGREPORT_2_CMDUNGROUP 34342
hidspecial HID { HelpID = HID_DLGREPORT_2_CMDUNGROUP; };
-#define HID_DLGREPORT_2_PREGROUPINGDEST 34343
+// #define HID_DLGREPORT_2_PREGROUPINGDEST 34343
hidspecial HID { HelpID = HID_DLGREPORT_2_PREGROUPINGDEST; };
-#define HID_DLGREPORT_2_CMDMOVEUPGROUP 34344
+// #define HID_DLGREPORT_2_CMDMOVEUPGROUP 34344
hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEUPGROUP; };
-#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP 34345
+// #define HID_DLGREPORT_2_CMDMOVEDOWNGROUP 34345
hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEDOWNGROUP; };
-#define HID_DLGREPORT_3_SORT1 34346
+// #define HID_DLGREPORT_3_SORT1 34346
hidspecial HID { HelpID = HID_DLGREPORT_3_SORT1; };
-#define HID_DLGREPORT_3_OPTASCEND1 34347
+// #define HID_DLGREPORT_3_OPTASCEND1 34347
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND1; };
-#define HID_DLGREPORT_3_OPTDESCEND1 34348
+// #define HID_DLGREPORT_3_OPTDESCEND1 34348
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND1; };
-#define HID_DLGREPORT_3_SORT2 34349
+// #define HID_DLGREPORT_3_SORT2 34349
hidspecial HID { HelpID = HID_DLGREPORT_3_SORT2; };
-#define HID_DLGREPORT_3_OPTASCEND2 34350
+// #define HID_DLGREPORT_3_OPTASCEND2 34350
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND2; };
-#define HID_DLGREPORT_3_OPTDESCEND2 34351
+// #define HID_DLGREPORT_3_OPTDESCEND2 34351
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND2; };
-#define HID_DLGREPORT_3_SORT3 34352
+// #define HID_DLGREPORT_3_SORT3 34352
hidspecial HID { HelpID = HID_DLGREPORT_3_SORT3; };
-#define HID_DLGREPORT_3_OPTASCEND3 34353
+// #define HID_DLGREPORT_3_OPTASCEND3 34353
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND3; };
-#define HID_DLGREPORT_3_OPTDESCEND3 34354
+// #define HID_DLGREPORT_3_OPTDESCEND3 34354
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND3; };
-#define HID_DLGREPORT_3_SORT4 34355
+// #define HID_DLGREPORT_3_SORT4 34355
hidspecial HID { HelpID = HID_DLGREPORT_3_SORT4; };
-#define HID_DLGREPORT_3_OPTASCEND4 34356
+// #define HID_DLGREPORT_3_OPTASCEND4 34356
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND4; };
-#define HID_DLGREPORT_3_OPTDESCEND4 34357
+// #define HID_DLGREPORT_3_OPTDESCEND4 34357
hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND4; };
-#define HID_DLGREPORT_4_TITLE 34362
+// #define HID_DLGREPORT_4_TITLE 34362
hidspecial HID { HelpID = HID_DLGREPORT_4_TITLE; };
-#define HID_DLGREPORT_4_DATALAYOUT 34363
+// #define HID_DLGREPORT_4_DATALAYOUT 34363
hidspecial HID { HelpID = HID_DLGREPORT_4_DATALAYOUT; };
-#define HID_DLGREPORT_4_PAGELAYOUT 34364
+// #define HID_DLGREPORT_4_PAGELAYOUT 34364
hidspecial HID { HelpID = HID_DLGREPORT_4_PAGELAYOUT; };
-#define HID_DLGREPORT_4_LANDSCAPE 34365
+// #define HID_DLGREPORT_4_LANDSCAPE 34365
hidspecial HID { HelpID = HID_DLGREPORT_4_LANDSCAPE; };
-#define HID_DLGREPORT_4_PORTRAIT 34366
+// #define HID_DLGREPORT_4_PORTRAIT 34366
hidspecial HID { HelpID = HID_DLGREPORT_4_PORTRAIT; };
-#define HID_DLGREPORT_5_OPTDYNTEMPLATE 34370
+// #define HID_DLGREPORT_5_OPTDYNTEMPLATE 34370
hidspecial HID { HelpID = HID_DLGREPORT_5_OPTDYNTEMPLATE; };
-#define HID_DLGREPORT_5_OPTSTATDOCUMENT 34371
+// #define HID_DLGREPORT_5_OPTSTATDOCUMENT 34371
hidspecial HID { HelpID = HID_DLGREPORT_5_OPTSTATDOCUMENT; };
-#define HID_DLGREPORT_5_TXTTEMPLATEPATH 34372
+// #define HID_DLGREPORT_5_TXTTEMPLATEPATH 34372
hidspecial HID { HelpID = HID_DLGREPORT_5_TXTTEMPLATEPATH; };
-#define HID_DLGREPORT_5_CMDTEMPLATEPATH 34373
+// #define HID_DLGREPORT_5_CMDTEMPLATEPATH 34373
hidspecial HID { HelpID = HID_DLGREPORT_5_CMDTEMPLATEPATH; };
-#define HID_DLGREPORT_5_OPTEDITTEMPLATE 34374
+// #define HID_DLGREPORT_5_OPTEDITTEMPLATE 34374
hidspecial HID { HelpID = HID_DLGREPORT_5_OPTEDITTEMPLATE; };
-#define HID_DLGREPORT_5_OPTUSETEMPLATE 34375
+// #define HID_DLGREPORT_5_OPTUSETEMPLATE 34375
hidspecial HID { HelpID = HID_DLGREPORT_5_OPTUSETEMPLATE; };
-#define HID_DLGREPORT_5_TXTDOCUMENTPATH 34376
+// #define HID_DLGREPORT_5_TXTDOCUMENTPATH 34376
hidspecial HID { HelpID = HID_DLGREPORT_5_TXTDOCUMENTPATH; };
-#define HID_DLGREPORT_5_CMDDOCUMENTPATH 34377
+// #define HID_DLGREPORT_5_CMDDOCUMENTPATH 34377
hidspecial HID { HelpID = HID_DLGREPORT_5_CMDDOCUMENTPATH; };
-#define HID_DLGREPORT_5_CHKLINKTODB 34378
+// #define HID_DLGREPORT_5_CHKLINKTODB 34378
hidspecial HID { HelpID = HID_DLGREPORT_5_CHKLINKTODB; };
-#define HID_DLGREPORT_6_TXTTITLE_1 34381
+// #define HID_DLGREPORT_6_TXTTITLE_1 34381
hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_1; };
-#define HID_DLGREPORT_6_TXTTITLE_2 34382
+// #define HID_DLGREPORT_6_TXTTITLE_2 34382
hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_2; };
-#define HID_DLGREPORT_6_TXTTITLE_3 34383
+// #define HID_DLGREPORT_6_TXTTITLE_3 34383
hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_3; };
-#define HID_DLGREPORT_6_TXTTITLE_4 34384
+// #define HID_DLGREPORT_6_TXTTITLE_4 34384
hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_4; };
-#define HID_DLGREPORT_6_TXTTITLE_5 34385
+// #define HID_DLGREPORT_6_TXTTITLE_5 34385
hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_5; };
-#define HID_DLGREPORT_6_TXTTITLE_6 34386
+// #define HID_DLGREPORT_6_TXTTITLE_6 34386
hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_6; };
-#define HID_DLGREPORT_6_TXTTITLE_7 34387
+// #define HID_DLGREPORT_6_TXTTITLE_7 34387
hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_7; };
@@ -376,408 +377,408 @@ hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_7; };
*/
-#define HID_DLGFORM_DIALOG 34400
+// #define HID_DLGFORM_DIALOG 34400
hidspecial HID { HelpID = HID_DLGFORM_DIALOG; };
-#define HID_DLGFORM_CMDPREV 34402
+// #define HID_DLGFORM_CMDPREV 34402
hidspecial HID { HelpID = HID_DLGFORM_CMDPREV; };
-#define HID_DLGFORM_CMDNEXT 34403
+// #define HID_DLGFORM_CMDNEXT 34403
hidspecial HID { HelpID = HID_DLGFORM_CMDNEXT; };
-#define HID_DLGFORM_CMDFINISH 34404
+// #define HID_DLGFORM_CMDFINISH 34404
hidspecial HID { HelpID = HID_DLGFORM_CMDFINISH; };
-#define HID_DLGFORM_CMDCANCEL 34405
+// #define HID_DLGFORM_CMDCANCEL 34405
hidspecial HID { HelpID = HID_DLGFORM_CMDCANCEL; };
-#define HID_DLGFORM_MASTER_LBTABLES 34411
+// #define HID_DLGFORM_MASTER_LBTABLES 34411
hidspecial HID { HelpID = HID_DLGFORM_MASTER_LBTABLES; };
-#define HID_DLGFORM_MASTER_FIELDSAVAILABLE 34412
+// #define HID_DLGFORM_MASTER_FIELDSAVAILABLE 34412
hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSAVAILABLE; };
-#define HID_DLGFORM_MASTER_CMDMOVESELECTED 34413
+// #define HID_DLGFORM_MASTER_CMDMOVESELECTED 34413
hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVESELECTED; };
-#define HID_DLGFORM_MASTER_CMDMOVEALL 34414
+// #define HID_DLGFORM_MASTER_CMDMOVEALL 34414
hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEALL; };
-#define HID_DLGFORM_MASTER_CMDREMOVESELECTED 34415
+// #define HID_DLGFORM_MASTER_CMDREMOVESELECTED 34415
hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVESELECTED; };
-#define HID_DLGFORM_MASTER_CMDREMOVEALL 34416
+// #define HID_DLGFORM_MASTER_CMDREMOVEALL 34416
hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVEALL; };
-#define HID_DLGFORM_MASTER_FIELDSSELECTED 34417
+// #define HID_DLGFORM_MASTER_FIELDSSELECTED 34417
hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSSELECTED; };
-#define HID_DLGFORM_MASTER_CMDMOVEUP 34418
+// #define HID_DLGFORM_MASTER_CMDMOVEUP 34418
hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEUP; };
-#define HID_DLGFORM_MASTER_CMDMOVEDOWN 34419
+// #define HID_DLGFORM_MASTER_CMDMOVEDOWN 34419
hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEDOWN; };
-#define HID_DLGFORM_CHKCREATESUBFORM 34421
+// #define HID_DLGFORM_CHKCREATESUBFORM 34421
hidspecial HID { HelpID = HID_DLGFORM_CHKCREATESUBFORM; };
-#define HID_DLGFORM_OPTONEXISTINGRELATION 34422
+// #define HID_DLGFORM_OPTONEXISTINGRELATION 34422
hidspecial HID { HelpID = HID_DLGFORM_OPTONEXISTINGRELATION; };
-#define HID_DLGFORM_OPTSELECTMANUALLY 34423
+// #define HID_DLGFORM_OPTSELECTMANUALLY 34423
hidspecial HID { HelpID = HID_DLGFORM_OPTSELECTMANUALLY; };
-#define HID_DLGFORM_lstRELATIONS 34424
+// #define HID_DLGFORM_lstRELATIONS 34424
hidspecial HID { HelpID = HID_DLGFORM_lstRELATIONS; };
-#define HID_DLGFORM_SUB_LBTABLES 34431
+// #define HID_DLGFORM_SUB_LBTABLES 34431
hidspecial HID { HelpID = HID_DLGFORM_SUB_LBTABLES; };
-#define HID_DLGFORM_SUB_FIELDSAVAILABLE 34432
+// #define HID_DLGFORM_SUB_FIELDSAVAILABLE 34432
hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSAVAILABLE; };
-#define HID_DLGFORM_SUB_CMDMOVESELECTED 34433
+// #define HID_DLGFORM_SUB_CMDMOVESELECTED 34433
hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVESELECTED; };
-#define HID_DLGFORM_SUB_CMDMOVEALL 34434
+// #define HID_DLGFORM_SUB_CMDMOVEALL 34434
hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEALL; };
-#define HID_DLGFORM_SUB_CMDREMOVESELECTED 34435
+// #define HID_DLGFORM_SUB_CMDREMOVESELECTED 34435
hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVESELECTED; };
-#define HID_DLGFORM_SUB_CMDREMOVEALL 34436
+// #define HID_DLGFORM_SUB_CMDREMOVEALL 34436
hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVEALL; };
-#define HID_DLGFORM_SUB_FIELDSSELECTED 34437
+// #define HID_DLGFORM_SUB_FIELDSSELECTED 34437
hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSSELECTED; };
-#define HID_DLGFORM_SUB_CMDMOVEUP 34438
+// #define HID_DLGFORM_SUB_CMDMOVEUP 34438
hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEUP; };
-#define HID_DLGFORM_SUB_CMDMOVEDOWN 34439
+// #define HID_DLGFORM_SUB_CMDMOVEDOWN 34439
hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEDOWN; };
-#define HID_DLGFORM_LINKER_LSTSLAVELINK1 34441
+// #define HID_DLGFORM_LINKER_LSTSLAVELINK1 34441
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK1; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK1 34442
+// #define HID_DLGFORM_LINKER_LSTMASTERLINK1 34442
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK1; };
-#define HID_DLGFORM_LINKER_LSTSLAVELINK2 34443
+// #define HID_DLGFORM_LINKER_LSTSLAVELINK2 34443
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK2; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK2 34444
+// #define HID_DLGFORM_LINKER_LSTMASTERLINK2 34444
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK2; };
-#define HID_DLGFORM_LINKER_LSTSLAVELINK3 34445
+// #define HID_DLGFORM_LINKER_LSTSLAVELINK3 34445
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK3; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK3 34446
+// #define HID_DLGFORM_LINKER_LSTMASTERLINK3 34446
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK3; };
-#define HID_DLGFORM_LINKER_LSTSLAVELINK4 34447
+// #define HID_DLGFORM_LINKER_LSTSLAVELINK4 34447
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK4; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK4 34448
+// #define HID_DLGFORM_LINKER_LSTMASTERLINK4 34448
hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK4; };
-#define HID_DLGFORM_CMDALIGNLEFT 34451
+// #define HID_DLGFORM_CMDALIGNLEFT 34451
hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNLEFT; };
-#define HID_DLGFORM_CMDALIGNRIGHT 34452
+// #define HID_DLGFORM_CMDALIGNRIGHT 34452
hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNRIGHT; };
-#define HID_DLGFORM_CMDLEFTLABELED 34453
+// #define HID_DLGFORM_CMDLEFTLABELED 34453
hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED; };
-#define HID_DLGFORM_CMDTOPLABELED 34454
+// #define HID_DLGFORM_CMDTOPLABELED 34454
hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED; };
-#define HID_DLGFORM_CMDTABLESTYLE 34455
+// #define HID_DLGFORM_CMDTABLESTYLE 34455
hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE; };
-#define HID_DLGFORM_CMDTOPJUSTIFIED 34456
+// #define HID_DLGFORM_CMDTOPJUSTIFIED 34456
hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED; };
-#define HID_DLGFORM_CMDLEFTLABELED2 34457
+// #define HID_DLGFORM_CMDLEFTLABELED2 34457
hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED2; };
-#define HID_DLGFORM_CMDTOPLABELED2 34458
+// #define HID_DLGFORM_CMDTOPLABELED2 34458
hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED2; };
-#define HID_DLGFORM_CMDTABLESTYLE2 34459
+// #define HID_DLGFORM_CMDTABLESTYLE2 34459
hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE2; };
-#define HID_DLGFORM_CMDTOPJUSTIFIED2 34460
+// #define HID_DLGFORM_CMDTOPJUSTIFIED2 34460
hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED2; };
-#define HID_DLGFORM_OPTNEWDATAONLY 34461
+// #define HID_DLGFORM_OPTNEWDATAONLY 34461
hidspecial HID { HelpID = HID_DLGFORM_OPTNEWDATAONLY; };
-#define HID_DLGFORM_OPTDISPLAYALLDATA 34462
+// #define HID_DLGFORM_OPTDISPLAYALLDATA 34462
hidspecial HID { HelpID = HID_DLGFORM_OPTDISPLAYALLDATA; };
-#define HID_DLGFORM_CHKNOMODIFICATION 34463
+// #define HID_DLGFORM_CHKNOMODIFICATION 34463
hidspecial HID { HelpID = HID_DLGFORM_CHKNOMODIFICATION; };
-#define HID_DLGFORM_CHKNODELETION 34464
+// #define HID_DLGFORM_CHKNODELETION 34464
hidspecial HID { HelpID = HID_DLGFORM_CHKNODELETION; };
-#define HID_DLGFORM_CHKNOADDITION 34465
+// #define HID_DLGFORM_CHKNOADDITION 34465
hidspecial HID { HelpID = HID_DLGFORM_CHKNOADDITION; };
-#define HID_DLGFORM_LSTSTYLES 34471
+// #define HID_DLGFORM_LSTSTYLES 34471
hidspecial HID { HelpID = HID_DLGFORM_LSTSTYLES; };
-#define HID_DLGFORM_CMDNOBORDER 34472
+// #define HID_DLGFORM_CMDNOBORDER 34472
hidspecial HID { HelpID = HID_DLGFORM_CMDNOBORDER; };
-#define HID_DLGFORM_CMD3DBORDER 34473
+// #define HID_DLGFORM_CMD3DBORDER 34473
hidspecial HID { HelpID = HID_DLGFORM_CMD3DBORDER; };
-#define HID_DLGFORM_CMDSIMPLEBORDER 34474
+// #define HID_DLGFORM_CMDSIMPLEBORDER 34474
hidspecial HID { HelpID = HID_DLGFORM_CMDSIMPLEBORDER; };
-#define HID_DLGFORM_TXTPATH 34481
+// #define HID_DLGFORM_TXTPATH 34481
hidspecial HID { HelpID = HID_DLGFORM_TXTPATH; };
-#define HID_DLGFORM_OPTWORKWITHFORM 34482
+// #define HID_DLGFORM_OPTWORKWITHFORM 34482
hidspecial HID { HelpID = HID_DLGFORM_OPTWORKWITHFORM; };
-#define HID_DLGFORM_OPTMODIFYFORM 34483
+// #define HID_DLGFORM_OPTMODIFYFORM 34483
hidspecial HID { HelpID = HID_DLGFORM_OPTMODIFYFORM; };
-#define HID_DLGNEWSLTR_DIALOG 34500
+// #define HID_DLGNEWSLTR_DIALOG 34500
hidspecial HID { HelpID = HID_DLGNEWSLTR_DIALOG; };
-#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT 34501
+// #define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT 34501
hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSTANDARDLAYOUT; };
-#define HID_DLGNEWSLTR_OPTPARTYLAYOUT 34502
+// #define HID_DLGNEWSLTR_OPTPARTYLAYOUT 34502
hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTPARTYLAYOUT; };
-#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT 34503
+// #define HID_DLGNEWSLTR_OPTBROCHURELAYOUT 34503
hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTBROCHURELAYOUT; };
-#define HID_DLGNEWSLTR_OPTSINGLESIDED 34504
+// #define HID_DLGNEWSLTR_OPTSINGLESIDED 34504
hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSINGLESIDED; };
-#define HID_DLGNEWSLTR_OPTDOUBLESIDED 34505
+// #define HID_DLGNEWSLTR_OPTDOUBLESIDED 34505
hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTDOUBLESIDED; };
-#define HID_DLGNEWSLTR_CMDGOON 34506
+// #define HID_DLGNEWSLTR_CMDGOON 34506
hidspecial HID { HelpID = HID_DLGNEWSLTR_CMDGOON; };
-#define HID_DLGDEPOT_DIALOG_SELLBUY 34520
+// #define HID_DLGDEPOT_DIALOG_SELLBUY 34520
hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SELLBUY ; };
-#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY 34521
+// #define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY 34521
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY ; };
-#define HID_DLGDEPOT_0_TXTQUANTITY 34522
+// #define HID_DLGDEPOT_0_TXTQUANTITY 34522
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTQUANTITY ; };
-#define HID_DLGDEPOT_0_TXTRATE 34523
+// #define HID_DLGDEPOT_0_TXTRATE 34523
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTRATE ; };
-#define HID_DLGDEPOT_0_TXTDATE 34524
+// #define HID_DLGDEPOT_0_TXTDATE 34524
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTDATE ; };
-#define HID_DLGDEPOT_0_TXTCOMMISSION 34525
+// #define HID_DLGDEPOT_0_TXTCOMMISSION 34525
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTCOMMISSION ; };
-#define HID_DLGDEPOT_0_TXTFIX 34526
+// #define HID_DLGDEPOT_0_TXTFIX 34526
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTFIX ; };
-#define HID_DLGDEPOT_0_TXTMINIMUM 34527
+// #define HID_DLGDEPOT_0_TXTMINIMUM 34527
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTMINIMUM ; };
-#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY 34528
+// #define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY 34528
hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SELLBUY ; };
-#define HID_DLGDEPOT_0_CMDGOON_SELLBUY 34529
+// #define HID_DLGDEPOT_0_CMDGOON_SELLBUY 34529
hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SELLBUY ; };
-#define HID_DLGDEPOT_1_LSTSELLSTOCKS 34530
+// #define HID_DLGDEPOT_1_LSTSELLSTOCKS 34530
hidspecial HID { HelpID = HID_DLGDEPOT_1_LSTSELLSTOCKS ; };
-#define HID_DLGDEPOT_2_LSTBUYSTOCKS 34531
+// #define HID_DLGDEPOT_2_LSTBUYSTOCKS 34531
hidspecial HID { HelpID = HID_DLGDEPOT_2_LSTBUYSTOCKS ; };
-#define HID_DLGDEPOT_DIALOG_SPLIT 34532
+// #define HID_DLGDEPOT_DIALOG_SPLIT 34532
hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SPLIT ; };
-#define HID_DLGDEPOT_0_LSTSTOCKNAMES 34533
+// #define HID_DLGDEPOT_0_LSTSTOCKNAMES 34533
hidspecial HID { HelpID = HID_DLGDEPOT_0_LSTSTOCKNAMES ; };
-#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT 34534
+// #define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT 34534
hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SPLIT ; };
-#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT 34535
+// #define HID_DLGDEPOT_0_CMDCANCEL_SPLIT 34535
hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SPLIT ; };
-#define HID_DLGDEPOT_0_CMDGOON_SPLIT 34536
+// #define HID_DLGDEPOT_0_CMDGOON_SPLIT 34536
hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SPLIT ; };
-#define HID_DLGDEPOT_1_OPTPERSHARE 34537
+// #define HID_DLGDEPOT_1_OPTPERSHARE 34537
hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTPERSHARE ; };
-#define HID_DLGDEPOT_1_OPTTOTAL 34538
+// #define HID_DLGDEPOT_1_OPTTOTAL 34538
hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTTOTAL ; };
-#define HID_DLGDEPOT_1_TXTDIVIDEND 34539
+// #define HID_DLGDEPOT_1_TXTDIVIDEND 34539
hidspecial HID { HelpID = HID_DLGDEPOT_1_TXTDIVIDEND ; };
-#define HID_DLGDEPOT_2_TXTOLDRATE 34540
+// #define HID_DLGDEPOT_2_TXTOLDRATE 34540
hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTOLDRATE ; };
-#define HID_DLGDEPOT_2_TXTNEWRATE 34541
+// #define HID_DLGDEPOT_2_TXTNEWRATE 34541
hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTNEWRATE ; };
-#define HID_DLGDEPOT_2_TXTDATE 34542
+// #define HID_DLGDEPOT_2_TXTDATE 34542
hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTDATE ; };
-#define HID_DLGDEPOT_3_TXTSTARTDATE 34543
+// #define HID_DLGDEPOT_3_TXTSTARTDATE 34543
hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTSTARTDATE ; };
-#define HID_DLGDEPOT_3_TXTENDDATE 34544
+// #define HID_DLGDEPOT_3_TXTENDDATE 34544
hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTENDDATE ; };
-#define HID_DLGDEPOT_3_OPTDAILY 34545
+// #define HID_DLGDEPOT_3_OPTDAILY 34545
hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTDAILY ; };
-#define HID_DLGDEPOT_3_OPTWEEKLY 34546
+// #define HID_DLGDEPOT_3_OPTWEEKLY 34546
hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTWEEKLY ; };
-#define HID_DLGDEPOT_DIALOG_HISTORY 34547
+// #define HID_DLGDEPOT_DIALOG_HISTORY 34547
hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_HISTORY ; };
-#define HID_DLGDEPOT_LSTMARKETS 34548
+// #define HID_DLGDEPOT_LSTMARKETS 34548
hidspecial HID { HelpID = HID_DLGDEPOT_LSTMARKETS ; };
-#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY 34549
+// #define HID_DLGDEPOT_0_CMDCANCEL_HISTORY 34549
hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_HISTORY ; };
-#define HID_DLGDEPOT_0_CMDGOON_HISTORY 34550
+// #define HID_DLGDEPOT_0_CMDGOON_HISTORY 34550
hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_HISTORY ; };
-#define HID_DLGIMPORT_DIALOG 34570
+// #define HID_DLGIMPORT_DIALOG 34570
hidspecial HID { HelpID = HID_DLGIMPORT_DIALOG; };
-#define HID_DLGIMPORT_0_CMDHELP 34571
+// #define HID_DLGIMPORT_0_CMDHELP 34571
hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDHELP; };
-#define HID_DLGIMPORT_0_CMDCANCEL 34572
+// #define HID_DLGIMPORT_0_CMDCANCEL 34572
hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDCANCEL; };
-#define HID_DLGIMPORT_0_CMDPREV 34573
+// #define HID_DLGIMPORT_0_CMDPREV 34573
hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDPREV; };
-#define HID_DLGIMPORT_0_CMDNEXT 34574
+// #define HID_DLGIMPORT_0_CMDNEXT 34574
hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDNEXT; };
-#define HID_DLGIMPORT_0_OPTSODOCUMENTS 34575
+// #define HID_DLGIMPORT_0_OPTSODOCUMENTS 34575
hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTSODOCUMENTS; };
-#define HID_DLGIMPORT_0_OPTMSDOCUMENTS 34576
+// #define HID_DLGIMPORT_0_OPTMSDOCUMENTS 34576
hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTMSDOCUMENTS; };
-#define HID_DLGIMPORT_0_CHKLOGFILE 34577
+// #define HID_DLGIMPORT_0_CHKLOGFILE 34577
hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKLOGFILE; };
-#define HID_DLGIMPORT_2_CHKWORD 34578
+// #define HID_DLGIMPORT_2_CHKWORD 34578
hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKWORD; };
-#define HID_DLGIMPORT_2_CHKEXCEL 34579
+// #define HID_DLGIMPORT_2_CHKEXCEL 34579
hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKEXCEL; };
-#define HID_DLGIMPORT_2_CHKPOWERPOINT 34580
+// #define HID_DLGIMPORT_2_CHKPOWERPOINT 34580
hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKPOWERPOINT; };
-#define HID_DLGIMPORT_2_CBTEMPLATE 34581
+// #define HID_DLGIMPORT_2_CBTEMPLATE 34581
hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATE; };
-#define HID_DLGIMPORT_2_CBTEMPLATERECURSE 34582
+// #define HID_DLGIMPORT_2_CBTEMPLATERECURSE 34582
hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATERECURSE; };
-#define HID_DLGIMPORT_2_LBTEMPLATEPATH 34583
+// #define HID_DLGIMPORT_2_LBTEMPLATEPATH 34583
hidspecial HID { HelpID = HID_DLGIMPORT_2_LBTEMPLATEPATH; };
-#define HID_DLGIMPORT_2_EDTEMPLATEPATH 34584
+// #define HID_DLGIMPORT_2_EDTEMPLATEPATH 34584
hidspecial HID { HelpID = HID_DLGIMPORT_2_EDTEMPLATEPATH; };
-#define HID_DLGIMPORT_2_CBDOCUMENT 34586
+// #define HID_DLGIMPORT_2_CBDOCUMENT 34586
hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; };
-#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT 34585
+// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT 34585
hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT; };
-#define HID_DLGIMPORT_2_CBDOCUMENT 34586
+// #define HID_DLGIMPORT_2_CBDOCUMENT 34586
hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; };
-#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE 34587
+// #define HID_DLGIMPORT_2_CBDOCUMENTRECURSE 34587
hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENTRECURSE; };
-#define HID_DLGIMPORT_2_LBDOCUMENTPATH 34588
+// #define HID_DLGIMPORT_2_LBDOCUMENTPATH 34588
hidspecial HID { HelpID = HID_DLGIMPORT_2_LBDOCUMENTPATH; };
-#define HID_DLGIMPORT_2_EDDOCUMENTPATH 34589
+// #define HID_DLGIMPORT_2_EDDOCUMENTPATH 34589
hidspecial HID { HelpID = HID_DLGIMPORT_2_EDDOCUMENTPATH; };
-#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT 34590
+// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT 34590
hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT; };
-#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH 34591
+// #define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH 34591
hidspecial HID { HelpID = HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH; };
-#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH 34592
+// #define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH 34592
hidspecial HID { HelpID = HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH; };
-#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT 34593
+// #define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT 34593
hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDEXPORTPATHSELECT; };
-#define HID_DLGIMPORT_3_TBSUMMARY 34595
+// #define HID_DLGIMPORT_3_TBSUMMARY 34595
hidspecial HID { HelpID = HID_DLGIMPORT_3_TBSUMMARY; };
-#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 34600
+// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 34600
hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2; };
-#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 34601
+// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 34601
hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2; };
-#define HID_DLGIMPORT_0_CHKWRITER 34596
+// #define HID_DLGIMPORT_0_CHKWRITER 34596
hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKWRITER; };
-#define HID_DLGIMPORT_0_CHKCALC 34597
+// #define HID_DLGIMPORT_0_CHKCALC 34597
hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKCALC; };
-#define HID_DLGIMPORT_0_CHKIMPRESS 34598
+// #define HID_DLGIMPORT_0_CHKIMPRESS 34598
hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKIMPRESS; };
-#define HID_DLGIMPORT_0_CHKMATHGLOBAL 34599
+// #define HID_DLGIMPORT_0_CHKMATHGLOBAL 34599
hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKMATHGLOBAL; };
-#define HID_DLGCORRESPONDENCE_DIALOG 34630
+// #define HID_DLGCORRESPONDENCE_DIALOG 34630
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_DIALOG; };
-#define HID_DLGCORRESPONDENCE_CANCEL 34631
+// #define HID_DLGCORRESPONDENCE_CANCEL 34631
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_CANCEL; };
-#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 34632
+// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 34632
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA1; };
-#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 34633
+// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 34633
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA2; };
-#define HID_DLGCORRESPONDENCE_AGENDAOKAY 34634
+// #define HID_DLGCORRESPONDENCE_AGENDAOKAY 34634
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_AGENDAOKAY; };
-#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 34635
+// #define HID_DLGCORRESPONDENCE_OPTIONLETTER1 34635
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER1; };
-#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 34636
+// #define HID_DLGCORRESPONDENCE_OPTIONLETTER2 34636
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER2; };
-#define HID_DLGCORRESPONDENCE_LETTEROKAY 34637
+// #define HID_DLGCORRESPONDENCE_LETTEROKAY 34637
hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_LETTEROKAY; };
-#define HID_DLGSTYLES_DIALOG 34650
+// #define HID_DLGSTYLES_DIALOG 34650
hidspecial HID { HelpID = HID_DLGSTYLES_DIALOG; };
-#define HID_DLGSTYLES_LISTBOX 34651
+// #define HID_DLGSTYLES_LISTBOX 34651
hidspecial HID { HelpID = HID_DLGSTYLES_LISTBOX; };
-#define HID_DLGSTYLES_CANCEL 34652
+// #define HID_DLGSTYLES_CANCEL 34652
hidspecial HID { HelpID = HID_DLGSTYLES_CANCEL; };
-#define HID_DLGSTYLES_OKAY 34653
+// #define HID_DLGSTYLES_OKAY 34653
hidspecial HID { HelpID = HID_DLGSTYLES_OKAY; };
-#define HID_DLGCONVERT_DIALOG 34660
+// #define HID_DLGCONVERT_DIALOG 34660
hidspecial HID { HelpID = HID_DLGCONVERT_DIALOG; };
-#define HID_DLGCONVERT_CHECKBOX1 34661
+// #define HID_DLGCONVERT_CHECKBOX1 34661
hidspecial HID { HelpID = HID_DLGCONVERT_CHECKBOX1; };
-#define HID_DLGCONVERT_OPTIONBUTTON1 34662
+// #define HID_DLGCONVERT_OPTIONBUTTON1 34662
hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON1; };
-#define HID_DLGCONVERT_OPTIONBUTTON2 34663
+// #define HID_DLGCONVERT_OPTIONBUTTON2 34663
hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON2; };
-#define HID_DLGCONVERT_OPTIONBUTTON3 34664
+// #define HID_DLGCONVERT_OPTIONBUTTON3 34664
hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON3; };
-#define HID_DLGCONVERT_OPTIONBUTTON4 34665
+// #define HID_DLGCONVERT_OPTIONBUTTON4 34665
hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON4; };
-#define HID_DLGCONVERT_LISTBOX1 34666
+// #define HID_DLGCONVERT_LISTBOX1 34666
hidspecial HID { HelpID = HID_DLGCONVERT_LISTBOX1; };
-#define HID_DLGCONVERT_OBFILE 34667
+// #define HID_DLGCONVERT_OBFILE 34667
hidspecial HID { HelpID = HID_DLGCONVERT_OBFILE; };
-#define HID_DLGCONVERT_OBDIR 34668
+// #define HID_DLGCONVERT_OBDIR 34668
hidspecial HID { HelpID = HID_DLGCONVERT_OBDIR; };
-#define HID_DLGCONVERT_COMBOBOX1 34669
+// #define HID_DLGCONVERT_COMBOBOX1 34669
hidspecial HID { HelpID = HID_DLGCONVERT_COMBOBOX1; };
-#define HID_DLGCONVERT_TBSOURCE 34670
+// #define HID_DLGCONVERT_TBSOURCE 34670
hidspecial HID { HelpID = HID_DLGCONVERT_TBSOURCE; };
-#define HID_DLGCONVERT_CHECKRECURSIVE 34671
+// #define HID_DLGCONVERT_CHECKRECURSIVE 34671
hidspecial HID { HelpID = HID_DLGCONVERT_CHECKRECURSIVE; };
-#define HID_DLGCONVERT_TBTARGET 34672
+// #define HID_DLGCONVERT_TBTARGET 34672
hidspecial HID { HelpID = HID_DLGCONVERT_TBTARGET; };
-#define HID_DLGCONVERT_CBCANCEL 34673
+// #define HID_DLGCONVERT_CBCANCEL 34673
hidspecial HID { HelpID = HID_DLGCONVERT_CBCANCEL; };
-#define HID_DLGCONVERT_CBHELP 34674
+// #define HID_DLGCONVERT_CBHELP 34674
hidspecial HID { HelpID = HID_DLGCONVERT_CBHELP; };
-#define HID_DLGCONVERT_CBBACK 34675
+// #define HID_DLGCONVERT_CBBACK 34675
hidspecial HID { HelpID = HID_DLGCONVERT_CBBACK; };
-#define HID_DLGCONVERT_CBGOON 34676
+// #define HID_DLGCONVERT_CBGOON 34676
hidspecial HID { HelpID = HID_DLGCONVERT_CBGOON; };
-#define HID_DLGCONVERT_CBSOURCEOPEN 34677
+// #define HID_DLGCONVERT_CBSOURCEOPEN 34677
hidspecial HID { HelpID = HID_DLGCONVERT_CBSOURCEOPEN; };
-#define HID_DLGCONVERT_CBTARGETOPEN 34678
+// #define HID_DLGCONVERT_CBTARGETOPEN 34678
hidspecial HID { HelpID = HID_DLGCONVERT_CBTARGETOPEN; };
-#define HID_DLGCONVERT_CHKPROTECT 34679
+// #define HID_DLGCONVERT_CHKPROTECT 34679
hidspecial HID { HelpID = HID_DLGCONVERT_CHKPROTECT; };
-#define HID_DLGCONVERT_CHKTEXTDOCUMENTS 34680
+// #define HID_DLGCONVERT_CHKTEXTDOCUMENTS 34680
hidspecial HID { HelpID = HID_DLGCONVERT_CHKTEXTDOCUMENTS; };
-#define HID_DLGPASSWORD_CMDGOON 34690
+// #define HID_DLGPASSWORD_CMDGOON 34690
hidspecial HID { HelpID = HID_DLGPASSWORD_CMDGOON; };
-#define HID_DLGPASSWORD_CMDCANCEL 34691
+// #define HID_DLGPASSWORD_CMDCANCEL 34691
hidspecial HID { HelpID = HID_DLGPASSWORD_CMDCANCEL; };
-#define HID_DLGPASSWORD_CMDHELP 34692
+// #define HID_DLGPASSWORD_CMDHELP 34692
hidspecial HID { HelpID = HID_DLGPASSWORD_CMDHELP; };
-#define HID_DLGPASSWORD_TXTPASSWORD 34693
+// #define HID_DLGPASSWORD_TXTPASSWORD 34693
hidspecial HID { HelpID = HID_DLGPASSWORD_TXTPASSWORD; };
-#define HID_DLGHOLIDAYCAL_DIALOG 34700
+// #define HID_DLGHOLIDAYCAL_DIALOG 34700
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_DIALOG; };
-#define HID_DLGHOLIDAYCAL_1_PREVIEW 34701
+// #define HID_DLGHOLIDAYCAL_1_PREVIEW 34701
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_PREVIEW; };
-#define HID_DLGHOLIDAYCAL_1_OPYEAR 34702
+// #define HID_DLGHOLIDAYCAL_1_OPYEAR 34702
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPYEAR; };
-#define HID_DLGHOLIDAYCAL_1_OPMONTH 34703
+// #define HID_DLGHOLIDAYCAL_1_OPMONTH 34703
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPMONTH; };
-#define HID_DLGHOLIDAYCAL_1_EDYEAR 34704
+// #define HID_DLGHOLIDAYCAL_1_EDYEAR 34704
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDYEAR; };
-#define HID_DLGHOLIDAYCAL_1_EDMONTH 34705
+// #define HID_DLGHOLIDAYCAL_1_EDMONTH 34705
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDMONTH; };
-#define HID_DLGHOLIDAYCAL_1_SPINYEAR 34706
+// #define HID_DLGHOLIDAYCAL_1_SPINYEAR 34706
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINYEAR; };
-#define HID_DLGHOLIDAYCAL_1_SPINMONTH 34707
+// #define HID_DLGHOLIDAYCAL_1_SPINMONTH 34707
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINMONTH; };
-#define HID_DLGHOLIDAYCAL_1_CMBSTATE 34708
+// #define HID_DLGHOLIDAYCAL_1_CMBSTATE 34708
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_CMBSTATE; };
-#define HID_DLGHOLIDAYCAL_2_LBOWNDATA 34709
+// #define HID_DLGHOLIDAYCAL_2_LBOWNDATA 34709
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_LBOWNDATA; };
-#define HID_DLGHOLIDAYCAL_2_CMDINSERT 34710
+// #define HID_DLGHOLIDAYCAL_2_CMDINSERT 34710
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDINSERT; };
-#define HID_DLGHOLIDAYCAL_2_CMDDELETE 34711
+// #define HID_DLGHOLIDAYCAL_2_CMDDELETE 34711
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDDELETE; };
-#define HID_DLGHOLIDAYCAL_2_EDEVENT 34712
+// #define HID_DLGHOLIDAYCAL_2_EDEVENT 34712
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENT; };
-#define HID_DLGHOLIDAYCAL_2_CHKEVENT 34713
+// #define HID_DLGHOLIDAYCAL_2_CHKEVENT 34713
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CHKEVENT; };
-#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY 34714
+// #define HID_DLGHOLIDAYCAL_2_EDEVENTDAY 34714
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTDAY; };
-#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY 34715
+// #define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY 34715
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTDAY; };
-#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH 34716
+// #define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH 34716
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTMONTH; };
-#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH 34717
+// #define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH 34717
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH; };
-#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR 34718
+// #define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR 34718
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTYEAR; };
-#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR 34719
+// #define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR 34719
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR; };
-#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA 34720
+// #define HID_DLGHOLIDAYCAL_0_CMDOWNDATA 34720
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOWNDATA; };
-#define HID_DLGHOLIDAYCAL_0_CMDCANCEL 34721
+// #define HID_DLGHOLIDAYCAL_0_CMDCANCEL 34721
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDCANCEL; };
-#define HID_DLGHOLIDAYCAL_0_CMDOK 34722
+// #define HID_DLGHOLIDAYCAL_0_CMDOK 34722
hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOK; };
//End at 34767
@@ -785,381 +786,381 @@ hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOK; };
//LetterWizard---------------------------
-#define HID_LTRWIZ_OPTBUSINESSLETTER 40769
+// #define HID_LTRWIZ_OPTBUSINESSLETTER 40769
hidspecial HID { HelpID = HID_LTRWIZ_OPTBUSINESSLETTER; };
-#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER 40770
+// #define HID_LTRWIZ_OPTPRIVOFFICIALLETTER 40770
hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVOFFICIALLETTER; };
-#define HID_LTRWIZ_OPTPRIVATELETTER 40771
+// #define HID_LTRWIZ_OPTPRIVATELETTER 40771
hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVATELETTER; };
-#define HID_LTRWIZ_LSTBUSINESSSTYLE 40772
+// #define HID_LTRWIZ_LSTBUSINESSSTYLE 40772
hidspecial HID { HelpID = HID_LTRWIZ_LSTBUSINESSSTYLE; };
-#define HID_LTRWIZ_CHKBUSINESSPAPER 40773
+// #define HID_LTRWIZ_CHKBUSINESSPAPER 40773
hidspecial HID { HelpID = HID_LTRWIZ_CHKBUSINESSPAPER; };
-#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE 40774
+// #define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE 40774
hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVOFFICIALSTYLE; };
-#define HID_LTRWIZ_LSTPRIVATESTYLE 40775
+// #define HID_LTRWIZ_LSTPRIVATESTYLE 40775
hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVATESTYLE; };
-#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO 40776
+// #define HID_LTRWIZ_CHKPAPERCOMPANYLOGO 40776
hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYLOGO; };
-#define HID_LTRWIZ_NUMLOGOHEIGHT 40777
+// #define HID_LTRWIZ_NUMLOGOHEIGHT 40777
hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOHEIGHT; };
-#define HID_LTRWIZ_NUMLOGOX 40778
+// #define HID_LTRWIZ_NUMLOGOX 40778
hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOX; };
-#define HID_LTRWIZ_NUMLOGOWIDTH 40779
+// #define HID_LTRWIZ_NUMLOGOWIDTH 40779
hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOWIDTH; };
-#define HID_LTRWIZ_NUMLOGOY 40780
+// #define HID_LTRWIZ_NUMLOGOY 40780
hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOY; };
-#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS 40781
+// #define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS 40781
hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYADDRESS; };
-#define HID_LTRWIZ_NUMADDRESSHEIGHT 40782
+// #define HID_LTRWIZ_NUMADDRESSHEIGHT 40782
hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSHEIGHT; };
-#define HID_LTRWIZ_NUMADDRESSX 40783
+// #define HID_LTRWIZ_NUMADDRESSX 40783
hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSX; };
-#define HID_LTRWIZ_NUMADDRESSWIDTH 40784
+// #define HID_LTRWIZ_NUMADDRESSWIDTH 40784
hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSWIDTH; };
-#define HID_LTRWIZ_NUMADDRESSY 40785
+// #define HID_LTRWIZ_NUMADDRESSY 40785
hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSY; };
-#define HID_LTRWIZ_CHKCOMPANYRECEIVER 40786
+// #define HID_LTRWIZ_CHKCOMPANYRECEIVER 40786
hidspecial HID { HelpID = HID_LTRWIZ_CHKCOMPANYRECEIVER; };
-#define HID_LTRWIZ_CHKPAPERFOOTER 40787
+// #define HID_LTRWIZ_CHKPAPERFOOTER 40787
hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERFOOTER; };
-#define HID_LTRWIZ_NUMFOOTERHEIGHT 40788
+// #define HID_LTRWIZ_NUMFOOTERHEIGHT 40788
hidspecial HID { HelpID = HID_LTRWIZ_NUMFOOTERHEIGHT; };
-#define HID_LTRWIZ_LSTLETTERNORM 40789
+// #define HID_LTRWIZ_LSTLETTERNORM 40789
hidspecial HID { HelpID = HID_LTRWIZ_LSTLETTERNORM; };
-#define HID_LTRWIZ_CHKUSELOGO 40790
+// #define HID_LTRWIZ_CHKUSELOGO 40790
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSELOGO; };
-#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER 40791
+// #define HID_LTRWIZ_CHKUSEADDRESSRECEIVER 40791
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEADDRESSRECEIVER; };
-#define HID_LTRWIZ_CHKUSESIGNS 40792
+// #define HID_LTRWIZ_CHKUSESIGNS 40792
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESIGNS; };
-#define HID_LTRWIZ_CHKUSESUBJECT 40793
+// #define HID_LTRWIZ_CHKUSESUBJECT 40793
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESUBJECT; };
-#define HID_LTRWIZ_CHKUSESALUTATION 40794
+// #define HID_LTRWIZ_CHKUSESALUTATION 40794
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESALUTATION; };
-#define HID_LTRWIZ_LSTSALUTATION 40795
+// #define HID_LTRWIZ_LSTSALUTATION 40795
hidspecial HID { HelpID = HID_LTRWIZ_LSTSALUTATION; };
-#define HID_LTRWIZ_CHKUSEBENDMARKS 40796
+// #define HID_LTRWIZ_CHKUSEBENDMARKS 40796
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEBENDMARKS; };
-#define HID_LTRWIZ_CHKUSEGREETING 40797
+// #define HID_LTRWIZ_CHKUSEGREETING 40797
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEGREETING; };
-#define HID_LTRWIZ_LSTGREETING 40798
+// #define HID_LTRWIZ_LSTGREETING 40798
hidspecial HID { HelpID = HID_LTRWIZ_LSTGREETING; };
-#define HID_LTRWIZ_CHKUSEFOOTER 40799
+// #define HID_LTRWIZ_CHKUSEFOOTER 40799
hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEFOOTER; };
-#define HID_LTRWIZ_OPTSENDERPLACEHOLDER 40800
+// #define HID_LTRWIZ_OPTSENDERPLACEHOLDER 40800
hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERPLACEHOLDER; };
-#define HID_LTRWIZ_OPTSENDERDEFINE 40801
+// #define HID_LTRWIZ_OPTSENDERDEFINE 40801
hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERDEFINE; };
-#define HID_LTRWIZ_TXTSENDERNAME 40802
+// #define HID_LTRWIZ_TXTSENDERNAME 40802
hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERNAME; };
-#define HID_LTRWIZ_TXTSENDERSTREET 40803
+// #define HID_LTRWIZ_TXTSENDERSTREET 40803
hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTREET; };
-#define HID_LTRWIZ_TXTSENDERPOSTCODE 40804
+// #define HID_LTRWIZ_TXTSENDERPOSTCODE 40804
hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERPOSTCODE; };
-#define HID_LTRWIZ_TXTSENDERSTATE_TEXT 40805
+// #define HID_LTRWIZ_TXTSENDERSTATE_TEXT 40805
hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTATE_TEXT; };
-#define HID_LTRWIZ_TXTSENDERCITY 40806
+// #define HID_LTRWIZ_TXTSENDERCITY 40806
hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERCITY; };
-#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER 40807
+// #define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER 40807
hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERPLACEHOLDER; };
-#define HID_LTRWIZ_OPTRECEIVERDATABASE 40808
+// #define HID_LTRWIZ_OPTRECEIVERDATABASE 40808
hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERDATABASE; };
-#define HID_LTRWIZ_TXTFOOTER 40809
+// #define HID_LTRWIZ_TXTFOOTER 40809
hidspecial HID { HelpID = HID_LTRWIZ_TXTFOOTER; };
-#define HID_LTRWIZ_CHKFOOTERNEXTPAGES 40810
+// #define HID_LTRWIZ_CHKFOOTERNEXTPAGES 40810
hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERNEXTPAGES; };
-#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS 40811
+// #define HID_LTRWIZ_CHKFOOTERPAGENUMBERS 40811
hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERPAGENUMBERS; };
-#define HID_LTRWIZ_TXTTEMPLATENAME 40812
+// #define HID_LTRWIZ_TXTTEMPLATENAME 40812
hidspecial HID { HelpID = HID_LTRWIZ_TXTTEMPLATENAME; };
-#define HID_LTRWIZ_OPTCREATELETTER 40813
+// #define HID_LTRWIZ_OPTCREATELETTER 40813
hidspecial HID { HelpID = HID_LTRWIZ_OPTCREATELETTER; };
-#define HID_LTRWIZ_OPTMAKECHANGES 40814
+// #define HID_LTRWIZ_OPTMAKECHANGES 40814
hidspecial HID { HelpID = HID_LTRWIZ_OPTMAKECHANGES; };
-#define HID_LTRWIZ_TXTPATH 40815
+// #define HID_LTRWIZ_TXTPATH 40815
hidspecial HID { HelpID = HID_LTRWIZ_TXTPATH; };
-#define HID_LTRWIZ_CMDPATH 40816
+// #define HID_LTRWIZ_CMDPATH 40816
hidspecial HID { HelpID = HID_LTRWIZ_CMDPATH; };
-#define HID_LTRWIZARD 40820
+// #define HID_LTRWIZARD 40820
hidspecial HID { HelpID = HID_LTRWIZARD; };
-#define HID_LTRWIZARD_HELP 40821
+// #define HID_LTRWIZARD_HELP 40821
hidspecial HID { HelpID = HID_LTRWIZARD_HELP; };
-#define HID_LTRWIZARD_BACK 40822
+// #define HID_LTRWIZARD_BACK 40822
hidspecial HID { HelpID = HID_LTRWIZARD_BACK; };
-#define HID_LTRWIZARD_NEXT 40823
+// #define HID_LTRWIZARD_NEXT 40823
hidspecial HID { HelpID = HID_LTRWIZARD_NEXT; };
-#define HID_LTRWIZARD_CREATE 40824
+// #define HID_LTRWIZARD_CREATE 40824
hidspecial HID { HelpID = HID_LTRWIZARD_CREATE; };
-#define HID_LTRWIZARD_CANCEL 40825
+// #define HID_LTRWIZARD_CANCEL 40825
hidspecial HID { HelpID = HID_LTRWIZARD_CANCEL; };
-#define HID_QUERYWIZARD_LSTTABLES 40850
+// #define HID_QUERYWIZARD_LSTTABLES 40850
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTTABLES; };
-#define HID_QUERYWIZARD_LSTFIELDS 40851
+// #define HID_QUERYWIZARD_LSTFIELDS 40851
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDS; };
-#define HID_QUERYWIZARD_CMDMOVESELECTED 40852
+// #define HID_QUERYWIZARD_CMDMOVESELECTED 40852
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVESELECTED; };
-#define HID_QUERYWIZARD_CMDMOVEALL 40853
+// #define HID_QUERYWIZARD_CMDMOVEALL 40853
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEALL; };
-#define HID_QUERYWIZARD_CMDREMOVESELECTED 40854
+// #define HID_QUERYWIZARD_CMDREMOVESELECTED 40854
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVESELECTED; };
-#define HID_QUERYWIZARD_CMDREMOVEALL 40855
+// #define HID_QUERYWIZARD_CMDREMOVEALL 40855
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVEALL; };
-#define HID_QUERYWIZARD_LSTSELFIELDS 40856
+// #define HID_QUERYWIZARD_LSTSELFIELDS 40856
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTSELFIELDS; };
-#define HID_QUERYWIZARD_CMDMOVEUP 40857
+// #define HID_QUERYWIZARD_CMDMOVEUP 40857
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEUP; };
-#define HID_QUERYWIZARD_CMDMOVEDOWN 40858
+// #define HID_QUERYWIZARD_CMDMOVEDOWN 40858
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEDOWN; };
-#define HID_QUERYWIZARD_SORT1 40865
+// #define HID_QUERYWIZARD_SORT1 40865
hidspecial HID { HelpID = HID_QUERYWIZARD_SORT1; };
-#define HID_QUERYWIZARD_OPTASCEND1 40866
+// #define HID_QUERYWIZARD_OPTASCEND1 40866
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND1; };
-#define HID_QUERYWIZARD_OPTDESCEND1 40867
+// #define HID_QUERYWIZARD_OPTDESCEND1 40867
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND1; };
-#define HID_QUERYWIZARD_SORT2 40868
+// #define HID_QUERYWIZARD_SORT2 40868
hidspecial HID { HelpID = HID_QUERYWIZARD_SORT2; };
-#define HID_QUERYWIZARD_OPTASCEND2 40869
+// #define HID_QUERYWIZARD_OPTASCEND2 40869
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND2; };
-#define HID_QUERYWIZARD_OPTDESCEND2 40870
+// #define HID_QUERYWIZARD_OPTDESCEND2 40870
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND2; };
-#define HID_QUERYWIZARD_SORT3 40871
+// #define HID_QUERYWIZARD_SORT3 40871
hidspecial HID { HelpID = HID_QUERYWIZARD_SORT3; };
-#define HID_QUERYWIZARD_OPTASCEND3 40872
+// #define HID_QUERYWIZARD_OPTASCEND3 40872
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND3; };
-#define HID_QUERYWIZARD_OPTDESCEND3 40873
+// #define HID_QUERYWIZARD_OPTDESCEND3 40873
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND3; };
-#define HID_QUERYWIZARD_SORT4 40874
+// #define HID_QUERYWIZARD_SORT4 40874
hidspecial HID { HelpID = HID_QUERYWIZARD_SORT4; };
-#define HID_QUERYWIZARD_OPTASCEND4 40875
+// #define HID_QUERYWIZARD_OPTASCEND4 40875
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND4; };
-#define HID_QUERYWIZARD_OPTDESCEND4 40876
+// #define HID_QUERYWIZARD_OPTDESCEND4 40876
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND4; };
-#define HID_QUERYWIZARD_OPTMATCHALL 40878
+// #define HID_QUERYWIZARD_OPTMATCHALL 40878
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHALL; };
-#define HID_QUERYWIZARD_OPTMATCHANY 40879
+// #define HID_QUERYWIZARD_OPTMATCHANY 40879
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHANY; };
-#define HID_QUERYWIZARD_LSTFIELDNAME_1 40880
+// #define HID_QUERYWIZARD_LSTFIELDNAME_1 40880
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_1; };
-#define HID_QUERYWIZARD_LSTOPERATOR_1 40881
+// #define HID_QUERYWIZARD_LSTOPERATOR_1 40881
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_1; };
-#define HID_QUERYWIZARD_TXTVALUE_1 40882
+// #define HID_QUERYWIZARD_TXTVALUE_1 40882
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_1; };
-#define HID_QUERYWIZARD_LSTFIELDNAME_2 40883
+// #define HID_QUERYWIZARD_LSTFIELDNAME_2 40883
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_2; };
-#define HID_QUERYWIZARD_LSTOPERATOR_2 40884
+// #define HID_QUERYWIZARD_LSTOPERATOR_2 40884
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_2; };
-#define HID_QUERYWIZARD_TXTVALUE_2 40885
+// #define HID_QUERYWIZARD_TXTVALUE_2 40885
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_2; };
-#define HID_QUERYWIZARD_LSTFIELDNAME_3 40886
+// #define HID_QUERYWIZARD_LSTFIELDNAME_3 40886
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_3; };
-#define HID_QUERYWIZARD_LSTOPERATOR_3 40887
+// #define HID_QUERYWIZARD_LSTOPERATOR_3 40887
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_3; };
-#define HID_QUERYWIZARD_TXTVALUE_3 40888
+// #define HID_QUERYWIZARD_TXTVALUE_3 40888
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_3; };
-#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY 40895
+// #define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY 40895
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY; };
-#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 40896
+// #define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 40896
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 40897
+// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 40897
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 40898
+// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 40898
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 40899
+// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 40899
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 40900
+// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 40900
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 40901
+// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 40901
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 40902
+// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 40902
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 40903
+// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 40903
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 40904
+// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 40904
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 40905
+// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 40905
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 40906
+// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 40906
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5; };
-#define HID_QUERYWIZARD_BTNAGGREGATEPLUS 40907
+// #define HID_QUERYWIZARD_BTNAGGREGATEPLUS 40907
hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEPLUS; };
-#define HID_QUERYWIZARD_BTNAGGREGATEMINUS 40908
+// #define HID_QUERYWIZARD_BTNAGGREGATEMINUS 40908
hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEMINUS; };
-#define HID_QUERYWIZARD_LSTFILTERFIELDS 40915
+// #define HID_QUERYWIZARD_LSTFILTERFIELDS 40915
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDS; };
-#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED 40916
+// #define HID_QUERYWIZARD_CMDFILTERMOVESELECTED 40916
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVESELECTED; };
-#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED 40917
+// #define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED 40917
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERREMOVESELECTED; };
-#define HID_QUERYWIZARD_LSTFILTERSELFIELDS 40918
+// #define HID_QUERYWIZARD_LSTFILTERSELFIELDS 40918
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERSELFIELDS; };
-#define HID_QUERYWIZARD_CMDFILTERMOVEUP 40919
+// #define HID_QUERYWIZARD_CMDFILTERMOVEUP 40919
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEUP; };
-#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN 40920
+// #define HID_QUERYWIZARD_CMDFILTERMOVEDOWN 40920
hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEDOWN; };
-#define HID_QUERYWIZARD_OPTGROUPMATCHALL 40923
+// #define HID_QUERYWIZARD_OPTGROUPMATCHALL 40923
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHALL; };
-#define HID_QUERYWIZARD_OPTGROUPMATCHANY 40924
+// #define HID_QUERYWIZARD_OPTGROUPMATCHANY 40924
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHANY; };
-#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 40925
+// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 40925
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_1; };
-#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 40926
+// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 40926
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_1; };
-#define HID_QUERYWIZARD_TXTFILTERVALUE_1 40927
+// #define HID_QUERYWIZARD_TXTFILTERVALUE_1 40927
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_1; };
-#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 40928
+// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 40928
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_2; };
-#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 40929
+// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 40929
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_2; };
-#define HID_QUERYWIZARD_TXTFILTERVALUE_2 40930
+// #define HID_QUERYWIZARD_TXTFILTERVALUE_2 40930
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_2; };
-#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 40931
+// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 40931
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_3; };
-#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 40932
+// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 40932
hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_3; };
-#define HID_QUERYWIZARD_TXTFILTERVALUE_3 40933
+// #define HID_QUERYWIZARD_TXTFILTERVALUE_3 40933
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_3; };
-#define HID_QUERYWIZARD_TXTTITLE_1 40940
+// #define HID_QUERYWIZARD_TXTTITLE_1 40940
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_1; };
-#define HID_QUERYWIZARD_TXTTITLE_2 40941
+// #define HID_QUERYWIZARD_TXTTITLE_2 40941
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_2; };
-#define HID_QUERYWIZARD_TXTTITLE_3 40942
+// #define HID_QUERYWIZARD_TXTTITLE_3 40942
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_3; };
-#define HID_QUERYWIZARD_TXTTITLE_4 40943
+// #define HID_QUERYWIZARD_TXTTITLE_4 40943
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_4; };
-#define HID_QUERYWIZARD_TXTTITLE_5 40944
+// #define HID_QUERYWIZARD_TXTTITLE_5 40944
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_5; };
-#define HID_QUERYWIZARD_TXTTITLE_6 40945
+// #define HID_QUERYWIZARD_TXTTITLE_6 40945
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_6; };
-#define HID_QUERYWIZARD_TXTTITLE_7 40946
+// #define HID_QUERYWIZARD_TXTTITLE_7 40946
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_7; };
-#define HID_QUERYWIZARD_TXTQUERYTITLE 40955
+// #define HID_QUERYWIZARD_TXTQUERYTITLE 40955
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTQUERYTITLE; };
-#define HID_QUERYWIZARD_OPTDISPLAYQUERY 40956
+// #define HID_QUERYWIZARD_OPTDISPLAYQUERY 40956
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDISPLAYQUERY; };
-#define HID_QUERYWIZARD_OPTMODIFYQUERY 40957
+// #define HID_QUERYWIZARD_OPTMODIFYQUERY 40957
hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMODIFYQUERY; };
-#define HID_QUERYWIZARD_TXTSUMMARY 40958
+// #define HID_QUERYWIZARD_TXTSUMMARY 40958
hidspecial HID { HelpID = HID_QUERYWIZARD_TXTSUMMARY; };
-#define HID_QUERYWIZARD 40970
+// #define HID_QUERYWIZARD 40970
hidspecial HID { HelpID = HID_QUERYWIZARD; };
-#define HID_QUERYWIZARD_BACK 40972
+// #define HID_QUERYWIZARD_BACK 40972
hidspecial HID { HelpID = HID_QUERYWIZARD_BACK; };
-#define HID_QUERYWIZARD_NEXT 40973
+// #define HID_QUERYWIZARD_NEXT 40973
hidspecial HID { HelpID = HID_QUERYWIZARD_NEXT; };
-#define HID_QUERYWIZARD_CREATE 40974
+// #define HID_QUERYWIZARD_CREATE 40974
hidspecial HID { HelpID = HID_QUERYWIZARD_CREATE; };
-#define HID_QUERYWIZARD_CANCEL 40975
+// #define HID_QUERYWIZARD_CANCEL 40975
hidspecial HID { HelpID = HID_QUERYWIZARD_CANCEL; };
// ++++++++++++++++++++++++++++++++++++++
// +++ Web Wizard : Continued from 34312
// ++++++++++++++++++++++++++++++++++++++
// web wizard iconssets dialog
-#define HID_IS 41000
+// #define HID_IS 41000
hidspecial HID { HelpID = HID_IS; } ;
-#define HID_IS_BTN_NONE 41002
+// #define HID_IS_BTN_NONE 41002
hidspecial HID { HelpID = HID_IS_BTN_NONE; } ;
-#define HID_IS_BTN_OK 41003
+// #define HID_IS_BTN_OK 41003
hidspecial HID { HelpID = HID_IS_BTN_OK; } ;
-#define HID_IS_BTN_CANCEL 41004
+// #define HID_IS_BTN_CANCEL 41004
hidspecial HID { HelpID = HID_IS_BTN_CANCEL; } ;
-#define HID_IS_BTN_IMG1 41005
+// #define HID_IS_BTN_IMG1 41005
hidspecial HID { HelpID = HID_IS_BTN_IMG1; } ;
-#define HID_IS_BTN_IMG2 41006
+// #define HID_IS_BTN_IMG2 41006
hidspecial HID { HelpID = HID_IS_BTN_IMG2; } ;
-#define HID_IS_BTN_IMG3 41007
+// #define HID_IS_BTN_IMG3 41007
hidspecial HID { HelpID = HID_IS_BTN_IMG3; } ;
-#define HID_IS_BTN_IMG4 41008
+// #define HID_IS_BTN_IMG4 41008
hidspecial HID { HelpID = HID_IS_BTN_IMG4; } ;
-#define HID_IS_BTN_IMG5 41009
+// #define HID_IS_BTN_IMG5 41009
hidspecial HID { HelpID = HID_IS_BTN_IMG5; } ;
-#define HID_IS_BTN_IMG6 41010
+// #define HID_IS_BTN_IMG6 41010
hidspecial HID { HelpID = HID_IS_BTN_IMG6; } ;
-#define HID_IS_BTN_IMG7 41011
+// #define HID_IS_BTN_IMG7 41011
hidspecial HID { HelpID = HID_IS_BTN_IMG7; } ;
-#define HID_IS_BTN_IMG8 41012
+// #define HID_IS_BTN_IMG8 41012
hidspecial HID { HelpID = HID_IS_BTN_IMG8; } ;
-#define HID_IS_BTN_IMG9 41013
+// #define HID_IS_BTN_IMG9 41013
hidspecial HID { HelpID = HID_IS_BTN_IMG9; } ;
-#define HID_IS_BTN_IMG10 41014
+// #define HID_IS_BTN_IMG10 41014
hidspecial HID { HelpID = HID_IS_BTN_IMG10; } ;
-#define HID_IS_BTN_IMG11 41015
+// #define HID_IS_BTN_IMG11 41015
hidspecial HID { HelpID = HID_IS_BTN_IMG11; } ;
-#define HID_IS_BTN_IMG12 41016
+// #define HID_IS_BTN_IMG12 41016
hidspecial HID { HelpID = HID_IS_BTN_IMG12; } ;
-#define HID_IS_BTN_IMG13 41017
+// #define HID_IS_BTN_IMG13 41017
hidspecial HID { HelpID = HID_IS_BTN_IMG13; } ;
-#define HID_IS_BTN_IMG14 41018
+// #define HID_IS_BTN_IMG14 41018
hidspecial HID { HelpID = HID_IS_BTN_IMG14; } ;
-#define HID_IS_BTN_IMG15 41019
+// #define HID_IS_BTN_IMG15 41019
hidspecial HID { HelpID = HID_IS_BTN_IMG15; } ;
-#define HID_IS_BTN_IMG16 41020
+// #define HID_IS_BTN_IMG16 41020
hidspecial HID { HelpID = HID_IS_BTN_IMG16; } ;
-#define HID_IS_BTN_IMG17 41021
+// #define HID_IS_BTN_IMG17 41021
hidspecial HID { HelpID = HID_IS_BTN_IMG17; } ;
-#define HID_IS_BTN_IMG18 41022
+// #define HID_IS_BTN_IMG18 41022
hidspecial HID { HelpID = HID_IS_BTN_IMG18; } ;
-#define HID_IS_BTN_IMG19 41023
+// #define HID_IS_BTN_IMG19 41023
hidspecial HID { HelpID = HID_IS_BTN_IMG19; } ;
-#define HID_IS_BTN_IMG20 41024
+// #define HID_IS_BTN_IMG20 41024
hidspecial HID { HelpID = HID_IS_BTN_IMG20; } ;
-#define HID_IS_BTN_IMG21 41025
+// #define HID_IS_BTN_IMG21 41025
hidspecial HID { HelpID = HID_IS_BTN_IMG21; } ;
-#define HID_IS_BTN_IMG22 41026
+// #define HID_IS_BTN_IMG22 41026
hidspecial HID { HelpID = HID_IS_BTN_IMG22; } ;
-#define HID_IS_BTN_IMG23 41027
+// #define HID_IS_BTN_IMG23 41027
hidspecial HID { HelpID = HID_IS_BTN_IMG23; } ;
-#define HID_IS_BTN_IMG24 41028
+// #define HID_IS_BTN_IMG24 41028
hidspecial HID { HelpID = HID_IS_BTN_IMG24; } ;
-#define HID_IS_BTN_IMG25 41029
+// #define HID_IS_BTN_IMG25 41029
hidspecial HID { HelpID = HID_IS_BTN_IMG25; } ;
-#define HID_IS_BTN_IMG26 41030
+// #define HID_IS_BTN_IMG26 41030
hidspecial HID { HelpID = HID_IS_BTN_IMG26; } ;
-#define HID_IS_BTN_IMG27 41031
+// #define HID_IS_BTN_IMG27 41031
hidspecial HID { HelpID = HID_IS_BTN_IMG27; } ;
-#define HID_IS_BTN_IMG28 41032
+// #define HID_IS_BTN_IMG28 41032
hidspecial HID { HelpID = HID_IS_BTN_IMG28; } ;
-#define HID_IS_BTN_IMG29 41033
+// #define HID_IS_BTN_IMG29 41033
hidspecial HID { HelpID = HID_IS_BTN_IMG29; } ;
-#define HID_IS_BTN_IMG30 41034
+// #define HID_IS_BTN_IMG30 41034
hidspecial HID { HelpID = HID_IS_BTN_IMG30; } ;
-#define HID_IS_BTN_IMG31 41035
+// #define HID_IS_BTN_IMG31 41035
hidspecial HID { HelpID = HID_IS_BTN_IMG31; } ;
-#define HID_IS_BTN_IMG32 41036
+// #define HID_IS_BTN_IMG32 41036
hidspecial HID { HelpID = HID_IS_BTN_IMG32; } ;
// web wizard ftp dialog
-#define HID_FTP 41040
+// #define HID_FTP 41040
hidspecial HID { HelpID = HID_FTP; } ;
-#define HID_FTP_SERVER 41041
+// #define HID_FTP_SERVER 41041
hidspecial HID { HelpID = HID_FTP_SERVER; } ;
-#define HID_FTP_USERNAME 41042
+// #define HID_FTP_USERNAME 41042
hidspecial HID { HelpID = HID_FTP_USERNAME; } ;
-#define HID_FTP_PASS 41043
+// #define HID_FTP_PASS 41043
hidspecial HID { HelpID = HID_FTP_PASS; } ;
-#define HID_FTP_TEST 41044
+// #define HID_FTP_TEST 41044
hidspecial HID { HelpID = HID_FTP_TEST; } ;
-#define HID_FTP_TXT_PATH 41045
+// #define HID_FTP_TXT_PATH 41045
hidspecial HID { HelpID = HID_FTP_TXT_PATH; } ;
-#define HID_FTP_BTN_PATH 41046
+// #define HID_FTP_BTN_PATH 41046
hidspecial HID { HelpID = HID_FTP_BTN_PATH; } ;
-#define HID_FTP_OK 41047
+// #define HID_FTP_OK 41047
hidspecial HID { HelpID = HID_FTP_OK; } ;
-#define HID_FTP_CANCEL 41048
+// #define HID_FTP_CANCEL 41048
hidspecial HID { HelpID = HID_FTP_CANCEL; } ;
@@ -1171,217 +1172,217 @@ hidspecial HID { HelpID = HID_FTP_CANCEL; } ;
// step 0 - navibar
-#define HID_AGWIZ 41051
+// #define HID_AGWIZ 41051
hidspecial HID { HelpID = HID_AGWIZ; } ;
-#define HID_AGWIZ_HELP 41052
+// #define HID_AGWIZ_HELP 41052
hidspecial HID { HelpID = HID_AGWIZ_HELP; } ;
-#define HID_AGWIZ_NEXT 41053
+// #define HID_AGWIZ_NEXT 41053
hidspecial HID { HelpID = HID_AGWIZ_NEXT; } ;
-#define HID_AGWIZ_PREV 41054
+// #define HID_AGWIZ_PREV 41054
hidspecial HID { HelpID = HID_AGWIZ_PREV; } ;
-#define HID_AGWIZ_CREATE 41055
+// #define HID_AGWIZ_CREATE 41055
hidspecial HID { HelpID = HID_AGWIZ_CREATE; } ;
-#define HID_AGWIZ_CANCEL 41056
+// #define HID_AGWIZ_CANCEL 41056
hidspecial HID { HelpID = HID_AGWIZ_CANCEL; } ;
//step 1 - design
-#define HID_AGWIZ_1_LIST_PAGEDESIGN 41057
+// #define HID_AGWIZ_1_LIST_PAGEDESIGN 41057
hidspecial HID { HelpID = HID_AGWIZ_1_LIST_PAGEDESIGN; } ;
-#define HID_AGWIZ_1_CHK_MINUTES 41058
+// #define HID_AGWIZ_1_CHK_MINUTES 41058
hidspecial HID { HelpID = HID_AGWIZ_1_CHK_MINUTES; } ;
// step 2 - general attributes
-#define HID_AGWIZ_2_TXT_TIME 41059
+// #define HID_AGWIZ_2_TXT_TIME 41059
hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TIME; } ;
-#define HID_AGWIZ_2_TXT_DATE 41060
+// #define HID_AGWIZ_2_TXT_DATE 41060
hidspecial HID { HelpID = HID_AGWIZ_2_TXT_DATE; } ;
-#define HID_AGWIZ_2_TXT_TITLE 41061
+// #define HID_AGWIZ_2_TXT_TITLE 41061
hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TITLE; } ;
-#define HID_AGWIZ_2_TXT_LOCATION 41062
+// #define HID_AGWIZ_2_TXT_LOCATION 41062
hidspecial HID { HelpID = HID_AGWIZ_2_TXT_LOCATION; } ;
// step 3 - headings
-#define HID_AGWIZ_3_CHK_MEETING_TYPE 41063
+// #define HID_AGWIZ_3_CHK_MEETING_TYPE 41063
hidspecial HID { HelpID = HID_AGWIZ_3_CHK_MEETING_TYPE; } ;
-#define HID_AGWIZ_3_CHK_READ 41064
+// #define HID_AGWIZ_3_CHK_READ 41064
hidspecial HID { HelpID = HID_AGWIZ_3_CHK_READ; } ;
-#define HID_AGWIZ_3_CHK_BRING 41065
+// #define HID_AGWIZ_3_CHK_BRING 41065
hidspecial HID { HelpID = HID_AGWIZ_3_CHK_BRING; } ;
-#define HID_AGWIZ_3_CHK_NOTES 41066
+// #define HID_AGWIZ_3_CHK_NOTES 41066
hidspecial HID { HelpID = HID_AGWIZ_3_CHK_NOTES; } ;
// step 4 - names
-#define HID_AGWIZ_4_CHK_CALLED_BY 41067
+// #define HID_AGWIZ_4_CHK_CALLED_BY 41067
hidspecial HID { HelpID = HID_AGWIZ_4_CHK_CALLED_BY; } ;
-#define HID_AGWIZ_4_CHK_FACILITATOR 41068
+// #define HID_AGWIZ_4_CHK_FACILITATOR 41068
hidspecial HID { HelpID = HID_AGWIZ_4_CHK_FACILITATOR; } ;
-#define HID_AGWIZ_4_CHK_NOTETAKER 41069
+// #define HID_AGWIZ_4_CHK_NOTETAKER 41069
hidspecial HID { HelpID = HID_AGWIZ_4_CHK_NOTETAKER; } ;
-#define HID_AGWIZ_4_CHK_TIMEKEEPER 41070
+// #define HID_AGWIZ_4_CHK_TIMEKEEPER 41070
hidspecial HID { HelpID = HID_AGWIZ_4_CHK_TIMEKEEPER; } ;
-#define HID_AGWIZ_4_CHK_ATTENDEES 41071
+// #define HID_AGWIZ_4_CHK_ATTENDEES 41071
hidspecial HID { HelpID = HID_AGWIZ_4_CHK_ATTENDEES; } ;
-#define HID_AGWIZ_4_CHK_OBSERVERS 41072
+// #define HID_AGWIZ_4_CHK_OBSERVERS 41072
hidspecial HID { HelpID = HID_AGWIZ_4_CHK_OBSERVERS; } ;
-#define HID_AGWIZ_4_CHK_RESOURCEPERSONS 41073
+// #define HID_AGWIZ_4_CHK_RESOURCEPERSONS 41073
hidspecial HID { HelpID = HID_AGWIZ_4_CHK_RESOURCEPERSONS; } ;
// step 5 - topics
-#define HID_AGWIZ_6_TXT_TEMPLATENAME 41074
+// #define HID_AGWIZ_6_TXT_TEMPLATENAME 41074
hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATENAME; } ;
-#define HID_AGWIZ_6_TXT_TEMPLATEPATH 41075
+// #define HID_AGWIZ_6_TXT_TEMPLATEPATH 41075
hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATEPATH; } ;
-#define HID_AGWIZ_6_BTN_TEMPLATEPATH 41076
+// #define HID_AGWIZ_6_BTN_TEMPLATEPATH 41076
hidspecial HID { HelpID = HID_AGWIZ_6_BTN_TEMPLATEPATH; } ;
// step 6 - file info
-#define HID_AGWIZ_6_OPT_CREATEAGENDA 41077
+// #define HID_AGWIZ_6_OPT_CREATEAGENDA 41077
hidspecial HID { HelpID = HID_AGWIZ_6_OPT_CREATEAGENDA; } ;
-#define HID_AGWIZ_6_OPT_MAKECHANGES 41078
+// #define HID_AGWIZ_6_OPT_MAKECHANGES 41078
hidspecial HID { HelpID = HID_AGWIZ_6_OPT_MAKECHANGES; } ;
// - again step 5 - buttons
-#define HID_AGWIZ_5_BTN_INSERT 41079
+// #define HID_AGWIZ_5_BTN_INSERT 41079
hidspecial HID { HelpID = HID_AGWIZ_5_BTN_INSERT; } ;
-#define HID_AGWIZ_5_BTN_REMOVE 41080
+// #define HID_AGWIZ_5_BTN_REMOVE 41080
hidspecial HID { HelpID = HID_AGWIZ_5_BTN_REMOVE; } ;
-#define HID_AGWIZ_5_BTN_UP 41081
+// #define HID_AGWIZ_5_BTN_UP 41081
hidspecial HID { HelpID = HID_AGWIZ_5_BTN_UP; } ;
-#define HID_AGWIZ_5_BTN_DOWN 41082
+// #define HID_AGWIZ_5_BTN_DOWN 41082
hidspecial HID { HelpID = HID_AGWIZ_5_BTN_DOWN; } ;
// again step 5 - scroll control
-#define HID_AGWIZ_5_SCROLL_BAR 41083
+// #define HID_AGWIZ_5_SCROLL_BAR 41083
hidspecial HID { HelpID = HID_AGWIZ_5_SCROLL_BAR; } ;
-#define HID_AGWIZ_5_TXT_TOPIC_1 41084
+// #define HID_AGWIZ_5_TXT_TOPIC_1 41084
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_1; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 41085
+// #define HID_AGWIZ_5_TXT_RESPONSIBLE_1 41085
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_1; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_1 41086
+// #define HID_AGWIZ_5_TXT_MINUTES_1 41086
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_1; } ;
-#define HID_AGWIZ_5_TXT_TOPIC_2 41087
+// #define HID_AGWIZ_5_TXT_TOPIC_2 41087
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_2; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 41088
+// #define HID_AGWIZ_5_TXT_RESPONSIBLE_2 41088
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_2; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_2 41089
+// #define HID_AGWIZ_5_TXT_MINUTES_2 41089
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_2; } ;
-#define HID_AGWIZ_5_TXT_TOPIC_3 41090
+// #define HID_AGWIZ_5_TXT_TOPIC_3 41090
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_3; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 41091
+// #define HID_AGWIZ_5_TXT_RESPONSIBLE_3 41091
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_3; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_3 41092
+// #define HID_AGWIZ_5_TXT_MINUTES_3 41092
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_3; } ;
-#define HID_AGWIZ_5_TXT_TOPIC_4 41093
+// #define HID_AGWIZ_5_TXT_TOPIC_4 41093
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_4; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 41094
+// #define HID_AGWIZ_5_TXT_RESPONSIBLE_4 41094
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_4; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_4 41095
+// #define HID_AGWIZ_5_TXT_MINUTES_4 41095
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_4; } ;
-#define HID_AGWIZ_5_TXT_TOPIC_5 41096
+// #define HID_AGWIZ_5_TXT_TOPIC_5 41096
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_5; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 41097
+// #define HID_AGWIZ_5_TXT_RESPONSIBLE_5 41097
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_5; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_5 41098
+// #define HID_AGWIZ_5_TXT_MINUTES_5 41098
hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_5; } ;
//FaxWizard---------------------------
-#define HID_FAXWIZ_OPTBUSINESSFAX 41120
+// #define HID_FAXWIZ_OPTBUSINESSFAX 41120
hidspecial HID { HelpID = HID_FAXWIZ_OPTBUSINESSFAX; };
-#define HID_FAXWIZ_LSTBUSINESSSTYLE 41121
+// #define HID_FAXWIZ_LSTBUSINESSSTYLE 41121
hidspecial HID { HelpID = HID_FAXWIZ_LSTBUSINESSSTYLE; };
-#define HID_FAXWIZ_OPTPRIVATEFAX 41122
+// #define HID_FAXWIZ_OPTPRIVATEFAX 41122
hidspecial HID { HelpID = HID_FAXWIZ_OPTPRIVATEFAX; };
-#define HID_LSTPRIVATESTYLE 41123
+// #define HID_LSTPRIVATESTYLE 41123
hidspecial HID { HelpID = HID_LSTPRIVATESTYLE; };
-#define HID_IMAGECONTROL3 41124
+// #define HID_IMAGECONTROL3 41124
hidspecial HID { HelpID = HID_IMAGECONTROL3; };
-#define HID_CHKUSELOGO 41125
+// #define HID_CHKUSELOGO 41125
hidspecial HID { HelpID = HID_CHKUSELOGO; };
-#define HID_CHKUSEDATE 41126
+// #define HID_CHKUSEDATE 41126
hidspecial HID { HelpID = HID_CHKUSEDATE; };
-#define HID_CHKUSECOMMUNICATIONTYPE 41127
+// #define HID_CHKUSECOMMUNICATIONTYPE 41127
hidspecial HID { HelpID = HID_CHKUSECOMMUNICATIONTYPE; };
-#define HID_LSTCOMMUNICATIONTYPE 41128
+// #define HID_LSTCOMMUNICATIONTYPE 41128
hidspecial HID { HelpID = HID_LSTCOMMUNICATIONTYPE; };
-#define HID_CHKUSESUBJECT 41129
+// #define HID_CHKUSESUBJECT 41129
hidspecial HID { HelpID = HID_CHKUSESUBJECT; };
-#define HID_CHKUSESALUTATION 41130
+// #define HID_CHKUSESALUTATION 41130
hidspecial HID { HelpID = HID_CHKUSESALUTATION; };
-#define HID_LSTSALUTATION 41131
+// #define HID_LSTSALUTATION 41131
hidspecial HID { HelpID = HID_LSTSALUTATION; };
-#define HID_CHKUSEGREETING 41132
+// #define HID_CHKUSEGREETING 41132
hidspecial HID { HelpID = HID_CHKUSEGREETING; };
-#define HID_LSTGREETING 41133
+// #define HID_LSTGREETING 41133
hidspecial HID { HelpID = HID_LSTGREETING; };
-#define HID_CHKUSEFOOTER 41134
+// #define HID_CHKUSEFOOTER 41134
hidspecial HID { HelpID = HID_CHKUSEFOOTER; };
-#define HID_OPTSENDERPLACEHOLDER 41135
+// #define HID_OPTSENDERPLACEHOLDER 41135
hidspecial HID { HelpID = HID_OPTSENDERPLACEHOLDER; };
-#define HID_OPTSENDERDEFINE 41136
+// #define HID_OPTSENDERDEFINE 41136
hidspecial HID { HelpID = HID_OPTSENDERDEFINE; };
-#define HID_TXTSENDERNAME 41137
+// #define HID_TXTSENDERNAME 41137
hidspecial HID { HelpID = HID_TXTSENDERNAME; };
-#define HID_TXTSENDERSTREET 41138
+// #define HID_TXTSENDERSTREET 41138
hidspecial HID { HelpID = HID_TXTSENDERSTREET; };
-#define HID_TXTSENDERPOSTCODE 41139
+// #define HID_TXTSENDERPOSTCODE 41139
hidspecial HID { HelpID = HID_TXTSENDERPOSTCODE; };
-#define HID_TXTSENDERSTATE 41140
+// #define HID_TXTSENDERSTATE 41140
hidspecial HID { HelpID = HID_TXTSENDERSTATE; };
-#define HID_TXTSENDERCITY 41141
+// #define HID_TXTSENDERCITY 41141
hidspecial HID { HelpID = HID_TXTSENDERCITY; };
-#define HID_TXTSENDERFAX 41142
+// #define HID_TXTSENDERFAX 41142
hidspecial HID { HelpID = HID_TXTSENDERFAX; };
-#define HID_OPTRECEIVERPLACEHOLDER 41143
+// #define HID_OPTRECEIVERPLACEHOLDER 41143
hidspecial HID { HelpID = HID_OPTRECEIVERPLACEHOLDER; };
-#define HID_OPTRECEIVERDATABASE 41144
+// #define HID_OPTRECEIVERDATABASE 41144
hidspecial HID { HelpID = HID_OPTRECEIVERDATABASE; };
-#define HID_TXTFOOTER 41145
+// #define HID_TXTFOOTER 41145
hidspecial HID { HelpID = HID_TXTFOOTER; };
-#define HID_CHKFOOTERNEXTPAGES 41146
+// #define HID_CHKFOOTERNEXTPAGES 41146
hidspecial HID { HelpID = HID_CHKFOOTERNEXTPAGES; };
-#define HID_CHKFOOTERPAGENUMBERS 41147
+// #define HID_CHKFOOTERPAGENUMBERS 41147
hidspecial HID { HelpID = HID_CHKFOOTERPAGENUMBERS; };
-#define HID_TXTTEMPLATENAME 41148
+// #define HID_TXTTEMPLATENAME 41148
hidspecial HID { HelpID = HID_TXTTEMPLATENAME; };
-#define HID_FILETEMPLATEPATH 41149
+// #define HID_FILETEMPLATEPATH 41149
hidspecial HID { HelpID = HID_FILETEMPLATEPATH; };
-#define HID_OPTCREATEFAX 41150
+// #define HID_OPTCREATEFAX 41150
hidspecial HID { HelpID = HID_OPTCREATEFAX; };
-#define HID_OPTMAKECHANGES 41151
+// #define HID_OPTMAKECHANGES 41151
hidspecial HID { HelpID = HID_OPTMAKECHANGES; };
-#define HID_IMAGECONTROL2 41152
+// #define HID_IMAGECONTROL2 41152
hidspecial HID { HelpID = HID_IMAGECONTROL2; };
-#define HID_FAXWIZ_TXTPATH 41153
+// #define HID_FAXWIZ_TXTPATH 41153
hidspecial HID { HelpID = HID_FAXWIZ_TXTPATH; };
-#define HID_FAXWIZ_CMDPATH 41154
+// #define HID_FAXWIZ_CMDPATH 41154
hidspecial HID { HelpID = HID_FAXWIZ_CMDPATH; };
-#define HID_FAXWIZARD 41180
+// #define HID_FAXWIZARD 41180
hidspecial HID { HelpID = HID_FAXWIZARD; };
-#define HID_FAXWIZARD_HELP 41181
+// #define HID_FAXWIZARD_HELP 41181
hidspecial HID { HelpID = HID_FAXWIZARD_HELP; };
-#define HID_FAXWIZARD_BACK 41182
+// #define HID_FAXWIZARD_BACK 41182
hidspecial HID { HelpID = HID_FAXWIZARD_BACK; };
-#define HID_FAXWIZARD_NEXT 41183
+// #define HID_FAXWIZARD_NEXT 41183
hidspecial HID { HelpID = HID_FAXWIZARD_NEXT; };
-#define HID_FAXWIZARD_CREATE 41184
+// #define HID_FAXWIZARD_CREATE 41184
hidspecial HID { HelpID = HID_FAXWIZARD_CREATE; };
-#define HID_FAXWIZARD_CANCEL 41185
+// #define HID_FAXWIZARD_CANCEL 41185
hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; };
@@ -1391,105 +1392,105 @@ hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; };
* ====================================
*/
-#define HID_DLGTABLE_DIALOG 41200
+// #define HID_DLGTABLE_DIALOG 41200
hidspecial HID { HelpID = HID_DLGTABLE_DIALOG; };
-#define HID_DLGTABLE_CMDPREV 41202
+// #define HID_DLGTABLE_CMDPREV 41202
hidspecial HID { HelpID = HID_DLGTABLE_CMDPREV; };
-#define HID_DLGTABLE_CMDNEXT 41203
+// #define HID_DLGTABLE_CMDNEXT 41203
hidspecial HID { HelpID = HID_DLGTABLE_CMDNEXT; };
-#define HID_DLGTABLE_CMDFINISH 41204
+// #define HID_DLGTABLE_CMDFINISH 41204
hidspecial HID { HelpID = HID_DLGTABLE_CMDFINISH; };
-#define HID_DLGTABLE_CMDCANCEL 41205
+// #define HID_DLGTABLE_CMDCANCEL 41205
hidspecial HID { HelpID = HID_DLGTABLE_CMDCANCEL; };
-#define HID_DLGTABLE_OPTBUSINESS 41206
+// #define HID_DLGTABLE_OPTBUSINESS 41206
hidspecial HID { HelpID = HID_DLGTABLE_OPTBUSINESS; };
-#define HID_DLGTABLE_OPTPRIVATE 41207
+// #define HID_DLGTABLE_OPTPRIVATE 41207
hidspecial HID { HelpID = HID_DLGTABLE_OPTPRIVATE; };
-#define HID_DLGTABLE_LBTABLES 41208
+// #define HID_DLGTABLE_LBTABLES 41208
hidspecial HID { HelpID = HID_DLGTABLE_LBTABLES; };
-#define HID_DLGTABLE_FIELDSAVAILABLE 41209
+// #define HID_DLGTABLE_FIELDSAVAILABLE 41209
hidspecial HID { HelpID = HID_DLGTABLE_FIELDSAVAILABLE; };
-#define HID_DLGTABLE_CMDMOVESELECTED 41210
+// #define HID_DLGTABLE_CMDMOVESELECTED 41210
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVESELECTED; };
-#define HID_DLGTABLE_CMDMOVEALL 41211
+// #define HID_DLGTABLE_CMDMOVEALL 41211
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEALL; };
-#define HID_DLGTABLE_CMDREMOVESELECTED 41212
+// #define HID_DLGTABLE_CMDREMOVESELECTED 41212
hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVESELECTED; };
-#define HID_DLGTABLE_CMDREMOVEALL 41213
+// #define HID_DLGTABLE_CMDREMOVEALL 41213
hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVEALL; };
-#define HID_DLGTABLE_FIELDSSELECTED 41214
+// #define HID_DLGTABLE_FIELDSSELECTED 41214
hidspecial HID { HelpID = HID_DLGTABLE_FIELDSSELECTED; };
-#define HID_DLGTABLE_CMDMOVEUP 41215
+// #define HID_DLGTABLE_CMDMOVEUP 41215
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP; };
-#define HID_DLGTABLE_CMDMOVEDOWN 41216
+// #define HID_DLGTABLE_CMDMOVEDOWN 41216
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN; };
-#define HID_DLGTABLE_LB_SELFIELDNAMES 41220
+// #define HID_DLGTABLE_LB_SELFIELDNAMES 41220
hidspecial HID { HelpID = HID_DLGTABLE_LB_SELFIELDNAMES; };
-#define HID_DLGTABLE_CMDMOVEFIELDUP 41221
+// #define HID_DLGTABLE_CMDMOVEFIELDUP 41221
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDUP; };
-#define HID_DLGTABLE_CMDMOVEFIELDDOWN 41222
+// #define HID_DLGTABLE_CMDMOVEFIELDDOWN 41222
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDDOWN; };
-#define HID_DLGTABLE_CMDMINUS 41223
+// #define HID_DLGTABLE_CMDMINUS 41223
hidspecial HID { HelpID = HID_DLGTABLE_CMDMINUS; };
-#define HID_DLGTABLE_CMDPLUS 41224
+// #define HID_DLGTABLE_CMDPLUS 41224
hidspecial HID { HelpID = HID_DLGTABLE_CMDPLUS; };
-#define HID_DLGTABLE_COLNAME 41225
+// #define HID_DLGTABLE_COLNAME 41225
hidspecial HID { HelpID = HID_DLGTABLE_COLNAME; };
-#define HID_DLGTABLE_COLMODIFIER 41226
+// #define HID_DLGTABLE_COLMODIFIER 41226
hidspecial HID { HelpID = HID_DLGTABLE_COLMODIFIER; };
-#define HID_DLGTABLE_CHK_USEPRIMEKEY 41227
+// #define HID_DLGTABLE_CHK_USEPRIMEKEY 41227
hidspecial HID { HelpID = HID_DLGTABLE_CHK_USEPRIMEKEY; };
-#define HID_DLGTABLE_OPT_PK_AUTOMATIC 41228
+// #define HID_DLGTABLE_OPT_PK_AUTOMATIC 41228
hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_AUTOMATIC; };
-#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC 41229
+// #define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC 41229
hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC; };
-#define HID_DLGTABLE_OPT_PK_SINGLE 41230
+// #define HID_DLGTABLE_OPT_PK_SINGLE 41230
hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SINGLE; };
-#define HID_DLGTABLE_LB_PK_FIELDNAME 41231
+// #define HID_DLGTABLE_LB_PK_FIELDNAME 41231
hidspecial HID { HelpID = HID_DLGTABLE_LB_PK_FIELDNAME; };
-#define HID_DLGTABLE_CK_PK_AUTOVALUE 41232
+// #define HID_DLGTABLE_CK_PK_AUTOVALUE 41232
hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE; };
-#define HID_DLGTABLE_OPT_PK_SEVERAL 41233
+// #define HID_DLGTABLE_OPT_PK_SEVERAL 41233
hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SEVERAL; };
-#define HID_DLGTABLE_FIELDS_PK_AVAILABLE 41234
+// #define HID_DLGTABLE_FIELDS_PK_AVAILABLE 41234
hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_AVAILABLE; };
-#define HID_DLGTABLE_CMDMOVE_PK_SELECTED 41235
+// #define HID_DLGTABLE_CMDMOVE_PK_SELECTED 41235
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVE_PK_SELECTED; };
-#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED 41236
+// #define HID_DLGTABLE_CMDREMOVE_PK_SELECTED 41236
hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVE_PK_SELECTED; };
-#define HID_DLGTABLE_FIELDS_PK_SELECTED 41237
+// #define HID_DLGTABLE_FIELDS_PK_SELECTED 41237
hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_SELECTED; };
-#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED 41238
+// #define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED 41238
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP_PK_SELECTED; };
-#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED 41239
+// #define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED 41239
hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED; };
-#define HID_DLGTABLE_TXT_NAME 41240
+// #define HID_DLGTABLE_TXT_NAME 41240
hidspecial HID { HelpID = HID_DLGTABLE_TXT_NAME; };
-#define HID_DLGTABLE_OPT_MODIFYTABLE 41241
+// #define HID_DLGTABLE_OPT_MODIFYTABLE 41241
hidspecial HID { HelpID = HID_DLGTABLE_OPT_MODIFYTABLE; };
-#define HID_DLGTABLE_OPT_WORKWITHTABLE 41242
+// #define HID_DLGTABLE_OPT_WORKWITHTABLE 41242
hidspecial HID { HelpID = HID_DLGTABLE_OPT_WORKWITHTABLE; };
-#define HID_DLGTABLE_OPT_STARTFORMWIZARD 41243
+// #define HID_DLGTABLE_OPT_STARTFORMWIZARD 41243
hidspecial HID { HelpID = HID_DLGTABLE_OPT_STARTFORMWIZARD; };
-#define HID_DLGTABLE_LST_CATALOG 41244
+// #define HID_DLGTABLE_LST_CATALOG 41244
hidspecial HID { HelpID = HID_DLGTABLE_LST_CATALOG; };
-#define HID_DLGTABLE_LST_SCHEMA 41245
+// #define HID_DLGTABLE_LST_SCHEMA 41245
hidspecial HID { HelpID = HID_DLGTABLE_LST_SCHEMA; };