CWS gnumake4: convert wizards to new build system

51 files changed, 1529 insertions, 3383 deletions

diff --git a/wizards/source/tools/makefile.mk b/wizards/AllLangResTarget_cal.mk
index 801db34b4..75a525afe 100644
--- a/wizards/source/tools/makefile.mk
+++ b/wizards/AllLangResTarget_cal.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,22 +24,22 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=tools
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cal))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,cal,\
+	cal/res \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+$(eval $(call gb_SrsTarget_SrsTarget,cal/res))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_set_include,cal/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
 
-ZIP1TARGET      = $(TOOLS_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
+$(eval $(call gb_SrsTarget_add_files,cal/res,\
+	wizards/source/schedule/schedule.src \
+))
 
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
 
diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk
new file mode 100644
index 000000000..2e7f3a10f
--- /dev/null
+++ b/wizards/AllLangResTarget_dbw.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbw))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dbw,\
+	dbw/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbw/res))
+
+$(eval $(call gb_SrsTarget_set_include,dbw/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbw/res,\
+	wizards/source/formwizard/dbwizres.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_eur.mk b/wizards/AllLangResTarget_eur.mk
new file mode 100644
index 000000000..6efe8bfa6
--- /dev/null
+++ b/wizards/AllLangResTarget_eur.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,eur))
+
+$(eval $(call gb_AllLangResTarget_add_srs,eur,\
+	eur/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,eur/res))
+
+$(eval $(call gb_SrsTarget_set_include,eur/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,eur/res,\
+	wizards/source/euro/euro.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_imp.mk b/wizards/AllLangResTarget_imp.mk
new file mode 100644
index 000000000..b671b930d
--- /dev/null
+++ b/wizards/AllLangResTarget_imp.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,imp))
+
+$(eval $(call gb_AllLangResTarget_add_srs,imp,\
+	imp/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,imp/res))
+
+$(eval $(call gb_SrsTarget_set_include,imp/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,imp/res,\
+	wizards/source/importwizard/importwi.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk
new file mode 100644
index 000000000..a6f6068d7
--- /dev/null
+++ b/wizards/AllLangResTarget_tpl.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,tpl))
+
+$(eval $(call gb_AllLangResTarget_add_srs,tpl,\
+	tpl/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,tpl/res))
+
+$(eval $(call gb_SrsTarget_set_include,tpl/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,tpl/res,\
+	wizards/source/template/template.src \
+))
+
+
diff --git a/wizards/AllLangResTarget_wwz.mk b/wizards/AllLangResTarget_wwz.mk
new file mode 100644
index 000000000..c62bf40c6
--- /dev/null
+++ b/wizards/AllLangResTarget_wwz.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,wwz))
+
+$(eval $(call gb_AllLangResTarget_add_srs,wwz,\
+	wwz/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,wwz/res))
+
+$(eval $(call gb_SrsTarget_set_include,wwz/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,wwz/res,\
+	wizards/source/webwizard/webwizar.src \
+))
+
+
diff --git a/wizards/source/gimmicks/makefile.mk b/wizards/AllLangResTarget_wzi.mk
index de083f52e..fe6da0153 100644
--- a/wizards/source/gimmicks/makefile.mk
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,23 +24,24 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=gimmicks
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,wzi))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_set_reslocation,wzi,wizards))
 
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+$(eval $(call gb_AllLangResTarget_add_srs,wzi,\
+	wzi/res \
+))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,wzi/res))
 
+$(eval $(call gb_SrsTarget_set_include,wzi/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
 
-ZIP1TARGET      = $(GIMMICKS_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
+$(eval $(call gb_SrsTarget_add_files,wzi/res,\
+	wizards/source/imagelists/imagelists.src \
+))
 
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
 
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
new file mode 100644
index 000000000..d18b3eb67
--- /dev/null
+++ b/wizards/Jar_agenda.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,agenda))
+
+$(eval $(call gb_Jar_add_jars,agenda,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,agenda,\
+	commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,agenda,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,agenda,\
+	wizards/com/sun/star/wizards/agenda/AgendaTemplate \
+	wizards/com/sun/star/wizards/agenda/AgendaWizardDialog \
+	wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst \
+	wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl \
+	wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources \
+	wizards/com/sun/star/wizards/agenda/CallWizard \
+	wizards/com/sun/star/wizards/agenda/CGAgenda \
+	wizards/com/sun/star/wizards/agenda/CGTopic \
+	wizards/com/sun/star/wizards/agenda/TemplateConsts \
+	wizards/com/sun/star/wizards/agenda/TopicsControl \
+))
+
+$(eval $(call gb_Jar_set_componentfile,agenda,wizards/com/sun/star/wizards/agenda/agenda,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
new file mode 100644
index 000000000..5d5d18de4
--- /dev/null
+++ b/wizards/Jar_commonwizards.mk
@@ -0,0 +1,132 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,commonwizards))
+
+$(eval $(call gb_Jar_add_jars,commonwizards,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,commonwizards,com))
+
+$(eval $(call gb_Jar_set_manifest,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards/common/MANIFEST.MF))
+
+$(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
+	wizards/com/sun/star/wizards/common/HelpIds	                		\
+	wizards/com/sun/star/wizards/common/Desktop	                		\
+	wizards/com/sun/star/wizards/common/NumberFormatter                 		\
+	wizards/com/sun/star/wizards/common/FileAccess                 		\
+	wizards/com/sun/star/wizards/common/Helper                     		\
+	wizards/com/sun/star/wizards/common/InvalidQueryException      		\
+	wizards/com/sun/star/wizards/common/JavaTools                  		\
+	wizards/com/sun/star/wizards/common/NoValidPathException       		\
+	wizards/com/sun/star/wizards/common/Properties                 		\
+	wizards/com/sun/star/wizards/common/PropertyNames                 		\
+	wizards/com/sun/star/wizards/common/Resource                   		\
+	wizards/com/sun/star/wizards/common/SystemDialog				\
+	wizards/com/sun/star/wizards/common/Configuration				\
+	wizards/com/sun/star/wizards/common/ConfigNode					\
+	wizards/com/sun/star/wizards/common/ConfigGroup				\
+	wizards/com/sun/star/wizards/common/ConfigSet					\
+	wizards/com/sun/star/wizards/common/XMLProvider				\
+	wizards/com/sun/star/wizards/common/XMLHelper					\
+	wizards/com/sun/star/wizards/common/IRenderer					\
+	wizards/com/sun/star/wizards/common/Indexable					\
+	wizards/com/sun/star/wizards/common/TerminateWizardException			\
+	wizards/com/sun/star/wizards/common/UCB					\
+	wizards/com/sun/star/wizards/common/DebugHelper					\
+	wizards/com/sun/star/wizards/common/PropertySetHelper					\
+	wizards/com/sun/star/wizards/common/NumericalHelper					\
+	wizards/com/sun/star/wizards/common/NamedValueCollection       \
+	wizards/com/sun/star/wizards/db/DBMetaData					\
+	wizards/com/sun/star/wizards/db/CommandMetaData				\
+	wizards/com/sun/star/wizards/db/QueryMetaData					\
+	wizards/com/sun/star/wizards/db/BlindtextCreator				\
+	wizards/com/sun/star/wizards/db/FieldColumn					\
+	wizards/com/sun/star/wizards/db/CommandName					\
+	wizards/com/sun/star/wizards/db/RecordParser					\
+	wizards/com/sun/star/wizards/db/TypeInspector					\
+	wizards/com/sun/star/wizards/db/ColumnPropertySet				\
+	wizards/com/sun/star/wizards/db/RelationController				\
+	wizards/com/sun/star/wizards/db/TableDescriptor				\
+	wizards/com/sun/star/wizards/db/SQLQueryComposer				\
+	wizards/com/sun/star/wizards/db/DatabaseObjectWizard					\
+	wizards/com/sun/star/wizards/ui/event/AbstractListener			\
+	wizards/com/sun/star/wizards/ui/event/CommonListener				\
+	wizards/com/sun/star/wizards/ui/event/DataAware				\
+	wizards/com/sun/star/wizards/ui/event/DataAwareFields				\
+	wizards/com/sun/star/wizards/ui/event/EventNames				\
+	wizards/com/sun/star/wizards/ui/event/ListModelBinder				\
+	wizards/com/sun/star/wizards/ui/event/MethodInvocation			\
+	wizards/com/sun/star/wizards/ui/event/RadioDataAware				\
+	wizards/com/sun/star/wizards/ui/event/SimpleDataAware				\
+	wizards/com/sun/star/wizards/ui/event/Task					\
+	wizards/com/sun/star/wizards/ui/event/TaskEvent				\
+	wizards/com/sun/star/wizards/ui/event/TaskListener				\
+	wizards/com/sun/star/wizards/ui/event/UnoDataAware				\
+	wizards/com/sun/star/wizards/ui/AggregateComponent				\
+	wizards/com/sun/star/wizards/ui/CommandFieldSelection				\
+	wizards/com/sun/star/wizards/ui/ControlScroller				\
+	wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection			\
+	wizards/com/sun/star/wizards/ui/DocumentPreview				\
+	wizards/com/sun/star/wizards/ui/FilterComponent				\
+	wizards/com/sun/star/wizards/ui/FieldSelection					\
+	wizards/com/sun/star/wizards/ui/ImageList					\
+	wizards/com/sun/star/wizards/ui/ButtonList					\
+	wizards/com/sun/star/wizards/ui/PathSelection					\
+	wizards/com/sun/star/wizards/ui/PeerConfig					\
+	wizards/com/sun/star/wizards/ui/SortingComponent				\
+	wizards/com/sun/star/wizards/ui/TitlesComponent				\
+	wizards/com/sun/star/wizards/ui/WizardDialog					\
+	wizards/com/sun/star/wizards/ui/UIConsts					\
+	wizards/com/sun/star/wizards/ui/UnoDialog					\
+	wizards/com/sun/star/wizards/ui/UnoDialog2					\
+	wizards/com/sun/star/wizards/ui/XCommandSelectionListener			\
+	wizards/com/sun/star/wizards/ui/XFieldSelectionListener			\
+	wizards/com/sun/star/wizards/ui/XPathSelectionListener				\
+	wizards/com/sun/star/wizards/ui/XCompletion					\
+	wizards/com/sun/star/wizards/document/Control					\
+	wizards/com/sun/star/wizards/document/DatabaseControl				\
+	wizards/com/sun/star/wizards/document/FormHandler				\
+	wizards/com/sun/star/wizards/document/GridControl				\
+	wizards/com/sun/star/wizards/document/OfficeDocument				\
+	wizards/com/sun/star/wizards/document/Shape					\
+	wizards/com/sun/star/wizards/document/TimeStampControl				\
+	wizards/com/sun/star/wizards/text/TextDocument					\
+	wizards/com/sun/star/wizards/text/TextFieldHandler				\
+	wizards/com/sun/star/wizards/text/TextFrameHandler				\
+	wizards/com/sun/star/wizards/text/TextSectionHandler				\
+	wizards/com/sun/star/wizards/text/TextStyleHandler				\
+	wizards/com/sun/star/wizards/text/TextTableHandler				\
+	wizards/com/sun/star/wizards/text/ViewHandler \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
new file mode 100644
index 000000000..9177edc5e
--- /dev/null
+++ b/wizards/Jar_fax.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,fax))
+
+$(eval $(call gb_Jar_add_jars,fax,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,fax,com))
+
+$(eval $(call gb_Jar_set_manifest,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,fax,\
+	commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,fax,\
+	wizards/com/sun/star/wizards/fax/CallWizard \
+	wizards/com/sun/star/wizards/fax/CGFax \
+	wizards/com/sun/star/wizards/fax/CGFaxWizard \
+	wizards/com/sun/star/wizards/fax/FaxDocument \
+	wizards/com/sun/star/wizards/fax/FaxWizardDialog \
+	wizards/com/sun/star/wizards/fax/FaxWizardDialogConst \
+	wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl \
+	wizards/com/sun/star/wizards/fax/FaxWizardDialogResources \
+))
+
+$(eval $(call gb_Jar_set_componentfile,fax,wizards/com/sun/star/wizards/fax/fax,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
new file mode 100644
index 000000000..fca701124
--- /dev/null
+++ b/wizards/Jar_form.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,form))
+
+$(eval $(call gb_Jar_add_jars,form,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,form,$(SRCDIR)/wizards/com/sun/star/wizards/form/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,form,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,form,\
+	commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,form,\
+	wizards/com/sun/star/wizards/form/CallFormWizard \
+	wizards/com/sun/star/wizards/form/DataEntrySetter \
+	wizards/com/sun/star/wizards/form/FieldLinker \
+	wizards/com/sun/star/wizards/form/Finalizer \
+	wizards/com/sun/star/wizards/form/FormConfiguration \
+	wizards/com/sun/star/wizards/form/FormControlArranger \
+	wizards/com/sun/star/wizards/form/FormDocument \
+	wizards/com/sun/star/wizards/form/FormWizard \
+	wizards/com/sun/star/wizards/form/StyleApplier \
+	wizards/com/sun/star/wizards/form/UIControlArranger \
+))
+
+$(eval $(call gb_Jar_set_componentfile,form,wizards/com/sun/star/wizards/form/form,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk
new file mode 100644
index 000000000..925d48790
--- /dev/null
+++ b/wizards/Jar_letter.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,letter))
+
+$(eval $(call gb_Jar_add_jars,letter,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,letter,$(SRCDIR)/wizards/com/sun/star/wizards/letter/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,letter,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,letter,\
+	commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,letter,\
+	wizards/com/sun/star/wizards/letter/CallWizard \
+	wizards/com/sun/star/wizards/letter/CGLetter \
+	wizards/com/sun/star/wizards/letter/CGLetterWizard \
+	wizards/com/sun/star/wizards/letter/CGPaperElementLocation \
+	wizards/com/sun/star/wizards/letter/LetterDocument \
+	wizards/com/sun/star/wizards/letter/LetterWizardDialog \
+	wizards/com/sun/star/wizards/letter/LetterWizardDialogConst \
+	wizards/com/sun/star/wizards/letter/LetterWizardDialogEvents \
+	wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl \
+	wizards/com/sun/star/wizards/letter/LetterWizardDialogResources \
+	wizards/com/sun/star/wizards/letter/LocaleCodes \
+))
+
+$(eval $(call gb_Jar_set_componentfile,letter,wizards/com/sun/star/wizards/letter/letter,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk b/wizards/Jar_query.mk
index d9a1a7447..0c8d26f95 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk
+++ b/wizards/Jar_query.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,31 +25,32 @@
 #
 #*************************************************************************
 
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET  = reportbuilderwizard
-PACKAGE = com$/sun$/star$/wizards$/reportbuilder
+$(eval $(call gb_Jar_Jar,query))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Jar_add_jars,query,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
 
-.INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/query/MANIFEST.MF))
 
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar
+$(eval $(call gb_Jar_set_packageroot,query,com))
 
-# CUSTOMMANIFESTFILE= Manifest.mf
+$(eval $(call gb_Jar_set_jarclasspath,query,\
+	commonwizards.jar \
+))
 
-JARCLASSDIRS	= com$/sun$/star$/wizards$/reportbuilder
-JARTARGET	= $(TARGET).jar
-JARCLASSPATH = commonwizards.jar report.jar
+$(eval $(call gb_Jar_add_sourcefiles,query,\
+	wizards/com/sun/star/wizards/query/CallQueryWizard \
+	wizards/com/sun/star/wizards/query/Finalizer \
+	wizards/com/sun/star/wizards/query/QuerySummary \
+	wizards/com/sun/star/wizards/query/QueryWizard \
+))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Jar_set_componentfile,query,wizards/com/sun/star/wizards/query/query,OOO))
 
-JAVAFILES=                             \
-    ReportBuilderImplementation.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
new file mode 100644
index 000000000..2d80096e4
--- /dev/null
+++ b/wizards/Jar_report.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,report))
+
+$(eval $(call gb_Jar_add_jars,report,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/report/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_packageroot,report,com))
+
+$(eval $(call gb_Jar_set_jarclasspath,report,\
+	commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,report,\
+	wizards/com/sun/star/wizards/report/CallReportWizard \
+	wizards/com/sun/star/wizards/report/Dataimport \
+	wizards/com/sun/star/wizards/report/DBColumn \
+	wizards/com/sun/star/wizards/report/GroupFieldHandler \
+	wizards/com/sun/star/wizards/report/IReportBuilderLayouter \
+	wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess \
+	wizards/com/sun/star/wizards/report/IReportDocument \
+	wizards/com/sun/star/wizards/report/RecordTable \
+	wizards/com/sun/star/wizards/report/ReportFinalizer \
+	wizards/com/sun/star/wizards/report/ReportImplementationHelper \
+	wizards/com/sun/star/wizards/report/ReportLayouter \
+	wizards/com/sun/star/wizards/report/ReportTextDocument \
+	wizards/com/sun/star/wizards/report/ReportTextImplementation \
+	wizards/com/sun/star/wizards/report/ReportWizard \
+))
+
+$(eval $(call gb_Jar_set_componentfile,report,wizards/com/sun/star/wizards/report/report,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
new file mode 100644
index 000000000..956f554c1
--- /dev/null
+++ b/wizards/Jar_reportbuilder.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,reportbuilderwizard))
+
+$(eval $(call gb_Jar_add_jars,reportbuilderwizard,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+	$(OUTDIR)/bin/report.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com))
+
+$(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,reportbuilderwizard,\
+	commonwizards.jar \
+	report.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,reportbuilderwizard,\
+	wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation \
+	wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn \
+	wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns \
+	wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns \
+	wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate \
+	wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove \
+	wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft \
+	wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants \
+	wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter \
+	wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject \
+	wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel \
+	wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject \
+	wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField \
+	wizards/com/sun/star/wizards/reportbuilder/layout/Tabular \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
new file mode 100644
index 000000000..8760e6c16
--- /dev/null
+++ b/wizards/Jar_table.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,table))
+
+$(eval $(call gb_Jar_add_jars,table,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,table,com))
+
+$(eval $(call gb_Jar_set_manifest,table,$(SRCDIR)/wizards/com/sun/star/wizards/table/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,table,\
+	commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,table,\
+	wizards/com/sun/star/wizards/table/CallTableWizard \
+	wizards/com/sun/star/wizards/table/CGCategory \
+	wizards/com/sun/star/wizards/table/CGTable \
+	wizards/com/sun/star/wizards/table/FieldDescription \
+	wizards/com/sun/star/wizards/table/FieldFormatter \
+	wizards/com/sun/star/wizards/table/Finalizer \
+	wizards/com/sun/star/wizards/table/PrimaryKeyHandler \
+	wizards/com/sun/star/wizards/table/ScenarioSelector \
+	wizards/com/sun/star/wizards/table/TableWizard \
+))
+
+$(eval $(call gb_Jar_set_componentfile,table,wizards/com/sun/star/wizards/table/table,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk
new file mode 100644
index 000000000..5fe3b2465
--- /dev/null
+++ b/wizards/Jar_web.mk
@@ -0,0 +1,106 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Jar_Jar,web))
+
+$(eval $(call gb_Jar_add_jars,web,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,web,com))
+
+$(eval $(call gb_Jar_set_manifest,web,$(SRCDIR)/wizards/com/sun/star/wizards/web/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,web,\
+	commonwizards.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,web,\
+	wizards/com/sun/star/wizards/web/AbstractErrorHandler \
+	wizards/com/sun/star/wizards/web/BackgroundsDialog \
+	wizards/com/sun/star/wizards/web/CallWizard \
+	wizards/com/sun/star/wizards/web/ErrorHandler \
+	wizards/com/sun/star/wizards/web/ExtensionVerifier \
+	wizards/com/sun/star/wizards/web/FTPDialog \
+	wizards/com/sun/star/wizards/web/FTPDialogResources \
+	wizards/com/sun/star/wizards/web/IconsDialog \
+	wizards/com/sun/star/wizards/web/ImageListDialog \
+	wizards/com/sun/star/wizards/web/LogTaskListener \
+	wizards/com/sun/star/wizards/web/Process \
+	wizards/com/sun/star/wizards/web/ProcessErrorHandler \
+	wizards/com/sun/star/wizards/web/ProcessErrors \
+	wizards/com/sun/star/wizards/web/ProcessStatusRenderer \
+	wizards/com/sun/star/wizards/web/StatusDialog \
+	wizards/com/sun/star/wizards/web/StylePreview \
+	wizards/com/sun/star/wizards/web/TOCPreview \
+	wizards/com/sun/star/wizards/web/WebWizard \
+	wizards/com/sun/star/wizards/web/WebWizardConst \
+	wizards/com/sun/star/wizards/web/WebWizardDialog \
+	wizards/com/sun/star/wizards/web/WebWizardDialogResources \
+	wizards/com/sun/star/wizards/web/WWD_Events \
+	wizards/com/sun/star/wizards/web/WWD_General \
+	wizards/com/sun/star/wizards/web/WWD_Startup \
+	wizards/com/sun/star/wizards/web/WWHID \
+	wizards/com/sun/star/wizards/web/data/CGArgument \
+	wizards/com/sun/star/wizards/web/data/CGContent \
+	wizards/com/sun/star/wizards/web/data/CGDesign \
+	wizards/com/sun/star/wizards/web/data/CGDocument \
+	wizards/com/sun/star/wizards/web/data/CGExporter \
+	wizards/com/sun/star/wizards/web/data/CGFilter \
+	wizards/com/sun/star/wizards/web/data/CGGeneralInfo \
+	wizards/com/sun/star/wizards/web/data/CGIconSet \
+	wizards/com/sun/star/wizards/web/data/CGImage \
+	wizards/com/sun/star/wizards/web/data/CGLayout \
+	wizards/com/sun/star/wizards/web/data/CGPublish \
+	wizards/com/sun/star/wizards/web/data/CGSession \
+	wizards/com/sun/star/wizards/web/data/CGSessionName \
+	wizards/com/sun/star/wizards/web/data/CGSettings \
+	wizards/com/sun/star/wizards/web/data/CGStyle \
+	wizards/com/sun/star/wizards/web/data/ConfigSetItem \
+	wizards/com/sun/star/wizards/web/data/TypeDetection \
+	wizards/com/sun/star/wizards/web/export/AbstractExporter \
+	wizards/com/sun/star/wizards/web/export/ConfiguredExporter \
+	wizards/com/sun/star/wizards/web/export/CopyExporter \
+	wizards/com/sun/star/wizards/web/export/Exporter \
+	wizards/com/sun/star/wizards/web/export/FilterExporter \
+	wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter \
+	wizards/com/sun/star/wizards/web/status/ErrorLog \
+	wizards/com/sun/star/wizards/web/status/ErrorReporter \
+	wizards/com/sun/star/wizards/web/status/LogTaskListener \
+	wizards/com/sun/star/wizards/web/status/Task \
+	wizards/com/sun/star/wizards/web/status/TaskEvent \
+	wizards/com/sun/star/wizards/web/status/TaskListener \
+))
+
+$(eval $(call gb_Jar_set_componentfile,web,wizards/com/sun/star/wizards/web/web,OOO))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/util/makefile.mk b/wizards/Makefile
index 16cf678b4..a79aff831 100644
--- a/wizards/util/makefile.mk
+++ b/wizards/Makefile
@@ -25,18 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-PRJNAME=wizards
-TARGET=NOTARGET
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/depot/makefile.mk b/wizards/Module_wizards.mk
index 2049b6a17..65829e53c 100644
--- a/wizards/source/depot/makefile.mk
+++ b/wizards/Module_wizards.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,30 +24,41 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=depotall
+$(eval $(call gb_Module_Module,wizards))
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-#
-# testresource.
-#
-# SRS2NAME =              depot
-# SRC2FILES=              webwizar.src
-# RESLIB2SRSFILES= $(SRS)$/webwizar.srs
-# RESLIB2NAME=    wwz
-
-ZIP1TARGET      = $(DEPOT_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Module_add_targets,wizards,\
+	AllLangResTarget_cal \
+	AllLangResTarget_dbw \
+	AllLangResTarget_eur \
+	AllLangResTarget_imp \
+	AllLangResTarget_tpl \
+	AllLangResTarget_wwz \
+	AllLangResTarget_wzi \
+	Jar_commonwizards \
+	Jar_agenda \
+	Jar_fax \
+	Jar_form \
+	Jar_letter \
+	Jar_query \
+	Jar_report \
+	Jar_reportbuilder \
+	Jar_table \
+	Jar_web \
+	Zip_depot \
+	Zip_euro \
+	Zip_form \
+	Zip_gimmicks \
+	Zip_import \
+	Zip_launcher \
+	Zip_schedule \
+	Zip_share \
+	Zip_standard \
+	Zip_template \
+	Zip_tools \
+	Zip_tutorials \
+	Zip_usr \
+	Zip_web \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/makefile.mk b/wizards/Zip_depot.mk
index 4bd474242..ac7ab5d18 100644
--- a/wizards/source/launcher/makefile.mk
+++ b/wizards/Zip_depot.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,23 +24,30 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=launcher
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-ZIP1TARGET      = $(LAUNCHER_ALL_TARGET)
-XBAFILES	= DicOOo.xba
-ZIP1LIST        = *.xdl $(XBAFILES) *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
 
+$(eval $(call gb_Zip_Zip,basicsrvdepot,$(SRCDIR)/wizards/source/depot))
+
+$(eval $(call gb_Zip_add_files,basicsrvdepot,\
+	CommonLang.xba \
+	Currency.xba \
+	Depot.xba \
+	dialog.xlb \
+	Dialog2.xdl \
+	Dialog3.xdl \
+	Dialog4.xdl \
+	Internet.xba \
+	Lang_de.xba \
+	Lang_en.xba \
+	Lang_es.xba \
+	Lang_fr.xba \
+	Lang_it.xba \
+	Lang_ja.xba \
+	Lang_ko.xba \
+	Lang_sv.xba \
+	Lang_tw.xba \
+	Lang_zh.xba \
+	script.xlb \
+	tools.xba \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_euro.mk b/wizards/Zip_euro.mk
new file mode 100644
index 000000000..31447073f
--- /dev/null
+++ b/wizards/Zip_euro.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrveuro,$(SRCDIR)/wizards/source/euro))
+
+$(eval $(call gb_Zip_add_files,basicsrveuro,\
+	AutoPilotRun.xba \
+	Common.xba \
+	ConvertRun.xba \
+	dialog.xlb \
+	DlgConvert.xdl \
+	DlgPassword.xdl \
+	Hard.xba \
+	Init.xba \
+	Protect.xba \
+	script.xlb \
+	Soft.xba \
+	Writer.xba \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_form.mk b/wizards/Zip_form.mk
new file mode 100644
index 000000000..6ca5a9593
--- /dev/null
+++ b/wizards/Zip_form.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvform,$(SRCDIR)/wizards/source/formwizard))
+
+$(eval $(call gb_Zip_add_files,basicsrvform,\
+	DBMeta.xba \
+	develop.xba \
+	dialog.xlb \
+	DlgFormDB.xdl \
+	FormWizard.xba \
+	Language.xba \
+	Layouter.xba \
+	script.xlb \
+	tools.xba \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_gimmicks.mk b/wizards/Zip_gimmicks.mk
new file mode 100644
index 000000000..6bf532941
--- /dev/null
+++ b/wizards/Zip_gimmicks.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvgimmicks,$(SRCDIR)/wizards/source/gimmicks))
+
+$(eval $(call gb_Zip_add_files,basicsrvgimmicks,\
+	AutoText.xba \
+	ChangeAllChars.xba \
+	dialog.xlb \
+	GetTexts.xba \
+	ReadDir.xba \
+	ReadFolderDlg.xdl \
+	script.xlb \
+	UserfieldDlg.xdl \
+	Userfields.xba \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_import.mk b/wizards/Zip_import.mk
new file mode 100644
index 000000000..3bffae041
--- /dev/null
+++ b/wizards/Zip_import.mk
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvimport,$(SRCDIR)/wizards/source/importwizard))
+
+$(eval $(call gb_Zip_add_files,basicsrvimport,\
+	API.xba \
+	dialog.xlb \
+	DialogModul.xba \
+	FilesModul.xba \
+	ImportDialog.xdl \
+	Language.xba\
+	Main.xba \
+	script.xlb \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/configshare/makefile.mk b/wizards/Zip_launcher.mk
index c86f66fb8..20efead75 100644
--- a/wizards/source/configshare/makefile.mk
+++ b/wizards/Zip_launcher.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,29 +24,13 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
-
-
-
-PRJNAME=wizards
-TARGET=configshare
-
-.INCLUDE : settings.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-
-
-ZIP1TARGET      = $(CONFIG_SHARE_TARGET)
-
-ZIP1LIST        = * -x makefile.*
-
-
-
-
-.INCLUDE : target.mk
-
-
 
+$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
 
+$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
+	dialog.xlb \
+	DicOOo.xba \
+	script.xlb \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_schedule.mk b/wizards/Zip_schedule.mk
new file mode 100644
index 000000000..3035e28a3
--- /dev/null
+++ b/wizards/Zip_schedule.mk
@@ -0,0 +1,44 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvschedule,$(SRCDIR)/wizards/source/schedule))
+
+$(eval $(call gb_Zip_add_files,basicsrvschedule,\
+	BankHoliday.xba \
+	CalendarMain.xba \
+	CreateTable.xba \
+	dialog.xlb \
+	DlgCalendar.xdl \
+	DlgControl.xba \
+	GermanHolidays.xba \
+	Language.xba \
+	LocalHolidays.xba \
+	OwnEvents.xba \
+	script.xlb \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_share.mk b/wizards/Zip_share.mk
new file mode 100644
index 000000000..22e62073c
--- /dev/null
+++ b/wizards/Zip_share.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicshare,$(SRCDIR)/wizards/source/configshare))
+
+$(eval $(call gb_Zip_add_files,basicshare,\
+	dialog.xlc \
+	script.xlc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_standard.mk b/wizards/Zip_standard.mk
new file mode 100644
index 000000000..7428c68f0
--- /dev/null
+++ b/wizards/Zip_standard.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvstandard,$(SRCDIR)/wizards/source/standard))
+
+$(eval $(call gb_Zip_add_files,basicsrvstandard,\
+	dialog.xlb \
+	Module1.xba \
+	script.xlb \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_template.mk b/wizards/Zip_template.mk
new file mode 100644
index 000000000..2e5a2bca2
--- /dev/null
+++ b/wizards/Zip_template.mk
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvtemplate,$(SRCDIR)/wizards/source/template))
+
+$(eval $(call gb_Zip_add_files,basicsrvtemplate,\
+	Autotext.xba \
+	Correspondence.xba \
+	dialog.xlb \
+	DialogStyles.xdl \
+	ModuleAgenda.xba \
+	Samples.xba \
+	script.xlb \
+	TemplateDialog.xdl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_tools.mk b/wizards/Zip_tools.mk
new file mode 100644
index 000000000..ac3eaf5c8
--- /dev/null
+++ b/wizards/Zip_tools.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvtools,$(SRCDIR)/wizards/source/tools))
+
+$(eval $(call gb_Zip_add_files,basicsrvtools,\
+	Debug.xba \
+	dialog.xlb \
+	DlgOverwriteAll.xdl \
+	Listbox.xba \
+	Misc.xba \
+	ModuleControls.xba\
+	script.xlb \
+	Strings.xba \
+	UCB.xba \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_tutorials.mk b/wizards/Zip_tutorials.mk
new file mode 100644
index 000000000..5d5703085
--- /dev/null
+++ b/wizards/Zip_tutorials.mk
@@ -0,0 +1,44 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvtutorials,$(SRCDIR)/wizards/source/tutorials))
+
+$(eval $(call gb_Zip_add_files,basicsrvtutorials,\
+	dialog.xlb \
+	Functions.xba \
+	RoadMap.xba \
+	script.xlb \
+	ShowInfoDialog.xba \
+	TutorialClose.xba \
+	TutorialCloseDialog.xdl \
+	TutorialCreator.xba \
+	TutorialOpen.xba\
+	TutorialOpenDialog.xdl \
+	TutorialsDialog.xdl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_usr.mk b/wizards/Zip_usr.mk
new file mode 100644
index 000000000..0d9171538
--- /dev/null
+++ b/wizards/Zip_usr.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicusr,$(SRCDIR)/wizards/source/config))
+
+$(eval $(call gb_Zip_add_files,basicusr,\
+	dialog.xlc \
+	script.xlc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_web.mk b/wizards/Zip_web.mk
new file mode 100644
index 000000000..56cddf8c4
--- /dev/null
+++ b/wizards/Zip_web.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Zip_Zip,basicsrvweb,$(SRCDIR)/wizards/source/webwizard))
+
+$(eval $(call gb_Zip_add_files,basicsrvweb,\
+	Bullets.xba \
+	Common.xba \
+	dialog.xlb \
+	HtmlAutoPilotBasic.xba \
+	Language.xba \
+	script.xlb \
+	WebWzrd.xdl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk
deleted file mode 100644
index 62b948674..000000000
--- a/wizards/com/sun/star/wizards/report/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET  = report
-PACKAGE = com$/sun$/star$/wizards$/report
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
-
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS	= com$/sun$/star$/wizards$/report
-JARTARGET	= $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES=                             \
-    CallReportWizard.java   		   \
-    DBColumn.java           		   \
-    Dataimport.java         		   \
-    GroupFieldHandler.java  		   \
-    IReportDocument.java    		   \
-    IReportBuilderLayouter.java    		   \
-    IReportDefinitionReadAccess.java    		   \
-    RecordTable.java        		   \
-    ReportFinalizer.java               \
-    ReportImplementationHelper.java    \
-    ReportLayouter.java     		   \
-    ReportTextDocument.java 		   \
-    ReportTextImplementation.java      \
-    ReportWizard.java
-
-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/prj/build.lst b/wizards/prj/build.lst
index e0d94b1c1..e4037a002 100644
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@ -1,28 +1,2 @@
 wz      wizards     :    L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
-wz      wizards\util                                            nmake           -       all     wz_util NULL
-wz      wizards\source\config                                   nmake           -       all     wz_config NULL
-wz      wizards\source\configshare                              nmake           -       all     wz_configshare NULL
-wz      wizards\source\imagelists                               nmake           -       all     wz_imglists NULL
-wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
-wz      wizards\source\formwizard                               nmake           -       all     wz_reswiz NULL
-wz      wizards\source\gimmicks                                 nmake           -       all     wz_gimmickswz NULL
-wz      wizards\source\importwizard                             nmake           -       all     wz_importwiz NULL
-wz      wizards\source\schedule                                 nmake           -       all     wz_schedulewiz NULL
-wz      wizards\source\template                                 nmake           -       all     wz_templatewiz NULL
-wz      wizards\source\tools                                    nmake           -       all     wz_toolswiz NULL
-wz      wizards\source\depot                                    nmake           -       all     wz_depot NULL
-wz      wizards\source\tutorials                                nmake           -       all     wz_tutorials NULL
-wz      wizards\source\standard                                 nmake           -       all     wz_standard NULL
-wz      wizards\com\sun\star\wizards                            nmake           -       all     wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\query                      nmake           -       all     wz_querywiz wz_formwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\report                     nmake           -       all     wz_reportwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\reportbuilder\layout       nmake           -       all     wz_rptlayoutwiz wz_reportwiz NULL
-wz      wizards\com\sun\star\wizards\reportbuilder              nmake           -       all     wz_rptbldwiz    wz_rptlayoutwiz NULL
-wz      wizards\com\sun\star\wizards\table                      nmake           -       all     wz_tablewiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\form                       nmake           -       all     wz_formwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\letter                     nmake           -       all     wz_letterwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\fax                        nmake           -       all     wz_faxwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\agenda                     nmake           -       all     wz_agendawiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\web\data                   nmake           -       all     wz_webdata wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\web\export                 nmake           -       all     wz_webexport wz_webdata wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\web                        nmake           -       all     wz_webwiz wz_webexport NULL
+wz      wizards\prj                                             nmake           -       all     wz_prj NULL
diff --git a/wizards/prj/d.lst b/wizards/prj/d.lst
index f8ab876ba..e69de29bb 100644
--- a/wizards/prj/d.lst
+++ b/wizards/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\pck%_EXT%
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\wzi*.res %_DEST%\bin%_EXT%\wzi*.res
-..\%__SRC%\bin\dbw*.res %_DEST%\bin%_EXT%\dbw*.res
-..\%__SRC%\bin\tpl*.res %_DEST%\bin%_EXT%\tpl*.res
-..\%__SRC%\bin\imp*.res %_DEST%\bin%_EXT%\imp*.res
-..\%__SRC%\bin\wwz*.res %_DEST%\bin%_EXT%\wwz*.res
-..\%__SRC%\bin\eur*.res %_DEST%\bin%_EXT%\eur*.res
-..\%__SRC%\bin\cal*.res %_DEST%\bin%_EXT%\cal*.res
-..\%__SRC%\bin\com*.res %_DEST%\bin%_EXT%\com*.res
-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/config/makefile.mk b/wizards/prj/makefile.mk
index 42ec8d468..88cd9dfe0 100644
--- a/wizards/source/config/makefile.mk
+++ b/wizards/prj/makefile.mk
@@ -24,29 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-
-
-PRJNAME=wizards
-TARGET=configall
+PRJ=..
+TARGET=prj
 
 .INCLUDE : settings.mk
 
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-
-
-ZIP1TARGET      = $(CONFIG_ALL_TARGET)
-
-ZIP1LIST        = * -x makefile.*
-
-
-
-
-.INCLUDE : target.mk
-
-
-
-
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/wizards/source/depot/delzip b/wizards/source/depot/delzip
deleted file mode 100644
index 636fda90b..000000000
--- a/wizards/source/depot/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/wizards/source/euro/makefile.mk b/wizards/source/euro/makefile.mk
deleted file mode 100644
index f4b4c2230..000000000
--- a/wizards/source/euro/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=euro
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-#
-# testresource.
-#
-SRS2NAME =              euro
-SRC2FILES=              euro.src
-RESLIB2SRSFILES= $(SRS)$/euro.srs
-RESLIB2NAME=    eur
-
-ZIP1TARGET      = $(EURO_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/wizards/source/formwizard/makefile.mk b/wizards/source/formwizard/makefile.mk
deleted file mode 100644
index 3a5ec4226..000000000
--- a/wizards/source/formwizard/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=formwizardall
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-#
-# testresource.
-#
-SRS2NAME =              dbwizres
-SRC2FILES=		dbwizres.src
-RESLIB2SRSFILES= $(SRS)$/dbwizres.srs
-RESLIB2NAME=	dbw
-
-ZIP1TARGET      = $(FORMWIZARD_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/wizards/source/imagelists/makefile.mk b/wizards/source/imagelists/makefile.mk
deleted file mode 100644
index 163377de3..000000000
--- a/wizards/source/imagelists/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=wizards
-TARGET=wzimglst
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-# --- Files -------------------------------------
-# ... resource files ............................
-
-SRS1NAME=$(TARGET)
-SRC1FILES=imagelists.src
-
-RESLIB1SRSFILES= $(SRS)$/wzimglst.srs
-RESLIB1NAME=wzi
-RESLIB1IMAGES=$(PRJ)$/res
-
-# ... object files ............................
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
diff --git a/wizards/source/importwizard/makefile.mk b/wizards/source/importwizard/makefile.mk
deleted file mode 100644
index 5c7ef4ce9..000000000
--- a/wizards/source/importwizard/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=importwizardall
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-#
-# testresource.
-#
-SRS2NAME =              importwi
-SRC2FILES=		importwi.src
-RESLIB2SRSFILES= $(SRS)$/importwi.srs
-RESLIB2NAME=	imp
-
-ZIP1TARGET      = $(IMPORTWIZARD_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/wizards/source/schedule/makefile.mk b/wizards/source/schedule/makefile.mk
deleted file mode 100644
index f5c549b87..000000000
--- a/wizards/source/schedule/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=scheduleall
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-#
-# testresource.
-#
-SRS2NAME =              schedule
-SRC2FILES=		schedule.src
-RESLIB2SRSFILES= $(SRS)$/schedule.srs
-RESLIB2NAME=	cal
-
-ZIP1TARGET      = $(SCHEDULE_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/wizards/source/standard/makefile.mk b/wizards/source/standard/makefile.mk
deleted file mode 100644
index 7ffef2e63..000000000
--- a/wizards/source/standard/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=standard
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-ZIP1TARGET      = $(STANDARD_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/wizards/source/template/makefile.mk b/wizards/source/template/makefile.mk
deleted file mode 100644
index 82a30d0d2..000000000
--- a/wizards/source/template/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=template
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-#
-# testresource.
-#
-SRS2NAME =              template
-SRC2FILES=		template.src
-RESLIB2SRSFILES= $(SRS)$/template.srs
-RESLIB2NAME=	tpl
-
-ZIP1TARGET      = $(TEMPLATE_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/wizards/source/tutorials/makefile.mk b/wizards/source/tutorials/makefile.mk
deleted file mode 100644
index a5f673b1d..000000000
--- a/wizards/source/tutorials/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=tutorials
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-ZIP1TARGET      = $(TUTORIALS_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/wizards/source/webwizard/makefile.mk b/wizards/source/webwizard/makefile.mk
deleted file mode 100644
index 415e08bf9..000000000
--- a/wizards/source/webwizard/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=webwizardall
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-#
-# testresource.
-#
-SRS2NAME =              webwizar
-SRC2FILES=		webwizar.src
-RESLIB2SRSFILES= $(SRS)$/webwizar.srs
-RESLIB2NAME=	wwz
-
-ZIP1TARGET      = $(WEBWIZARD_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h
deleted file mode 100644
index c0376f962..000000000
--- a/wizards/util/helpids.h
+++ /dev/null
@@ -1,859 +0,0 @@
-/*************************************************************************
- *
- * 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
deleted file mode 100644
index bf1953e06..000000000
--- a/wizards/util/hidother.src
+++ /dev/null
@@ -1,1499 +0,0 @@
-/*************************************************************************
- *
- * 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
-
-#include "helpids.h"
-/*
- * 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	34200
-hidspecial HID { HelpID = HID0_WEBWIZARD; } ;
-// #define	HID0_HELP	34201
-hidspecial HID { HelpID = HID0_HELP; } ;
-// #define	HID0_NEXT	34202
-hidspecial HID { HelpID = HID0_NEXT; } ;
-// #define	HID0_PREV	34203
-hidspecial HID { HelpID = HID0_PREV; } ;
-// #define	HID0_CREATE	34204
-hidspecial HID { HelpID = HID0_CREATE; } ;
-// #define	HID0_CANCEL	34205
-hidspecial HID { HelpID = HID0_CANCEL; } ;
-// #define	HID0_STATUS_DIALOG	34206
-hidspecial HID { HelpID = HID0_STATUS_DIALOG; } ;
-
-
-//step1
-// #define	HID1_LST_SESSIONS	34207
-hidspecial HID { HelpID = HID1_LST_SESSIONS; } ;
-// #define	HID1_BTN_DEL_SES	34209
-hidspecial HID { HelpID = HID1_BTN_DEL_SES; } ;
-
-//step2
-// #define	HID2_LST_DOCS	34210
-hidspecial HID { HelpID = HID2_LST_DOCS; } ;
-// #define	HID2_BTN_ADD_DOC	34211
-hidspecial HID { HelpID = HID2_BTN_ADD_DOC; } ;
-// #define	HID2_BTN_REM_DOC	34212
-hidspecial HID { HelpID = HID2_BTN_REM_DOC; } ;
-// #define	HID2_BTN_DOC_UP	34213
-hidspecial HID { HelpID = HID2_BTN_DOC_UP; } ;
-// #define	HID2_BTN_DOC_DOWN	34214
-hidspecial HID { HelpID = HID2_BTN_DOC_DOWN; } ;
-// #define	HID2_TXT_DOC_TITLE	34215
-hidspecial HID { HelpID = HID2_TXT_DOC_TITLE; } ;
-// #define	HID2_TXT_DOC_DESC	34216
-hidspecial HID { HelpID = HID2_TXT_DOC_DESC; } ;
-// #define	HID2_TXT_DOC_AUTHOR	34217
-hidspecial HID { HelpID = HID2_TXT_DOC_AUTHOR; } ;
-// #define	HID2_LST_DOC_EXPORT	34218
-hidspecial HID { HelpID = HID2_LST_DOC_EXPORT; } ;
-// #define	HID2_STATUS_ADD_DOCS	34219
-hidspecial HID { HelpID = HID2_STATUS_ADD_DOCS; } ;
-
-//step3
-// #define	HID3_IL_LAYOUTS_IMG1	34220
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG1; } ;
-// #define	HID3_IL_LAYOUTS_IMG2	34221
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG2; } ;
-// #define	HID3_IL_LAYOUTS_IMG3	34222
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG3; } ;
-// #define	HID3_IL_LAYOUTS_IMG4	34223
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG4; } ;
-// #define	HID3_IL_LAYOUTS_IMG5	34224
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG5; } ;
-// #define	HID3_IL_LAYOUTS_IMG6	34225
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG6; } ;
-// #define	HID3_IL_LAYOUTS_IMG7	34226
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG7; } ;
-// #define	HID3_IL_LAYOUTS_IMG8	34227
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG8; } ;
-// #define	HID3_IL_LAYOUTS_IMG9	34228
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG9; } ;
-// #define	HID3_IL_LAYOUTS_IMG10	34229
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG10; } ;
-// #define	HID3_IL_LAYOUTS_IMG11	34230
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG11; } ;
-// #define	HID3_IL_LAYOUTS_IMG12	34231
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG12; } ;
-// #define	HID3_IL_LAYOUTS_IMG13	34232
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG13; } ;
-// #define	HID3_IL_LAYOUTS_IMG14	34233
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG14; } ;
-// #define	HID3_IL_LAYOUTS_IMG15	34234
-hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG15; } ;
-
-//step4
-// #define	HID4_CHK_DISPLAY_FILENAME	34235
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_FILENAME; } ;
-// #define	HID4_CHK_DISPLAY_DESCRIPTION	34236
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_DESCRIPTION; } ;
-// #define	HID4_CHK_DISPLAY_AUTHOR	34237
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_AUTHOR; } ;
-// #define	HID4_CHK_DISPLAY_CR_DATE	34238
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_CR_DATE; } ;
-// #define	HID4_CHK_DISPLAY_UP_DATE	34239
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_UP_DATE; } ;
-// #define	HID4_CHK_DISPLAY_FORMAT	34240
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_FORMAT; } ;
-// #define	HID4_CHK_DISPLAY_F_ICON	34241
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_F_ICON; } ;
-// #define	HID4_CHK_DISPLAY_PAGES	34242
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_PAGES; } ;
-// #define	HID4_CHK_DISPLAY_SIZE	34243
-hidspecial HID { HelpID = HID4_CHK_DISPLAY_SIZE; } ;
-
-// #define	HID4_GRP_OPTIMAIZE_640	34244
-hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_640; } ;
-// #define	HID4_GRP_OPTIMAIZE_800	34245
-hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_800; } ;
-// #define	HID4_GRP_OPTIMAIZE_1024	34246
-hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_1024; } ;
-
-
-//step5
-// #define	HID5_LST_STYLES	34247
-hidspecial HID { HelpID = HID5_LST_STYLES; } ;
-// #define	HID5_BTN_BACKGND	34248
-hidspecial HID { HelpID = HID5_BTN_BACKGND; } ;
-// #define	HID5_BTN_ICONS	34249
-hidspecial HID { HelpID = HID5_BTN_ICONS; } ;
-
-//step6
-// #define	HID6_TXT_SITE_TITLE	34250
-hidspecial HID { HelpID = HID6_TXT_SITE_TITLE; } ;
-// #define	HID6_TXT_SITE_DESC	34253
-hidspecial HID { HelpID = HID6_TXT_SITE_DESC; } ;
-// #define	HID6_DATE_SITE_CREATED	34255
-hidspecial HID { HelpID = HID6_DATE_SITE_CREATED; } ;
-// #define	HID6_DATE_SITE_UPDATED	34256
-hidspecial HID { HelpID = HID6_DATE_SITE_UPDATED; } ;
-// #define	HID6_TXT_SITE_EMAIL	34258
-hidspecial HID { HelpID = HID6_TXT_SITE_EMAIL; } ;
-// #define	HID6_TXT_SITE_COPYRIGHT	34259
-hidspecial HID { HelpID = HID6_TXT_SITE_COPYRIGHT; } ;
-
-//step7
-// #define	HID7_BTN_PREVIEW	34260
-hidspecial HID { HelpID = HID7_BTN_PREVIEW; } ;
-// #define	HID7_CHK_PUBLISH_LOCAL	34261
-hidspecial HID { HelpID = HID7_CHK_PUBLISH_LOCAL; } ;
-// #define	HID7_TXT_LOCAL	34262
-hidspecial HID { HelpID = HID7_TXT_LOCAL; } ;
-// #define	HID7_BTN_LOCAL	34263
-hidspecial HID { HelpID = HID7_BTN_LOCAL; } ;
-// #define	HID7_CHK_PUBLISH_ZIP	34264
-hidspecial HID { HelpID = HID7_CHK_PUBLISH_ZIP; } ;
-// #define	HID7_TXT_ZIP	34265
-hidspecial HID { HelpID = HID7_TXT_ZIP; } ;
-// #define	HID7_BTN_ZIP	34266
-hidspecial HID { HelpID = HID7_BTN_ZIP; } ;
-// #define	HID7_CHK_PUBLISH_FTP	34267
-hidspecial HID { HelpID = HID7_CHK_PUBLISH_FTP; } ;
-// #define	HID7_TXT_FTP	34268
-hidspecial HID { HelpID = HID7_TXT_FTP; } ;
-// #define	HID7_BTN_FTP	34269
-hidspecial HID { HelpID = HID7_BTN_FTP; } ;
-// #define	HID7_CHK_SAVE	34270
-hidspecial HID { HelpID = HID7_CHK_SAVE; } ;
-// #define	HID7_TXT_SAVE	34271
-hidspecial HID { HelpID = HID7_TXT_SAVE; } ;
-
-//web wizard backgrounds dialog
-// #define	HID_BG	34290
-hidspecial HID { HelpID = HID_BG; } ;
-// #define	HID_BG_BTN_OTHER	34291
-hidspecial HID { HelpID = HID_BG_BTN_OTHER; } ;
-// #define	HID_BG_BTN_NONE	34292
-hidspecial HID { HelpID = HID_BG_BTN_NONE; } ;
-// #define	HID_BG_BTN_OK	34293
-hidspecial HID { HelpID = HID_BG_BTN_OK; } ;
-// #define	HID_BG_BTN_CANCEL	34294
-hidspecial HID { HelpID = HID_BG_BTN_CANCEL; } ;
-
-// #define	HID_BG_BTN_BACK	34295
-hidspecial HID { HelpID = HID_BG_BTN_BACK; } ;
-// #define	HID_BG_BTN_FW	34296
-hidspecial HID { HelpID = HID_BG_BTN_FW; } ;
-// #define	HID_BG_BTN_IMG1	34297
-hidspecial HID { HelpID = HID_BG_BTN_IMG1; } ;
-// #define	HID_BG_BTN_IMG2	34298
-hidspecial HID { HelpID = HID_BG_BTN_IMG2; } ;
-// #define	HID_BG_BTN_IMG3	34299
-hidspecial HID { HelpID = HID_BG_BTN_IMG3; } ;
-// #define	HID_BG_BTN_IMG4	34300
-hidspecial HID { HelpID = HID_BG_BTN_IMG4; } ;
-// #define	HID_BG_BTN_IMG5	34301
-hidspecial HID { HelpID = HID_BG_BTN_IMG5; } ;
-// #define	HID_BG_BTN_IMG6	34302
-hidspecial HID { HelpID = HID_BG_BTN_IMG6; } ;
-// #define	HID_BG_BTN_IMG7	34303
-hidspecial HID { HelpID = HID_BG_BTN_IMG7; } ;
-// #define	HID_BG_BTN_IMG8	34304
-hidspecial HID { HelpID = HID_BG_BTN_IMG8; } ;
-// #define	HID_BG_BTN_IMG9	34305
-hidspecial HID { HelpID = HID_BG_BTN_IMG9; } ;
-// #define	HID_BG_BTN_IMG10	34306
-hidspecial HID { HelpID = HID_BG_BTN_IMG10; } ;
-// #define	HID_BG_BTN_IMG11	34307
-hidspecial HID { HelpID = HID_BG_BTN_IMG11; } ;
-// #define	HID_BG_BTN_IMG12	34308
-hidspecial HID { HelpID = HID_BG_BTN_IMG12; } ;
-// #define	HID_BG_BTN_IMG13	34309
-hidspecial HID { HelpID = HID_BG_BTN_IMG13; } ;
-// #define	HID_BG_BTN_IMG14	34300
-hidspecial HID { HelpID = HID_BG_BTN_IMG14; } ;
-// #define	HID_BG_BTN_IMG15	34311
-hidspecial HID { HelpID = HID_BG_BTN_IMG15; } ;
-// #define	HID_BG_BTN_IMG16	34312
-hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ;
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Note: Web Wizard continues on 41000 later in this file.
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-// *************
-// REPORT WIZARD
-// *************
-
-// #define HID_DLGREPORT_DIALOG        		34320
-hidspecial HID { HelpID = HID_DLGREPORT_DIALOG; };
-// #define HID_DLGREPORT_0_CMDPREV     		34322
-hidspecial HID { HelpID = HID_DLGREPORT_0_CMDPREV; };
-// #define HID_DLGREPORT_0_CMDNEXT      		34323
-hidspecial HID { HelpID = HID_DLGREPORT_0_CMDNEXT; };
-// #define HID_DLGREPORT_0_CMDFINISH   		34324
-hidspecial HID { HelpID = HID_DLGREPORT_0_CMDFINISH; };
-// #define HID_DLGREPORT_0_CMDCANCEL   		34325
-hidspecial HID { HelpID = HID_DLGREPORT_0_CMDCANCEL; };
-
-// #define HID_DLGREPORT_1_LBTABLES    		34330
-hidspecial HID { HelpID = HID_DLGREPORT_1_LBTABLES; };
-// #define HID_DLGREPORT_1_FIELDSAVAILABLE   	34331
-hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSAVAILABLE; };
-// #define HID_DLGREPORT_1_CMDMOVESELECTED     34332
-hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVESELECTED; };
-// #define HID_DLGREPORT_1_CMDMOVEALL  		34333
-hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEALL; };
-// #define HID_DLGREPORT_1_CMDREMOVESELECTED   34334
-hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVESELECTED; };
-// #define HID_DLGREPORT_1_CMDREMOVEALL        34335
-hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVEALL; };
-// #define HID_DLGREPORT_1_FIELDSSELECTED    	34336
-hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSSELECTED; };
-// #define HID_DLGREPORT_1_CMDMOVEUP        	34337
-hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEUP; };
-// #define HID_DLGREPORT_1_CMDMOVEDOWN        34338
-hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEDOWN; };
-
-
-// #define HID_DLGREPORT_2_GROUPING    		34340
-hidspecial HID { HelpID = HID_DLGREPORT_2_GROUPING; };
-// #define HID_DLGREPORT_2_CMDGROUP    		34341
-hidspecial HID { HelpID = HID_DLGREPORT_2_CMDGROUP; };
-// #define HID_DLGREPORT_2_CMDUNGROUP  		34342
-hidspecial HID { HelpID = HID_DLGREPORT_2_CMDUNGROUP; };
-// #define HID_DLGREPORT_2_PREGROUPINGDEST     34343
-hidspecial HID { HelpID = HID_DLGREPORT_2_PREGROUPINGDEST; };
-// #define HID_DLGREPORT_2_CMDMOVEUPGROUP      34344
-hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEUPGROUP; };
-// #define HID_DLGREPORT_2_CMDMOVEDOWNGROUP    34345
-hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEDOWNGROUP; };
-
-
-// #define HID_DLGREPORT_3_SORT1       		34346
-hidspecial HID { HelpID = HID_DLGREPORT_3_SORT1; };
-// #define HID_DLGREPORT_3_OPTASCEND1    		34347
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND1; };
-// #define HID_DLGREPORT_3_OPTDESCEND1    		34348
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND1; };
-// #define HID_DLGREPORT_3_SORT2       		34349
-hidspecial HID { HelpID = HID_DLGREPORT_3_SORT2; };
-// #define HID_DLGREPORT_3_OPTASCEND2    		34350
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND2; };
-// #define HID_DLGREPORT_3_OPTDESCEND2    		34351
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND2; };
-// #define HID_DLGREPORT_3_SORT3       		34352
-hidspecial HID { HelpID = HID_DLGREPORT_3_SORT3; };
-// #define HID_DLGREPORT_3_OPTASCEND3    		34353
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND3; };
-// #define HID_DLGREPORT_3_OPTDESCEND3    		34354
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND3; };
-// #define HID_DLGREPORT_3_SORT4       		34355
-hidspecial HID { HelpID = HID_DLGREPORT_3_SORT4; };
-// #define HID_DLGREPORT_3_OPTASCEND4    		34356
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND4; };
-// #define HID_DLGREPORT_3_OPTDESCEND4    		34357
-hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND4; };
-
-// #define HID_DLGREPORT_4_TITLE    			34362
-hidspecial HID { HelpID = HID_DLGREPORT_4_TITLE; };
-// #define HID_DLGREPORT_4_DATALAYOUT  		34363
-hidspecial HID { HelpID = HID_DLGREPORT_4_DATALAYOUT; };
-// #define HID_DLGREPORT_4_PAGELAYOUT  		34364
-hidspecial HID { HelpID = HID_DLGREPORT_4_PAGELAYOUT; };
-// #define HID_DLGREPORT_4_LANDSCAPE   		34365
-hidspecial HID { HelpID = HID_DLGREPORT_4_LANDSCAPE; };
-// #define HID_DLGREPORT_4_PORTRAIT    		34366
-hidspecial HID { HelpID = HID_DLGREPORT_4_PORTRAIT; };
-
-// #define HID_DLGREPORT_5_OPTDYNTEMPLATE      34370
-hidspecial HID { HelpID = HID_DLGREPORT_5_OPTDYNTEMPLATE; };
-// #define HID_DLGREPORT_5_OPTSTATDOCUMENT     34371
-hidspecial HID { HelpID = HID_DLGREPORT_5_OPTSTATDOCUMENT; };
-// #define HID_DLGREPORT_5_TXTTEMPLATEPATH     34372
-hidspecial HID { HelpID = HID_DLGREPORT_5_TXTTEMPLATEPATH; };
-// #define HID_DLGREPORT_5_CMDTEMPLATEPATH     34373
-hidspecial HID { HelpID = HID_DLGREPORT_5_CMDTEMPLATEPATH; };
-// #define HID_DLGREPORT_5_OPTEDITTEMPLATE     34374
-hidspecial HID { HelpID = HID_DLGREPORT_5_OPTEDITTEMPLATE; };
-// #define HID_DLGREPORT_5_OPTUSETEMPLATE      34375
-hidspecial HID { HelpID = HID_DLGREPORT_5_OPTUSETEMPLATE; };
-// #define HID_DLGREPORT_5_TXTDOCUMENTPATH     34376
-hidspecial HID { HelpID = HID_DLGREPORT_5_TXTDOCUMENTPATH; };
-// #define HID_DLGREPORT_5_CMDDOCUMENTPATH     34377
-hidspecial HID { HelpID = HID_DLGREPORT_5_CMDDOCUMENTPATH; };
-// #define HID_DLGREPORT_5_CHKLINKTODB         34378
-hidspecial HID { HelpID = HID_DLGREPORT_5_CHKLINKTODB; };
-// #define HID_DLGREPORT_6_TXTTITLE_1         34381
-hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_1; };
-// #define HID_DLGREPORT_6_TXTTITLE_2         34382
-hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_2; };
-// #define HID_DLGREPORT_6_TXTTITLE_3         34383
-hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_3; };
-// #define HID_DLGREPORT_6_TXTTITLE_4         34384
-hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_4; };
-// #define HID_DLGREPORT_6_TXTTITLE_5         34385
-hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_5; };
-// #define HID_DLGREPORT_6_TXTTITLE_6         34386
-hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_6; };
-// #define HID_DLGREPORT_6_TXTTITLE_7         34387
-hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_7; };
-
-
-/* ====================================
- *                 FormWizard
- * ====================================
- */
-
-
-// #define HID_DLGFORM_DIALOG                  34400
-hidspecial HID { HelpID = HID_DLGFORM_DIALOG; };
-// #define HID_DLGFORM_CMDPREV                 34402
-hidspecial HID { HelpID = HID_DLGFORM_CMDPREV; };
-// #define HID_DLGFORM_CMDNEXT                 34403
-hidspecial HID { HelpID = HID_DLGFORM_CMDNEXT; };
-// #define HID_DLGFORM_CMDFINISH               34404
-hidspecial HID { HelpID = HID_DLGFORM_CMDFINISH; };
-// #define HID_DLGFORM_CMDCANCEL               34405
-hidspecial HID { HelpID = HID_DLGFORM_CMDCANCEL; };
-
-// #define HID_DLGFORM_MASTER_LBTABLES                34411
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_LBTABLES; };
-// #define HID_DLGFORM_MASTER_FIELDSAVAILABLE         34412
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSAVAILABLE; };
-// #define HID_DLGFORM_MASTER_CMDMOVESELECTED         34413
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVESELECTED; };
-// #define HID_DLGFORM_MASTER_CMDMOVEALL              34414
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEALL; };
-// #define HID_DLGFORM_MASTER_CMDREMOVESELECTED       34415
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVESELECTED; };
-// #define HID_DLGFORM_MASTER_CMDREMOVEALL            34416
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVEALL; };
-// #define HID_DLGFORM_MASTER_FIELDSSELECTED          34417
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSSELECTED; };
-// #define HID_DLGFORM_MASTER_CMDMOVEUP       	    34418
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEUP; };
-// #define HID_DLGFORM_MASTER_CMDMOVEDOWN             34419
-hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEDOWN; };
-
-
-// #define HID_DLGFORM_CHKCREATESUBFORM      		34421
-hidspecial HID { HelpID = HID_DLGFORM_CHKCREATESUBFORM; };
-// #define HID_DLGFORM_OPTONEXISTINGRELATION       	34422
-hidspecial HID { HelpID = HID_DLGFORM_OPTONEXISTINGRELATION; };
-// #define HID_DLGFORM_OPTSELECTMANUALLY       		34423
-hidspecial HID { HelpID = HID_DLGFORM_OPTSELECTMANUALLY; };
-// #define HID_DLGFORM_lstRELATIONS			34424
-hidspecial HID { HelpID = HID_DLGFORM_lstRELATIONS; };
-
-
-// #define HID_DLGFORM_SUB_LBTABLES                34431
-hidspecial HID { HelpID = HID_DLGFORM_SUB_LBTABLES; };
-// #define HID_DLGFORM_SUB_FIELDSAVAILABLE         34432
-hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSAVAILABLE; };
-// #define HID_DLGFORM_SUB_CMDMOVESELECTED         34433
-hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVESELECTED; };
-// #define HID_DLGFORM_SUB_CMDMOVEALL              34434
-hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEALL; };
-// #define HID_DLGFORM_SUB_CMDREMOVESELECTED       34435
-hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVESELECTED; };
-// #define HID_DLGFORM_SUB_CMDREMOVEALL            34436
-hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVEALL; };
-// #define HID_DLGFORM_SUB_FIELDSSELECTED          34437
-hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSSELECTED; };
-// #define HID_DLGFORM_SUB_CMDMOVEUP       	34438
-hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEUP; };
-// #define HID_DLGFORM_SUB_CMDMOVEDOWN             34439
-hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEDOWN; };
-
-
-// #define HID_DLGFORM_LINKER_LSTSLAVELINK1    		34441
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK1; };
-// #define HID_DLGFORM_LINKER_LSTMASTERLINK1       		34442
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK1; };
-// #define HID_DLGFORM_LINKER_LSTSLAVELINK2    		34443
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK2; };
-// #define HID_DLGFORM_LINKER_LSTMASTERLINK2       		34444
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK2; };
-// #define HID_DLGFORM_LINKER_LSTSLAVELINK3    		34445
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK3; };
-// #define HID_DLGFORM_LINKER_LSTMASTERLINK3       		34446
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK3; };
-// #define HID_DLGFORM_LINKER_LSTSLAVELINK4    		34447
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK4; };
-// #define HID_DLGFORM_LINKER_LSTMASTERLINK4       		34448
-hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK4; };
-
-// #define HID_DLGFORM_CMDALIGNLEFT        34451
-hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNLEFT; };
-// #define HID_DLGFORM_CMDALIGNRIGHT       34452
-hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNRIGHT; };
-
-
-// #define HID_DLGFORM_CMDLEFTLABELED      34453
-hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED; };
-// #define HID_DLGFORM_CMDTOPLABELED       34454
-hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED; };
-// #define HID_DLGFORM_CMDTABLESTYLE       34455
-hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE; };
-// #define HID_DLGFORM_CMDTOPJUSTIFIED     34456
-hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED; };
-
-// #define HID_DLGFORM_CMDLEFTLABELED2      34457
-hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED2; };
-// #define HID_DLGFORM_CMDTOPLABELED2       34458
-hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED2; };
-// #define HID_DLGFORM_CMDTABLESTYLE2       34459
-hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE2; };
-// #define HID_DLGFORM_CMDTOPJUSTIFIED2     34460
-hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED2; };
-
-// #define HID_DLGFORM_OPTNEWDATAONLY       34461
-hidspecial HID { HelpID = HID_DLGFORM_OPTNEWDATAONLY; };
-// #define HID_DLGFORM_OPTDISPLAYALLDATA       34462
-hidspecial HID { HelpID = HID_DLGFORM_OPTDISPLAYALLDATA; };
-// #define HID_DLGFORM_CHKNOMODIFICATION    34463
-hidspecial HID { HelpID = HID_DLGFORM_CHKNOMODIFICATION; };
-// #define HID_DLGFORM_CHKNODELETION       34464
-hidspecial HID { HelpID = HID_DLGFORM_CHKNODELETION; };
-// #define HID_DLGFORM_CHKNOADDITION       34465
-hidspecial HID { HelpID = HID_DLGFORM_CHKNOADDITION; };
-
-
-// #define HID_DLGFORM_LSTSTYLES       	34471
-hidspecial HID { HelpID = HID_DLGFORM_LSTSTYLES; };
-// #define HID_DLGFORM_CMDNOBORDER     	34472
-hidspecial HID { HelpID = HID_DLGFORM_CMDNOBORDER; };
-// #define HID_DLGFORM_CMD3DBORDER     	34473
-hidspecial HID { HelpID = HID_DLGFORM_CMD3DBORDER; };
-// #define HID_DLGFORM_CMDSIMPLEBORDER     34474
-hidspecial HID { HelpID = HID_DLGFORM_CMDSIMPLEBORDER; };
-
-// #define HID_DLGFORM_TXTPATH       	34481
-hidspecial HID { HelpID = HID_DLGFORM_TXTPATH; };
-// #define HID_DLGFORM_OPTWORKWITHFORM     34482
-hidspecial HID { HelpID = HID_DLGFORM_OPTWORKWITHFORM; };
-// #define HID_DLGFORM_OPTMODIFYFORM     	34483
-hidspecial HID { HelpID = HID_DLGFORM_OPTMODIFYFORM; };
-
-
-// #define HID_DLGNEWSLTR_DIALOG                34500
-hidspecial HID { HelpID = HID_DLGNEWSLTR_DIALOG; };
-// #define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT     34501
-hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSTANDARDLAYOUT; };
-// #define HID_DLGNEWSLTR_OPTPARTYLAYOUT     34502
-hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTPARTYLAYOUT; };
-// #define HID_DLGNEWSLTR_OPTBROCHURELAYOUT     34503
-hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTBROCHURELAYOUT; };
-// #define HID_DLGNEWSLTR_OPTSINGLESIDED     34504
-hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSINGLESIDED; };
-// #define HID_DLGNEWSLTR_OPTDOUBLESIDED     34505
-hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTDOUBLESIDED; };
-// #define HID_DLGNEWSLTR_CMDGOON     34506
-hidspecial HID { HelpID = HID_DLGNEWSLTR_CMDGOON; };
-
-
-// #define HID_DLGDEPOT_DIALOG_SELLBUY               34520
-hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SELLBUY ; };
-// #define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY         34521
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY ; };
-// #define HID_DLGDEPOT_0_TXTQUANTITY                34522
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTQUANTITY ; };
-// #define HID_DLGDEPOT_0_TXTRATE                    34523
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTRATE ; };
-// #define HID_DLGDEPOT_0_TXTDATE                    34524
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTDATE ; };
-// #define HID_DLGDEPOT_0_TXTCOMMISSION              34525
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTCOMMISSION ; };
-// #define HID_DLGDEPOT_0_TXTFIX                     34526
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTFIX ; };
-// #define HID_DLGDEPOT_0_TXTMINIMUM                 34527
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTMINIMUM ; };
-// #define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY          34528
-hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SELLBUY ; };
-// #define HID_DLGDEPOT_0_CMDGOON_SELLBUY            34529
-hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SELLBUY ; };
-// #define HID_DLGDEPOT_1_LSTSELLSTOCKS              34530
-hidspecial HID { HelpID = HID_DLGDEPOT_1_LSTSELLSTOCKS ; };
-// #define HID_DLGDEPOT_2_LSTBUYSTOCKS               34531
-hidspecial HID { HelpID = HID_DLGDEPOT_2_LSTBUYSTOCKS ; };
-// #define HID_DLGDEPOT_DIALOG_SPLIT                 34532
-hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SPLIT ; };
-// #define HID_DLGDEPOT_0_LSTSTOCKNAMES              34533
-hidspecial HID { HelpID = HID_DLGDEPOT_0_LSTSTOCKNAMES ; };
-// #define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT           34534
-hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SPLIT ; };
-// #define HID_DLGDEPOT_0_CMDCANCEL_SPLIT            34535
-hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SPLIT ; };
-// #define HID_DLGDEPOT_0_CMDGOON_SPLIT              34536
-hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SPLIT ; };
-// #define HID_DLGDEPOT_1_OPTPERSHARE                34537
-hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTPERSHARE ; };
-// #define HID_DLGDEPOT_1_OPTTOTAL                   34538
-hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTTOTAL ; };
-// #define HID_DLGDEPOT_1_TXTDIVIDEND                34539
-hidspecial HID { HelpID = HID_DLGDEPOT_1_TXTDIVIDEND ; };
-// #define HID_DLGDEPOT_2_TXTOLDRATE                 34540
-hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTOLDRATE ; };
-// #define HID_DLGDEPOT_2_TXTNEWRATE                 34541
-hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTNEWRATE ; };
-// #define HID_DLGDEPOT_2_TXTDATE                    34542
-hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTDATE ; };
-// #define HID_DLGDEPOT_3_TXTSTARTDATE                34543
-hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTSTARTDATE ; };
-// #define HID_DLGDEPOT_3_TXTENDDATE                  34544
-hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTENDDATE ; };
-// #define HID_DLGDEPOT_3_OPTDAILY                    34545
-hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTDAILY ; };
-// #define HID_DLGDEPOT_3_OPTWEEKLY                   34546
-hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTWEEKLY ; };
-// #define HID_DLGDEPOT_DIALOG_HISTORY               34547
-hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_HISTORY ; };
-// #define HID_DLGDEPOT_LSTMARKETS                   34548
-hidspecial HID { HelpID = HID_DLGDEPOT_LSTMARKETS ; };
-// #define HID_DLGDEPOT_0_CMDCANCEL_HISTORY          34549
-hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_HISTORY ; };
-// #define HID_DLGDEPOT_0_CMDGOON_HISTORY            34550
-hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_HISTORY ; };
-
-// #define HID_DLGIMPORT_DIALOG                34570
-hidspecial HID { HelpID = HID_DLGIMPORT_DIALOG; };
-// #define HID_DLGIMPORT_0_CMDHELP             34571
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDHELP; };
-// #define HID_DLGIMPORT_0_CMDCANCEL           34572
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDCANCEL; };
-// #define HID_DLGIMPORT_0_CMDPREV             34573
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDPREV; };
-// #define HID_DLGIMPORT_0_CMDNEXT             34574
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDNEXT; };
-// #define HID_DLGIMPORT_0_OPTSODOCUMENTS  34575
-hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTSODOCUMENTS; };
-// #define HID_DLGIMPORT_0_OPTMSDOCUMENTS  34576
-hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTMSDOCUMENTS; };
-// #define HID_DLGIMPORT_0_CHKLOGFILE      34577
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKLOGFILE; };
-// #define HID_DLGIMPORT_2_CHKWORD             34578
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKWORD; };
-// #define HID_DLGIMPORT_2_CHKEXCEL            34579
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKEXCEL; };
-// #define HID_DLGIMPORT_2_CHKPOWERPOINT       34580
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKPOWERPOINT; };
-// #define HID_DLGIMPORT_2_CBTEMPLATE          34581
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATE; };
-// #define HID_DLGIMPORT_2_CBTEMPLATERECURSE   34582
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATERECURSE; };
-// #define HID_DLGIMPORT_2_LBTEMPLATEPATH      34583
-hidspecial HID { HelpID = HID_DLGIMPORT_2_LBTEMPLATEPATH; };
-// #define HID_DLGIMPORT_2_EDTEMPLATEPATH      34584
-hidspecial HID { HelpID = HID_DLGIMPORT_2_EDTEMPLATEPATH; };
-// #define HID_DLGIMPORT_2_CBDOCUMENT          34586
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; };
-// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT   34585
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT; };
-// #define HID_DLGIMPORT_2_CBDOCUMENT          34586
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; };
-// #define HID_DLGIMPORT_2_CBDOCUMENTRECURSE   34587
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENTRECURSE; };
-// #define HID_DLGIMPORT_2_LBDOCUMENTPATH      34588
-hidspecial HID { HelpID = HID_DLGIMPORT_2_LBDOCUMENTPATH; };
-// #define HID_DLGIMPORT_2_EDDOCUMENTPATH      34589
-hidspecial HID { HelpID = HID_DLGIMPORT_2_EDDOCUMENTPATH; };
-// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT   34590
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT; };
-// #define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH    34591
-hidspecial HID { HelpID = HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH; };
-// #define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH    34592
-hidspecial HID { HelpID = HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH; };
-// #define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT     34593
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDEXPORTPATHSELECT; };
-// #define HID_DLGIMPORT_3_TBSUMMARY           34595
-hidspecial HID { HelpID = HID_DLGIMPORT_3_TBSUMMARY; };
-
-// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2   34600
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2; };
-// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2   34601
-hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2; };
-
-
-// #define HID_DLGIMPORT_0_CHKWRITER        34596
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKWRITER; };
-// #define HID_DLGIMPORT_0_CHKCALC     34597
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKCALC; };
-// #define HID_DLGIMPORT_0_CHKIMPRESS      34598
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKIMPRESS; };
-// #define HID_DLGIMPORT_0_CHKMATHGLOBAL  34599
-hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKMATHGLOBAL; };
-
-
-// #define HID_DLGCORRESPONDENCE_DIALOG     34630
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_DIALOG; };
-// #define HID_DLGCORRESPONDENCE_CANCEL     34631
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_CANCEL; };
-// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA1     34632
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA1; };
-// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA2     34633
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA2; };
-// #define HID_DLGCORRESPONDENCE_AGENDAOKAY     34634
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_AGENDAOKAY; };
-// #define HID_DLGCORRESPONDENCE_OPTIONLETTER1     34635
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER1; };
-// #define HID_DLGCORRESPONDENCE_OPTIONLETTER2     34636
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER2; };
-// #define HID_DLGCORRESPONDENCE_LETTEROKAY     34637
-hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_LETTEROKAY; };
-
-// #define HID_DLGSTYLES_DIALOG     34650
-hidspecial HID { HelpID = HID_DLGSTYLES_DIALOG; };
-// #define HID_DLGSTYLES_LISTBOX     34651
-hidspecial HID { HelpID = HID_DLGSTYLES_LISTBOX; };
-// #define HID_DLGSTYLES_CANCEL     34652
-hidspecial HID { HelpID = HID_DLGSTYLES_CANCEL; };
-// #define HID_DLGSTYLES_OKAY     34653
-hidspecial HID { HelpID = HID_DLGSTYLES_OKAY; };
-
-// #define HID_DLGCONVERT_DIALOG       34660
-hidspecial HID { HelpID = HID_DLGCONVERT_DIALOG; };
-// #define HID_DLGCONVERT_CHECKBOX1        34661
-hidspecial HID { HelpID = HID_DLGCONVERT_CHECKBOX1; };
-// #define HID_DLGCONVERT_OPTIONBUTTON1    34662
-hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON1; };
-// #define HID_DLGCONVERT_OPTIONBUTTON2    34663
-hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON2; };
-// #define HID_DLGCONVERT_OPTIONBUTTON3    34664
-hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON3; };
-// #define HID_DLGCONVERT_OPTIONBUTTON4    34665
-hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON4; };
-// #define HID_DLGCONVERT_LISTBOX1     34666
-hidspecial HID { HelpID = HID_DLGCONVERT_LISTBOX1; };
-// #define HID_DLGCONVERT_OBFILE       34667
-hidspecial HID { HelpID = HID_DLGCONVERT_OBFILE; };
-// #define HID_DLGCONVERT_OBDIR        34668
-hidspecial HID { HelpID = HID_DLGCONVERT_OBDIR; };
-// #define HID_DLGCONVERT_COMBOBOX1        34669
-hidspecial HID { HelpID = HID_DLGCONVERT_COMBOBOX1; };
-// #define HID_DLGCONVERT_TBSOURCE     34670
-hidspecial HID { HelpID = HID_DLGCONVERT_TBSOURCE; };
-// #define HID_DLGCONVERT_CHECKRECURSIVE   34671
-hidspecial HID { HelpID = HID_DLGCONVERT_CHECKRECURSIVE; };
-// #define HID_DLGCONVERT_TBTARGET     34672
-hidspecial HID { HelpID = HID_DLGCONVERT_TBTARGET; };
-// #define HID_DLGCONVERT_CBCANCEL     34673
-hidspecial HID { HelpID = HID_DLGCONVERT_CBCANCEL; };
-// #define HID_DLGCONVERT_CBHELP       34674
-hidspecial HID { HelpID = HID_DLGCONVERT_CBHELP; };
-// #define HID_DLGCONVERT_CBBACK       34675
-hidspecial HID { HelpID = HID_DLGCONVERT_CBBACK; };
-// #define HID_DLGCONVERT_CBGOON       34676
-hidspecial HID { HelpID = HID_DLGCONVERT_CBGOON; };
-// #define HID_DLGCONVERT_CBSOURCEOPEN     34677
-hidspecial HID { HelpID = HID_DLGCONVERT_CBSOURCEOPEN; };
-// #define HID_DLGCONVERT_CBTARGETOPEN     34678
-hidspecial HID { HelpID = HID_DLGCONVERT_CBTARGETOPEN; };
-// #define HID_DLGCONVERT_CHKPROTECT       34679
-hidspecial HID { HelpID = HID_DLGCONVERT_CHKPROTECT; };
-// #define HID_DLGCONVERT_CHKTEXTDOCUMENTS 34680
-hidspecial HID { HelpID = HID_DLGCONVERT_CHKTEXTDOCUMENTS; };
-
-// #define HID_DLGPASSWORD_CMDGOON     34690
-hidspecial HID { HelpID = HID_DLGPASSWORD_CMDGOON; };
-// #define HID_DLGPASSWORD_CMDCANCEL       34691
-hidspecial HID { HelpID = HID_DLGPASSWORD_CMDCANCEL; };
-// #define HID_DLGPASSWORD_CMDHELP     34692
-hidspecial HID { HelpID = HID_DLGPASSWORD_CMDHELP; };
-// #define HID_DLGPASSWORD_TXTPASSWORD     34693
-hidspecial HID { HelpID = HID_DLGPASSWORD_TXTPASSWORD; };
-
-// #define HID_DLGHOLIDAYCAL_DIALOG    34700
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_DIALOG; };
-// #define HID_DLGHOLIDAYCAL_1_PREVIEW     34701
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_PREVIEW; };
-// #define HID_DLGHOLIDAYCAL_1_OPYEAR      34702
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPYEAR; };
-// #define HID_DLGHOLIDAYCAL_1_OPMONTH     34703
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPMONTH; };
-// #define HID_DLGHOLIDAYCAL_1_EDYEAR      34704
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDYEAR; };
-// #define HID_DLGHOLIDAYCAL_1_EDMONTH     34705
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDMONTH; };
-// #define HID_DLGHOLIDAYCAL_1_SPINYEAR    34706
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINYEAR; };
-// #define HID_DLGHOLIDAYCAL_1_SPINMONTH   34707
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINMONTH; };
-// #define HID_DLGHOLIDAYCAL_1_CMBSTATE    34708
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_CMBSTATE; };
-// #define HID_DLGHOLIDAYCAL_2_LBOWNDATA   34709
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_LBOWNDATA; };
-// #define HID_DLGHOLIDAYCAL_2_CMDINSERT   34710
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDINSERT; };
-// #define HID_DLGHOLIDAYCAL_2_CMDDELETE   34711
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDDELETE; };
-// #define HID_DLGHOLIDAYCAL_2_EDEVENT     34712
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENT; };
-// #define HID_DLGHOLIDAYCAL_2_CHKEVENT    34713
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CHKEVENT; };
-// #define HID_DLGHOLIDAYCAL_2_EDEVENTDAY  34714
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTDAY; };
-// #define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY    34715
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTDAY; };
-// #define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH    34716
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTMONTH; };
-// #define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH  34717
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH; };
-// #define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR     34718
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTYEAR; };
-// #define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR   34719
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR; };
-// #define HID_DLGHOLIDAYCAL_0_CMDOWNDATA  34720
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOWNDATA; };
-// #define HID_DLGHOLIDAYCAL_0_CMDCANCEL   34721
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDCANCEL; };
-// #define HID_DLGHOLIDAYCAL_0_CMDOK   34722
-hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOK; };
-//End at 34767
-
-//Start at 40768
-
-//LetterWizard---------------------------
-
-// #define HID_LTRWIZ_OPTBUSINESSLETTER   40769
-hidspecial HID { HelpID = HID_LTRWIZ_OPTBUSINESSLETTER; };
-// #define HID_LTRWIZ_OPTPRIVOFFICIALLETTER   40770
-hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVOFFICIALLETTER; };
-// #define HID_LTRWIZ_OPTPRIVATELETTER   40771
-hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVATELETTER; };
-// #define HID_LTRWIZ_LSTBUSINESSSTYLE   40772
-hidspecial HID { HelpID = HID_LTRWIZ_LSTBUSINESSSTYLE; };
-// #define HID_LTRWIZ_CHKBUSINESSPAPER   40773
-hidspecial HID { HelpID = HID_LTRWIZ_CHKBUSINESSPAPER; };
-// #define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE   40774
-hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVOFFICIALSTYLE; };
-// #define HID_LTRWIZ_LSTPRIVATESTYLE   40775
-hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVATESTYLE; };
-// #define HID_LTRWIZ_CHKPAPERCOMPANYLOGO   40776
-hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYLOGO; };
-// #define HID_LTRWIZ_NUMLOGOHEIGHT   40777
-hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOHEIGHT; };
-// #define HID_LTRWIZ_NUMLOGOX   40778
-hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOX; };
-// #define HID_LTRWIZ_NUMLOGOWIDTH   40779
-hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOWIDTH; };
-// #define HID_LTRWIZ_NUMLOGOY   40780
-hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOY; };
-// #define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS   40781
-hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYADDRESS; };
-// #define HID_LTRWIZ_NUMADDRESSHEIGHT   40782
-hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSHEIGHT; };
-// #define HID_LTRWIZ_NUMADDRESSX   40783
-hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSX; };
-// #define HID_LTRWIZ_NUMADDRESSWIDTH   40784
-hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSWIDTH; };
-// #define HID_LTRWIZ_NUMADDRESSY   40785
-hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSY; };
-// #define HID_LTRWIZ_CHKCOMPANYRECEIVER   40786
-hidspecial HID { HelpID = HID_LTRWIZ_CHKCOMPANYRECEIVER; };
-// #define HID_LTRWIZ_CHKPAPERFOOTER   40787
-hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERFOOTER; };
-// #define HID_LTRWIZ_NUMFOOTERHEIGHT   40788
-hidspecial HID { HelpID = HID_LTRWIZ_NUMFOOTERHEIGHT; };
-// #define HID_LTRWIZ_LSTLETTERNORM   40789
-hidspecial HID { HelpID = HID_LTRWIZ_LSTLETTERNORM; };
-// #define HID_LTRWIZ_CHKUSELOGO   40790
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSELOGO; };
-// #define HID_LTRWIZ_CHKUSEADDRESSRECEIVER   40791
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEADDRESSRECEIVER; };
-// #define HID_LTRWIZ_CHKUSESIGNS   40792
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESIGNS; };
-// #define HID_LTRWIZ_CHKUSESUBJECT   40793
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESUBJECT; };
-// #define HID_LTRWIZ_CHKUSESALUTATION   40794
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESALUTATION; };
-// #define HID_LTRWIZ_LSTSALUTATION   40795
-hidspecial HID { HelpID = HID_LTRWIZ_LSTSALUTATION; };
-// #define HID_LTRWIZ_CHKUSEBENDMARKS   40796
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEBENDMARKS; };
-// #define HID_LTRWIZ_CHKUSEGREETING   40797
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEGREETING; };
-// #define HID_LTRWIZ_LSTGREETING   40798
-hidspecial HID { HelpID = HID_LTRWIZ_LSTGREETING; };
-// #define HID_LTRWIZ_CHKUSEFOOTER   40799
-hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEFOOTER; };
-// #define HID_LTRWIZ_OPTSENDERPLACEHOLDER   40800
-hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERPLACEHOLDER; };
-// #define HID_LTRWIZ_OPTSENDERDEFINE   40801
-hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERDEFINE; };
-// #define HID_LTRWIZ_TXTSENDERNAME   40802
-hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERNAME; };
-// #define HID_LTRWIZ_TXTSENDERSTREET   40803
-hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTREET; };
-// #define HID_LTRWIZ_TXTSENDERPOSTCODE   40804
-hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERPOSTCODE; };
-// #define HID_LTRWIZ_TXTSENDERSTATE_TEXT   40805
-hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTATE_TEXT; };
-// #define HID_LTRWIZ_TXTSENDERCITY   40806
-hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERCITY; };
-// #define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER   40807
-hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERPLACEHOLDER; };
-// #define HID_LTRWIZ_OPTRECEIVERDATABASE   40808
-hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERDATABASE; };
-// #define HID_LTRWIZ_TXTFOOTER   40809
-hidspecial HID { HelpID = HID_LTRWIZ_TXTFOOTER; };
-// #define HID_LTRWIZ_CHKFOOTERNEXTPAGES   40810
-hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERNEXTPAGES; };
-// #define HID_LTRWIZ_CHKFOOTERPAGENUMBERS   40811
-hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERPAGENUMBERS; };
-// #define HID_LTRWIZ_TXTTEMPLATENAME   40812
-hidspecial HID { HelpID = HID_LTRWIZ_TXTTEMPLATENAME; };
-// #define HID_LTRWIZ_OPTCREATELETTER   40813
-hidspecial HID { HelpID = HID_LTRWIZ_OPTCREATELETTER; };
-// #define HID_LTRWIZ_OPTMAKECHANGES   40814
-hidspecial HID { HelpID = HID_LTRWIZ_OPTMAKECHANGES; };
-// #define HID_LTRWIZ_TXTPATH   40815
-hidspecial HID { HelpID = HID_LTRWIZ_TXTPATH; };
-// #define HID_LTRWIZ_CMDPATH   40816
-hidspecial HID { HelpID = HID_LTRWIZ_CMDPATH; };
-
-// #define HID_LTRWIZARD   40820
-hidspecial HID { HelpID = HID_LTRWIZARD; };
-// #define HID_LTRWIZARD_HELP   40821
-hidspecial HID { HelpID = HID_LTRWIZARD_HELP; };
-// #define HID_LTRWIZARD_BACK   40822
-hidspecial HID { HelpID = HID_LTRWIZARD_BACK; };
-// #define HID_LTRWIZARD_NEXT   40823
-hidspecial HID { HelpID = HID_LTRWIZARD_NEXT; };
-// #define HID_LTRWIZARD_CREATE   40824
-hidspecial HID { HelpID = HID_LTRWIZARD_CREATE; };
-// #define HID_LTRWIZARD_CANCEL   40825
-hidspecial HID { HelpID = HID_LTRWIZARD_CANCEL; };
-
-// #define HID_QUERYWIZARD_LSTTABLES   		40850
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTTABLES; };
-// #define HID_QUERYWIZARD_LSTFIELDS   		40851
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDS; };
-// #define HID_QUERYWIZARD_CMDMOVESELECTED   	40852
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVESELECTED; };
-// #define HID_QUERYWIZARD_CMDMOVEALL   		40853
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEALL; };
-// #define HID_QUERYWIZARD_CMDREMOVESELECTED   40854
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVESELECTED; };
-// #define HID_QUERYWIZARD_CMDREMOVEALL   		40855
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVEALL; };
-// #define HID_QUERYWIZARD_LSTSELFIELDS   		40856
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTSELFIELDS; };
-// #define HID_QUERYWIZARD_CMDMOVEUP   		40857
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEUP; };
-// #define HID_QUERYWIZARD_CMDMOVEDOWN   		40858
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEDOWN; };
-
-// #define HID_QUERYWIZARD_SORT1       		40865
-hidspecial HID { HelpID = HID_QUERYWIZARD_SORT1; };
-// #define HID_QUERYWIZARD_OPTASCEND1    		40866
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND1; };
-// #define HID_QUERYWIZARD_OPTDESCEND1    		40867
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND1; };
-// #define HID_QUERYWIZARD_SORT2       		40868
-hidspecial HID { HelpID = HID_QUERYWIZARD_SORT2; };
-// #define HID_QUERYWIZARD_OPTASCEND2    		40869
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND2; };
-// #define HID_QUERYWIZARD_OPTDESCEND2    		40870
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND2; };
-// #define HID_QUERYWIZARD_SORT3       		40871
-hidspecial HID { HelpID = HID_QUERYWIZARD_SORT3; };
-// #define HID_QUERYWIZARD_OPTASCEND3    		40872
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND3; };
-// #define HID_QUERYWIZARD_OPTDESCEND3    		40873
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND3; };
-// #define HID_QUERYWIZARD_SORT4       		40874
-hidspecial HID { HelpID = HID_QUERYWIZARD_SORT4; };
-// #define HID_QUERYWIZARD_OPTASCEND4    		40875
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND4; };
-// #define HID_QUERYWIZARD_OPTDESCEND4    		40876
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND4; };
-
-// #define HID_QUERYWIZARD_OPTMATCHALL	   		40878
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHALL; };
-// #define HID_QUERYWIZARD_OPTMATCHANY 		40879
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHANY; };
-
-// #define HID_QUERYWIZARD_LSTFIELDNAME_1	   	40880
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_1; };
-// #define HID_QUERYWIZARD_LSTOPERATOR_1 		40881
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_1; };
-// #define HID_QUERYWIZARD_TXTVALUE_1    		40882
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_1; };
-// #define HID_QUERYWIZARD_LSTFIELDNAME_2  	40883
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_2; };
-// #define HID_QUERYWIZARD_LSTOPERATOR_2    	40884
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_2; };
-// #define HID_QUERYWIZARD_TXTVALUE_2    		40885
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_2; };
-// #define HID_QUERYWIZARD_LSTFIELDNAME_3 		40886
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_3; };
-// #define HID_QUERYWIZARD_LSTOPERATOR_3    	40887
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_3; };
-// #define HID_QUERYWIZARD_TXTVALUE_3    		40888
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_3; };
-
-// #define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY	   		40895
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY; };
-// #define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 		40896
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1    		40897
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1  			40898
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2    		40899
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2  			40900
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3    		40901
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3  			40902
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4    		40903
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4  			40904
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5    		40905
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5; };
-// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5  			40906
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5; };
-// #define HID_QUERYWIZARD_BTNAGGREGATEPLUS  				40907
-hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEPLUS; };
-// #define HID_QUERYWIZARD_BTNAGGREGATEMINUS  				40908
-hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEMINUS; };
-
-// #define HID_QUERYWIZARD_LSTFILTERFIELDS   			40915
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDS; };
-// #define HID_QUERYWIZARD_CMDFILTERMOVESELECTED   	40916
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVESELECTED; };
-// #define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED   	40917
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERREMOVESELECTED; };
-// #define HID_QUERYWIZARD_LSTFILTERSELFIELDS   		40918
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERSELFIELDS; };
-// #define HID_QUERYWIZARD_CMDFILTERMOVEUP   			40919
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEUP; };
-// #define HID_QUERYWIZARD_CMDFILTERMOVEDOWN   		40920
-hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEDOWN; };
-
-// #define HID_QUERYWIZARD_OPTGROUPMATCHALL	   		40923
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHALL; };
-// #define HID_QUERYWIZARD_OPTGROUPMATCHANY 		40924
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHANY; };
-
-// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1	   	40925
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_1; };
-// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 		40926
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_1; };
-// #define HID_QUERYWIZARD_TXTFILTERVALUE_1    		40927
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_1; };
-// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2  		40928
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_2; };
-// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_2    		40929
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_2; };
-// #define HID_QUERYWIZARD_TXTFILTERVALUE_2    		40930
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_2; };
-// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 		40931
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_3; };
-// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_3    		40932
-hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_3; };
-// #define HID_QUERYWIZARD_TXTFILTERVALUE_3    		40933
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_3; };
-
-// #define HID_QUERYWIZARD_TXTTITLE_1         40940
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_1; };
-// #define HID_QUERYWIZARD_TXTTITLE_2         40941
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_2; };
-// #define HID_QUERYWIZARD_TXTTITLE_3         40942
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_3; };
-// #define HID_QUERYWIZARD_TXTTITLE_4         40943
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_4; };
-// #define HID_QUERYWIZARD_TXTTITLE_5         40944
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_5; };
-// #define HID_QUERYWIZARD_TXTTITLE_6         40945
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_6; };
-// #define HID_QUERYWIZARD_TXTTITLE_7         40946
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_7; };
-
-// #define HID_QUERYWIZARD_TXTQUERYTITLE    	40955
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTQUERYTITLE; };
-// #define HID_QUERYWIZARD_OPTDISPLAYQUERY    	40956
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDISPLAYQUERY; };
-// #define HID_QUERYWIZARD_OPTMODIFYQUERY    	40957
-hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMODIFYQUERY; };
-// #define HID_QUERYWIZARD_TXTSUMMARY    		40958
-hidspecial HID { HelpID = HID_QUERYWIZARD_TXTSUMMARY; };
-
-// #define HID_QUERYWIZARD   			40970
-hidspecial HID { HelpID = HID_QUERYWIZARD; };
-// #define HID_QUERYWIZARD_BACK   		40972
-hidspecial HID { HelpID = HID_QUERYWIZARD_BACK; };
-// #define HID_QUERYWIZARD_NEXT   		40973
-hidspecial HID { HelpID = HID_QUERYWIZARD_NEXT; };
-// #define HID_QUERYWIZARD_CREATE   	40974
-hidspecial HID { HelpID = HID_QUERYWIZARD_CREATE; };
-// #define HID_QUERYWIZARD_CANCEL  	40975
-hidspecial HID { HelpID = HID_QUERYWIZARD_CANCEL; };
-
-// ++++++++++++++++++++++++++++++++++++++
-// +++ Web Wizard : Continued from 34312
-// ++++++++++++++++++++++++++++++++++++++
-// web wizard iconssets dialog
-// #define	HID_IS	41000
-hidspecial HID { HelpID = HID_IS; } ;
-// #define	HID_IS_BTN_NONE	41002
-hidspecial HID { HelpID = HID_IS_BTN_NONE; } ;
-// #define	HID_IS_BTN_OK	41003
-hidspecial HID { HelpID = HID_IS_BTN_OK; } ;
-// #define HID_IS_BTN_CANCEL 41004
-hidspecial HID { HelpID = HID_IS_BTN_CANCEL; } ;
-
-// #define	HID_IS_BTN_IMG1	41005
-hidspecial HID { HelpID = HID_IS_BTN_IMG1; } ;
-// #define	HID_IS_BTN_IMG2	41006
-hidspecial HID { HelpID = HID_IS_BTN_IMG2; } ;
-// #define	HID_IS_BTN_IMG3	41007
-hidspecial HID { HelpID = HID_IS_BTN_IMG3; } ;
-// #define	HID_IS_BTN_IMG4	41008
-hidspecial HID { HelpID = HID_IS_BTN_IMG4; } ;
-// #define	HID_IS_BTN_IMG5	41009
-hidspecial HID { HelpID = HID_IS_BTN_IMG5; } ;
-// #define	HID_IS_BTN_IMG6	41010
-hidspecial HID { HelpID = HID_IS_BTN_IMG6; } ;
-// #define	HID_IS_BTN_IMG7	41011
-hidspecial HID { HelpID = HID_IS_BTN_IMG7; } ;
-// #define	HID_IS_BTN_IMG8	41012
-hidspecial HID { HelpID = HID_IS_BTN_IMG8; } ;
-// #define	HID_IS_BTN_IMG9	41013
-hidspecial HID { HelpID = HID_IS_BTN_IMG9; } ;
-// #define	HID_IS_BTN_IMG10	41014
-hidspecial HID { HelpID = HID_IS_BTN_IMG10; } ;
-// #define	HID_IS_BTN_IMG11	41015
-hidspecial HID { HelpID = HID_IS_BTN_IMG11; } ;
-// #define	HID_IS_BTN_IMG12	41016
-hidspecial HID { HelpID = HID_IS_BTN_IMG12; } ;
-// #define	HID_IS_BTN_IMG13	41017
-hidspecial HID { HelpID = HID_IS_BTN_IMG13; } ;
-// #define	HID_IS_BTN_IMG14	41018
-hidspecial HID { HelpID = HID_IS_BTN_IMG14; } ;
-// #define	HID_IS_BTN_IMG15	41019
-hidspecial HID { HelpID = HID_IS_BTN_IMG15; } ;
-// #define	HID_IS_BTN_IMG16	41020
-hidspecial HID { HelpID = HID_IS_BTN_IMG16; } ;
-// #define	HID_IS_BTN_IMG17	41021
-hidspecial HID { HelpID = HID_IS_BTN_IMG17; } ;
-// #define	HID_IS_BTN_IMG18	41022
-hidspecial HID { HelpID = HID_IS_BTN_IMG18; } ;
-// #define	HID_IS_BTN_IMG19	41023
-hidspecial HID { HelpID = HID_IS_BTN_IMG19; } ;
-// #define	HID_IS_BTN_IMG20	41024
-hidspecial HID { HelpID = HID_IS_BTN_IMG20; } ;
-// #define	HID_IS_BTN_IMG21	41025
-hidspecial HID { HelpID = HID_IS_BTN_IMG21; } ;
-// #define	HID_IS_BTN_IMG22	41026
-hidspecial HID { HelpID = HID_IS_BTN_IMG22; } ;
-// #define	HID_IS_BTN_IMG23	41027
-hidspecial HID { HelpID = HID_IS_BTN_IMG23; } ;
-// #define	HID_IS_BTN_IMG24	41028
-hidspecial HID { HelpID = HID_IS_BTN_IMG24; } ;
-// #define	HID_IS_BTN_IMG25	41029
-hidspecial HID { HelpID = HID_IS_BTN_IMG25; } ;
-// #define	HID_IS_BTN_IMG26	41030
-hidspecial HID { HelpID = HID_IS_BTN_IMG26; } ;
-// #define	HID_IS_BTN_IMG27	41031
-hidspecial HID { HelpID = HID_IS_BTN_IMG27; } ;
-// #define	HID_IS_BTN_IMG28	41032
-hidspecial HID { HelpID = HID_IS_BTN_IMG28; } ;
-// #define	HID_IS_BTN_IMG29	41033
-hidspecial HID { HelpID = HID_IS_BTN_IMG29; } ;
-// #define	HID_IS_BTN_IMG30	41034
-hidspecial HID { HelpID = HID_IS_BTN_IMG30; } ;
-// #define	HID_IS_BTN_IMG31	41035
-hidspecial HID { HelpID = HID_IS_BTN_IMG31; } ;
-// #define	HID_IS_BTN_IMG32	41036
-hidspecial HID { HelpID = HID_IS_BTN_IMG32; } ;
-
-// web wizard ftp dialog
-// #define	HID_FTP	41040
-hidspecial HID { HelpID = HID_FTP; } ;
-// #define	HID_FTP_SERVER	41041
-hidspecial HID { HelpID = HID_FTP_SERVER; } ;
-// #define	HID_FTP_USERNAME	41042
-hidspecial HID { HelpID = HID_FTP_USERNAME; } ;
-// #define	HID_FTP_PASS	41043
-hidspecial HID { HelpID = HID_FTP_PASS; } ;
-// #define	HID_FTP_TEST	41044
-hidspecial HID { HelpID = HID_FTP_TEST; } ;
-// #define	HID_FTP_TXT_PATH	41045
-hidspecial HID { HelpID = HID_FTP_TXT_PATH; } ;
-// #define	HID_FTP_BTN_PATH	41046
-hidspecial HID { HelpID = HID_FTP_BTN_PATH; } ;
-// #define	HID_FTP_OK	41047
-hidspecial HID { HelpID = HID_FTP_OK; } ;
-// #define	HID_FTP_CANCEL	41048
-hidspecial HID { HelpID = HID_FTP_CANCEL; } ;
-
-
-/* ====================================
- *                 AGENDA WIZARD
- *                 41051 - 41099
- * ====================================
- */
-
-// step 0 - navibar
-
-// #define	HID_AGWIZ						41051
-hidspecial HID { HelpID = HID_AGWIZ; } ;
-// #define	HID_AGWIZ_HELP						41052
-hidspecial HID { HelpID = HID_AGWIZ_HELP; } ;
-// #define	HID_AGWIZ_NEXT						41053
-hidspecial HID { HelpID = HID_AGWIZ_NEXT; } ;
-// #define	HID_AGWIZ_PREV						41054
-hidspecial HID { HelpID = HID_AGWIZ_PREV; } ;
-// #define	HID_AGWIZ_CREATE					41055
-hidspecial HID { HelpID = HID_AGWIZ_CREATE; } ;
-// #define	HID_AGWIZ_CANCEL					41056
-hidspecial HID { HelpID = HID_AGWIZ_CANCEL; } ;
-
-//step 1 - design
-
-// #define HID_AGWIZ_1_LIST_PAGEDESIGN				41057
-hidspecial HID { HelpID = HID_AGWIZ_1_LIST_PAGEDESIGN; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TIME; } ;
-// #define HID_AGWIZ_2_TXT_DATE					41060
-hidspecial HID { HelpID = HID_AGWIZ_2_TXT_DATE; } ;
-// #define HID_AGWIZ_2_TXT_TITLE					41061
-hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TITLE; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_3_CHK_MEETING_TYPE; } ;
-// #define HID_AGWIZ_3_CHK_READ 					41064
-hidspecial HID { HelpID = HID_AGWIZ_3_CHK_READ; } ;
-// #define HID_AGWIZ_3_CHK_BRING 					41065
-hidspecial HID { HelpID = HID_AGWIZ_3_CHK_BRING; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_4_CHK_CALLED_BY; } ;
-// #define HID_AGWIZ_4_CHK_FACILITATOR 				41068
-hidspecial HID { HelpID = HID_AGWIZ_4_CHK_FACILITATOR; } ;
-// #define HID_AGWIZ_4_CHK_NOTETAKER 				41069
-hidspecial HID { HelpID = HID_AGWIZ_4_CHK_NOTETAKER; } ;
-// #define HID_AGWIZ_4_CHK_TIMEKEEPER 				41070
-hidspecial HID { HelpID = HID_AGWIZ_4_CHK_TIMEKEEPER; } ;
-// #define HID_AGWIZ_4_CHK_ATTENDEES 				41071
-hidspecial HID { HelpID = HID_AGWIZ_4_CHK_ATTENDEES; } ;
-// #define HID_AGWIZ_4_CHK_OBSERVERS 				41072
-hidspecial HID { HelpID = HID_AGWIZ_4_CHK_OBSERVERS; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATENAME; } ;
-// #define HID_AGWIZ_6_TXT_TEMPLATEPATH 				41075
-hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATEPATH; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_6_OPT_CREATEAGENDA; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_BTN_INSERT; } ;
-// #define HID_AGWIZ_5_BTN_REMOVE 					41080
-hidspecial HID { HelpID = HID_AGWIZ_5_BTN_REMOVE; } ;
-// #define HID_AGWIZ_5_BTN_UP 					41081
-hidspecial HID { HelpID = HID_AGWIZ_5_BTN_UP; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_SCROLL_BAR; } ;
-
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_1; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_2; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_2; } ;
-
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_3; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_4; } ;
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_4; } ;
-
-// #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
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_5; } ;
-// #define HID_AGWIZ_5_TXT_MINUTES_5				41098
-hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_5; } ;
-
-
-//FaxWizard---------------------------
-
-// #define HID_FAXWIZ_OPTBUSINESSFAX				41120
-hidspecial HID { HelpID = HID_FAXWIZ_OPTBUSINESSFAX; };
-// #define HID_FAXWIZ_LSTBUSINESSSTYLE				41121
-hidspecial HID { HelpID = HID_FAXWIZ_LSTBUSINESSSTYLE; };
-// #define HID_FAXWIZ_OPTPRIVATEFAX				41122
-hidspecial HID { HelpID = HID_FAXWIZ_OPTPRIVATEFAX; };
-// #define HID_LSTPRIVATESTYLE					41123
-hidspecial HID { HelpID = HID_LSTPRIVATESTYLE; };
-// #define HID_IMAGECONTROL3					41124
-hidspecial HID { HelpID = HID_IMAGECONTROL3; };
-// #define HID_CHKUSELOGO						41125
-hidspecial HID { HelpID = HID_CHKUSELOGO; };
-// #define HID_CHKUSEDATE						41126
-hidspecial HID { HelpID = HID_CHKUSEDATE; };
-// #define HID_CHKUSECOMMUNICATIONTYPE				41127
-hidspecial HID { HelpID = HID_CHKUSECOMMUNICATIONTYPE; };
-// #define HID_LSTCOMMUNICATIONTYPE				41128
-hidspecial HID { HelpID = HID_LSTCOMMUNICATIONTYPE; };
-// #define HID_CHKUSESUBJECT					41129
-hidspecial HID { HelpID = HID_CHKUSESUBJECT; };
-// #define HID_CHKUSESALUTATION					41130
-hidspecial HID { HelpID = HID_CHKUSESALUTATION; };
-// #define HID_LSTSALUTATION					41131
-hidspecial HID { HelpID = HID_LSTSALUTATION; };
-// #define HID_CHKUSEGREETING					41132
-hidspecial HID { HelpID = HID_CHKUSEGREETING; };
-// #define HID_LSTGREETING						41133
-hidspecial HID { HelpID = HID_LSTGREETING; };
-// #define HID_CHKUSEFOOTER					41134
-hidspecial HID { HelpID = HID_CHKUSEFOOTER; };
-// #define HID_OPTSENDERPLACEHOLDER				41135
-hidspecial HID { HelpID = HID_OPTSENDERPLACEHOLDER; };
-// #define HID_OPTSENDERDEFINE					41136
-hidspecial HID { HelpID = HID_OPTSENDERDEFINE; };
-// #define HID_TXTSENDERNAME					41137
-hidspecial HID { HelpID = HID_TXTSENDERNAME; };
-// #define HID_TXTSENDERSTREET					41138
-hidspecial HID { HelpID = HID_TXTSENDERSTREET; };
-// #define HID_TXTSENDERPOSTCODE					41139
-hidspecial HID { HelpID = HID_TXTSENDERPOSTCODE; };
-// #define HID_TXTSENDERSTATE					41140
-hidspecial HID { HelpID = HID_TXTSENDERSTATE; };
-// #define HID_TXTSENDERCITY					41141
-hidspecial HID { HelpID = HID_TXTSENDERCITY; };
-// #define HID_TXTSENDERFAX					41142
-hidspecial HID { HelpID = HID_TXTSENDERFAX; };
-// #define HID_OPTRECEIVERPLACEHOLDER				41143
-hidspecial HID { HelpID = HID_OPTRECEIVERPLACEHOLDER; };
-// #define HID_OPTRECEIVERDATABASE					41144
-hidspecial HID { HelpID = HID_OPTRECEIVERDATABASE; };
-// #define HID_TXTFOOTER						41145
-hidspecial HID { HelpID = HID_TXTFOOTER; };
-// #define HID_CHKFOOTERNEXTPAGES					41146
-hidspecial HID { HelpID = HID_CHKFOOTERNEXTPAGES; };
-// #define HID_CHKFOOTERPAGENUMBERS				41147
-hidspecial HID { HelpID = HID_CHKFOOTERPAGENUMBERS; };
-// #define HID_TXTTEMPLATENAME					41148
-hidspecial HID { HelpID = HID_TXTTEMPLATENAME; };
-// #define HID_FILETEMPLATEPATH					41149
-hidspecial HID { HelpID = HID_FILETEMPLATEPATH; };
-// #define HID_OPTCREATEFAX					41150
-hidspecial HID { HelpID = HID_OPTCREATEFAX; };
-// #define HID_OPTMAKECHANGES					41151
-hidspecial HID { HelpID = HID_OPTMAKECHANGES; };
-// #define HID_IMAGECONTROL2					41152
-hidspecial HID { HelpID = HID_IMAGECONTROL2; };
-// #define HID_FAXWIZ_TXTPATH					41153
-hidspecial HID { HelpID = HID_FAXWIZ_TXTPATH; };
-// #define HID_FAXWIZ_CMDPATH					41154
-hidspecial HID { HelpID = HID_FAXWIZ_CMDPATH; };
-
-// #define HID_FAXWIZARD						41180
-hidspecial HID { HelpID = HID_FAXWIZARD; };
-// #define HID_FAXWIZARD_HELP					41181
-hidspecial HID { HelpID = HID_FAXWIZARD_HELP; };
-// #define HID_FAXWIZARD_BACK					41182
-hidspecial HID { HelpID = HID_FAXWIZARD_BACK; };
-// #define HID_FAXWIZARD_NEXT					41183
-hidspecial HID { HelpID = HID_FAXWIZARD_NEXT; };
-// #define HID_FAXWIZARD_CREATE					41184
-hidspecial HID { HelpID = HID_FAXWIZARD_CREATE; };
-// #define HID_FAXWIZARD_CANCEL					41185
-hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; };
-
-
-
-/* ====================================
- *                 TableWizard
- * ====================================
- */
-
-// #define HID_DLGTABLE_DIALOG                  41200
-hidspecial HID { HelpID = HID_DLGTABLE_DIALOG; };
-// #define HID_DLGTABLE_CMDPREV                 41202
-hidspecial HID { HelpID = HID_DLGTABLE_CMDPREV; };
-// #define HID_DLGTABLE_CMDNEXT                 41203
-hidspecial HID { HelpID = HID_DLGTABLE_CMDNEXT; };
-// #define HID_DLGTABLE_CMDFINISH   			41204
-hidspecial HID { HelpID = HID_DLGTABLE_CMDFINISH; };
-// #define HID_DLGTABLE_CMDCANCEL               41205
-hidspecial HID { HelpID = HID_DLGTABLE_CMDCANCEL; };
-
-
-// #define HID_DLGTABLE_OPTBUSINESS       		41206
-hidspecial HID { HelpID = HID_DLGTABLE_OPTBUSINESS; };
-// #define HID_DLGTABLE_OPTPRIVATE       		41207
-hidspecial HID { HelpID = HID_DLGTABLE_OPTPRIVATE; };
-
-
-// #define HID_DLGTABLE_LBTABLES                41208
-hidspecial HID { HelpID = HID_DLGTABLE_LBTABLES; };
-// #define HID_DLGTABLE_FIELDSAVAILABLE         41209
-hidspecial HID { HelpID = HID_DLGTABLE_FIELDSAVAILABLE; };
-// #define HID_DLGTABLE_CMDMOVESELECTED         41210
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVESELECTED; };
-// #define HID_DLGTABLE_CMDMOVEALL              41211
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEALL; };
-// #define HID_DLGTABLE_CMDREMOVESELECTED       41212
-hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVESELECTED; };
-// #define HID_DLGTABLE_CMDREMOVEALL            41213
-hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVEALL; };
-// #define HID_DLGTABLE_FIELDSSELECTED          41214
-hidspecial HID { HelpID = HID_DLGTABLE_FIELDSSELECTED; };
-
-// #define HID_DLGTABLE_CMDMOVEUP        41215
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP; };
-// #define HID_DLGTABLE_CMDMOVEDOWN        41216
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN; };
-
-
-// #define HID_DLGTABLE_LB_SELFIELDNAMES        41220
-hidspecial HID { HelpID = HID_DLGTABLE_LB_SELFIELDNAMES; };
-// #define HID_DLGTABLE_CMDMOVEFIELDUP        41221
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDUP; };
-// #define HID_DLGTABLE_CMDMOVEFIELDDOWN        41222
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDDOWN; };
-// #define HID_DLGTABLE_CMDMINUS        		41223
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMINUS; };
-// #define HID_DLGTABLE_CMDPLUS        		41224
-hidspecial HID { HelpID = HID_DLGTABLE_CMDPLUS; };
-// #define HID_DLGTABLE_COLNAME        		41225
-hidspecial HID { HelpID = HID_DLGTABLE_COLNAME; };
-// #define HID_DLGTABLE_COLMODIFIER        		41226
-hidspecial HID { HelpID = HID_DLGTABLE_COLMODIFIER; };
-
-
-// #define HID_DLGTABLE_CHK_USEPRIMEKEY       	41227
-hidspecial HID { HelpID = HID_DLGTABLE_CHK_USEPRIMEKEY; };
-// #define HID_DLGTABLE_OPT_PK_AUTOMATIC       	41228
-hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_AUTOMATIC; };
-
-// #define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC     41229
-hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC; };
-
-// #define HID_DLGTABLE_OPT_PK_SINGLE       		41230
-hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SINGLE; };
-// #define HID_DLGTABLE_LB_PK_FIELDNAME            41231
-hidspecial HID { HelpID = HID_DLGTABLE_LB_PK_FIELDNAME; };
-// #define HID_DLGTABLE_CK_PK_AUTOVALUE             41232
-hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE; };
-// #define HID_DLGTABLE_OPT_PK_SEVERAL       	41233
-hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SEVERAL; };
-// #define HID_DLGTABLE_FIELDS_PK_AVAILABLE         41234
-hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_AVAILABLE; };
-// #define HID_DLGTABLE_CMDMOVE_PK_SELECTED         41235
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVE_PK_SELECTED; };
-// #define HID_DLGTABLE_CMDREMOVE_PK_SELECTED       41236
-hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVE_PK_SELECTED; };
-// #define HID_DLGTABLE_FIELDS_PK_SELECTED          41237
-hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_SELECTED; };
-
-// #define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED         41238
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP_PK_SELECTED; };
-// #define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED       41239
-hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED; };
-
-
-
-
-// #define HID_DLGTABLE_TXT_NAME       		41240
-hidspecial HID { HelpID = HID_DLGTABLE_TXT_NAME; };
-// #define HID_DLGTABLE_OPT_MODIFYTABLE     		41241
-hidspecial HID { HelpID = HID_DLGTABLE_OPT_MODIFYTABLE; };
-// #define HID_DLGTABLE_OPT_WORKWITHTABLE     	41242
-hidspecial HID { HelpID = HID_DLGTABLE_OPT_WORKWITHTABLE; };
-// #define HID_DLGTABLE_OPT_STARTFORMWIZARD     	41243
-hidspecial HID { HelpID = HID_DLGTABLE_OPT_STARTFORMWIZARD; };
-// #define HID_DLGTABLE_LST_CATALOG     	41244
-hidspecial HID { HelpID = HID_DLGTABLE_LST_CATALOG; };
-// #define HID_DLGTABLE_LST_SCHEMA     	41245
-hidspecial HID { HelpID = HID_DLGTABLE_LST_SCHEMA; };
-
-
-
-
-//End at 42767
diff --git a/wizards/util/soffice.lnk b/wizards/util/soffice.lnk
deleted file mode 100644
index f9f1eb297..000000000
--- a/wizards/util/soffice.lnk
+++ /dev/null
@@ -1,248 +0,0 @@
-[Main]
-; Linken der Module zu den entsprechenden SBLs
-; Pfade relativ zum Script.
-SBL-Dir=../sbl
-Modules-Dir=../../source
-CharSet=ANSI
-;
-[Libs]
-Standard=embedded
-;=soffice.sbl
-CreateReport=createre.sbl
-dbhandler=dbhandle.sbl
-ComboWizard=combowiz.sbl
-GridWizard=gridwiza.sbl
-GroupWizard=groupwiz.sbl
-FormEdit=formedit.sbl
-FormWizard=formwiza.sbl
-QueryWizard=querywiz.sbl
-ReportWizard=reportwi.sbl
-TableWizard=tablewiz.sbl
-Template=template.sbl
-Tools=tools.sbl
-WebWizard=webwizar.sbl
-Schedule=schedule.sbl
-Gimmicks=gimmicks.sbl
-ImportWizard=importwi.sbl
-Euro=euro.sbl
-;
-;
-[Standard-Modules]
-Module1=standard/modul1.mod
-;
-[CreateReport-Password]
-Password=createreport
-[CreateReport-Modules]
-CreateReport=createre/crearep.mod
-Language=createre/crelang.mod
-;
-;[CreateRepeat-Dialogs]
-;
-;
-[dbhandler-Password]
-Password=dbhandler
-[dbhandler-Modules]
-dbhandler=dbhandle/dbhdl.mod
-dbFormEdit=dbhandle/formedt.mod
-Language=dbhandle/dbhlang.mod
-;
-;[dbhandler-Dialogs]
-;
-;
-[FormWizard-Password]
-Password=formwizard
-[FormWizard-Modules]
-FormWizard=formwiza/frmwiz.mod
-Layouter=formwiza/layout.mod
-Language=formwiza/frmlang.mod
-DBMeta=formwiza/dbmeta.mod
-tools=formwiza/tools.mod
-develop=formwiza/develop.mod
-;
-[FormWizard-Dialogs]
-DlgFormDB=formwiza/form.dlg
-;
-;
-[ComboWizard-Password]
-Password=combowizard
-[ComboWizard-Modules]
-ComboWizard=combowiz/comwiz.mod
-Language=combowiz/comlang.mod
-;
-[ComboWizard-Dialogs]
-DlgComboDB=combowiz/combo.dlg
-;
-;
-[GridWizard-Password]
-Password=gridwizard
-[GridWizard-Modules]
-GridWizard=gridwiza/gridwiz.mod
-Language=gridwiza/grdlang.mod
-;
-[GridWizard-Dialogs]
-DlgGridDB=gridwiza/grid.dlg
-;
-;
-[GroupWizard-Password]
-Password=groupwizard
-[GroupWizard-Modules]
-GroupWizard=groupwiz/grpwiz.mod
-Layouter=groupwiz/layout.mod
-Language=groupwiz/grplang.mod
-;
-[GroupWizard-Dialogs]
-DlgGroupDB=groupwiz/group.dlg
-;
-;
-[FormEdit-Password]
-Password=formedit
-[FormEdit-Modules]
-dbDlgEditForm=formedit/edform.mod
-dbDlgAddGroup=formedit/addgroup.mod
-dbChgTabindex=formedit/chgtabix.mod
-dbChgSQL=formedit/dbchgsql.mod
-Language=formedit/lang.mod
-;
-[FormEdit-Dialogs]
-DlgChgGroup=formedit/chggrp.dlg
-DlgAddGroup=formedit/addgrp.dlg
-DlgChgTabindex=formedit/chgtabix.dlg
-DlgChgSQL=formedit/dlgsql.dlg
-;
-;
-[QueryWizard-Password]
-Password=querywizard
-[QueryWizard-Modules]
-QueryWizard=querywiz/qurypwiz.mod
-QueryLanguage=querywiz/qrylang.mod
-;
-[QueryWizard-Dialogs]
-DlgQuery=querywiz/query.dlg
-;
-;
-[ReportWizard-Password]
-Password=reportwizard
-[ReportWizard-Modules]
-ReportWizard=reportwi/repwiz.mod
-CreateReportView=reportwi/repview.mod
-ReportLanguage=reportwi/replang.mod
-;
-[ReportWizard-Dialogs]
-DlgReport=reportwi/report.dlg
-;
-;
-[TableWizard-Password]
-Password=tablewizard
-[TableWizard-Modules]
-TableWizard=tablewiz/tblwiz.mod
-TableLanguage=tablewiz/tbllang.mod
-;
-[TableWizard-Dialogs]
-DlgTable=tablewiz/table.dlg
-;
-;
-[Template-Password]
-Password=template
-[Template-Modules]
-ModuleAgenda=template/agenda.mod
-Correspondence=template/corresp.mod
-Samples=template/samples.mod
-Autotext=template/autotext.mod
-Greeting=template/greeting.mod
-;
-[Template-Dialogs]
-DialogAgenda=template/agenda.dlg
-DialogCorrespondence=template/corresp.dlg
-DialogStyles=template/styles.dlg
-DlgGreeting=template/greeting.dlg
-;
-;
-[Tools-Password]
-Password=tools
-[Tools-Modules]
-ModuleControls=tools/controls.mod
-Strings=tools/strings.mod
-Misc=tools/misc.mod
-Recursive=tools/recursiv.mod
-Listbox=tools/listbox.mod
-;
-;[Tools-Dialogs]
-;
-;
-[WebWizard-Password]
-Password=webwizard
-[WebWizard-Modules]
-HtmlAutoPilotBasic=webwizar/htmlplt.mod
-Language=webwizar/htmllang.mod
-;
-[WebWizard-Dialogs]
-MainDialog=webwizar/htmlaplt.dlg
-;
-;
-[Schedule-Password]
-Password=schedule
-[Schedule-Modules]
-OwnEvents=schedule/ownevent.mod
-CalendarMain=schedule/calmain.mod
-BankHoliday=schedule/bankholi.mod
-DlgControl=schedule/dlgctrl.mod
-Language=schedule/lang.mod
-CreateTable=schedule/creatabl.mod
-HolidayGerman=schedule/holi_ger.mod
-HolidayUSA=schedule/holi_usa.mod
-HolidayFrance=schedule/holi_fra.mod
-HolidayItalia=schedule/holi_ita.mod
-HolidaySpain=schedule/holi_spa.mod
-HolidayPortugal=schedule/holi_por.mod
-HolidayNetherlands=schedule/holi_nl.mod
-HolidaySweden=schedule/holi_swe.mod
-HolidayDanmark=schedule/holi_dan.mod
-HolidayRussia=schedule/holi_rus.mod
-HolidayPoland=schedule/holi_pol.mod
-;
-[Schedule-Dialogs]
-DlgCalendar=schedule/dlgcal.dlg
-;
-;
-[Gimmicks-Modules]
-GetTexts=gimmicks/gettext.mod
-Userfields=gimmicks/autfld.mod
-UserfieldsLanguage=gimmicks/usfldlan.mod
-ChangeAllChars=gimmicks/chchars.mod
-AutoText=gimmicks/autotext.mod
-AutoTextLanguage=gimmicks/autolang.mod
-ReadDir=gimmicks/readdirs.mod
-;
-[Gimmicks-Dialogs]
-UserfieldDlg=gimmicks/autfldlg.dlg
-ReadDirDlg=gimmicks/readdirs.dlg
-;
-;
-[ImportWizard-Password]
-Password=importwizard
-[ImportWizard-Modules]
-Main=importwi/main.mod
-DialogModul=importwi/dlgmodul.mod
-Language=importwi/impolang.mod
-FilesModul=importwi/filesmod.mod
-API=importwi/api.mod
-;
-[ImportWizard-Dialogs]
-ImportDialog=importwi/impordlg.dlg
-;
-;
-[Euro-Password]
-Password=euro
-[Euro-Modules]
-ConvertRun=euro/convert.mod
-AutoPilotRun=euro/autoplt.mod
-Hard=euro/hard.mod
-Soft=euro/soft.mod
-Init=euro/init.mod
-Common=euro/common.mod
-;
-[Euro-Dialogs]
-DialogConvert=euro/dlgconvt.dlg
-DialogPW = euro/dlgPW.dlg
-;
-;
diff --git a/wizards/util/target.pmk b/wizards/util/target.pmk
deleted file mode 100644
index c44093461..000000000
--- a/wizards/util/target.pmk
+++ /dev/null
@@ -1,41 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-CONFIG_ALL_TARGET               = basicusr
-CONFIG_SHARE_TARGET             = basicshare
-EURO_ALL_TARGET                 = basicsrveuro
-FORMWIZARD_ALL_TARGET           = basicsrvform
-GIMMICKS_ALL_TARGET             = basicsrvgimmicks
-IMPORTWIZARD_ALL_TARGET         = basicsrvimport
-SCHEDULE_ALL_TARGET             = basicsrvschedule
-TEMPLATE_ALL_TARGET             = basicsrvtemplate
-TOOLS_ALL_TARGET                = basicsrvtools
-WEBWIZARD_ALL_TARGET            = basicsrvweb
-DEPOT_ALL_TARGET                = basicsrvdepot
-STANDARD_ALL_TARGET             = basicsrvstandard
-LAUNCHER_ALL_TARGET             = basicsrvlauncher
-TUTORIALS_ALL_TARGET            = basicsrvtutorials
-