Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

63 files changed, 1848 insertions, 925 deletions

diff --git a/wizards/source/standard/makefile.mk b/wizards/AllLangResTarget_cal.mk
index 7ffef2e63789..4f812bb6f4c2 100644
--- a/wizards/source/standard/makefile.mk
+++ b/wizards/AllLangResTarget_cal.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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 +25,22 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=standard
+$(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      = $(STANDARD_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_SrsTarget_add_files,cal/res,\
+	wizards/source/schedule/schedule.src \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk
new file mode 100644
index 000000000000..f9e1ee11b599
--- /dev/null
+++ b/wizards/AllLangResTarget_dbw.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/gimmicks/makefile.mk b/wizards/AllLangResTarget_eur.mk
index de083f52e88d..d2ff342b2fdc 100644
--- a/wizards/source/gimmicks/makefile.mk
+++ b/wizards/AllLangResTarget_eur.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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 +25,22 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=gimmicks
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,eur))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,eur,\
+	eur/res \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+$(eval $(call gb_SrsTarget_SrsTarget,eur/res))
 
-# --- Files --------------------------------------------------------
+$(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 \
+))
 
-ZIP1TARGET      = $(GIMMICKS_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/makefile.mk b/wizards/AllLangResTarget_imp.mk
index 4bd474242f4b..afbc44918d92 100644
--- a/wizards/source/launcher/makefile.mk
+++ b/wizards/AllLangResTarget_imp.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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 +25,22 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=launcher
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,imp))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,imp,\
+	imp/res \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+$(eval $(call gb_SrsTarget_SrsTarget,imp/res))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_set_include,imp/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
 
-ZIP1TARGET      = $(LAUNCHER_ALL_TARGET)
-XBAFILES	= DicOOo.xba
-ZIP1LIST        = *.xdl $(XBAFILES) *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_SrsTarget_add_files,imp/res,\
+	wizards/source/importwizard/importwi.src \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk
new file mode 100644
index 000000000000..d2326fb9bf07
--- /dev/null
+++ b/wizards/AllLangResTarget_tpl.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/AllLangResTarget_wwz.mk b/wizards/AllLangResTarget_wwz.mk
new file mode 100644
index 000000000000..a81dcb09faba
--- /dev/null
+++ b/wizards/AllLangResTarget_wwz.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/imagelists/makefile.mk b/wizards/AllLangResTarget_wzi.mk
index 163377de392b..8566dc9fa014 100644
--- a/wizards/source/imagelists/makefile.mk
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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,26 +26,23 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-PRJNAME=wizards
-TARGET=wzimglst
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,wzi))
 
-# --- Settings ----------------------------------
+$(eval $(call gb_AllLangResTarget_set_reslocation,wzi,wizards))
 
-.INCLUDE : settings.mk
-# --- Files -------------------------------------
-# ... resource files ............................
+$(eval $(call gb_AllLangResTarget_add_srs,wzi,\
+	wzi/res \
+))
 
-SRS1NAME=$(TARGET)
-SRC1FILES=imagelists.src
+$(eval $(call gb_SrsTarget_SrsTarget,wzi/res))
 
-RESLIB1SRSFILES= $(SRS)$/wzimglst.srs
-RESLIB1NAME=wzi
-RESLIB1IMAGES=$(PRJ)$/res
-
-# ... object files ............................
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+$(eval $(call gb_SrsTarget_set_include,wzi/res,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/inc \
+))
 
+$(eval $(call gb_SrsTarget_add_files,wzi/res,\
+	wizards/source/imagelists/imagelists.src \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
new file mode 100644
index 000000000000..eb5423e1e31e
--- /dev/null
+++ b/wizards/Jar_agenda.mk
@@ -0,0 +1,63 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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 000000000000..876b327c82ba
--- /dev/null
+++ b/wizards/Jar_commonwizards.mk
@@ -0,0 +1,135 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,commonwizards,\
+	$(OUTDIR_FOR_BUILD)/bin/ridl.jar \
+	$(OUTDIR_FOR_BUILD)/bin/unoil.jar \
+	$(OUTDIR_FOR_BUILD)/bin/jurt.jar \
+	$(OUTDIR_FOR_BUILD)/bin/juh.jar \
+	$(OUTDIR_FOR_BUILD)/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_set_jarclasspath,commonwizards,saxon9.jar))
+
+$(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 000000000000..7a86e605694a
--- /dev/null
+++ b/wizards/Jar_fax.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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 000000000000..d4e04aa60b7b
--- /dev/null
+++ b/wizards/Jar_form.mk
@@ -0,0 +1,63 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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 000000000000..aaa73327c90b
--- /dev/null
+++ b/wizards/Jar_letter.mk
@@ -0,0 +1,64 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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/source/euro/makefile.mk b/wizards/Jar_query.mk
index f4b4c22306f5..62ea5e67345a 100644
--- a/wizards/source/euro/makefile.mk
+++ b/wizards/Jar_query.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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,29 +26,31 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+$(eval $(call gb_Jar_Jar,query,SRCDIR))
 
-PRJNAME=wizards
-TARGET=euro
+$(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 \
+))
+$(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/query/MANIFEST.MF))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Jar_set_packageroot,query,com))
 
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+$(eval $(call gb_Jar_set_jarclasspath,query,\
+	commonwizards.jar \
+))
 
-# --- Files --------------------------------------------------------
+$(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 \
+))
 
-#
-# testresource.
-#
-SRS2NAME =              euro
-SRC2FILES=              euro.src
-RESLIB2SRSFILES= $(SRS)$/euro.srs
-RESLIB2NAME=    eur
-
-ZIP1TARGET      = $(EURO_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
+$(eval $(call gb_Jar_set_componentfile,query,wizards/com/sun/star/wizards/query/query,OOO))
 
-.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 000000000000..770cbdb5c04b
--- /dev/null
+++ b/wizards/Jar_report.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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 000000000000..74faf137e747
--- /dev/null
+++ b/wizards/Jar_reportbuilder.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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 000000000000..f65ab18d6bfa
--- /dev/null
+++ b/wizards/Jar_table.mk
@@ -0,0 +1,62 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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 000000000000..340fa4ec4e33
--- /dev/null
+++ b/wizards/Jar_web.mk
@@ -0,0 +1,107 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,SRCDIR))
+
+$(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/source/tools/makefile.mk b/wizards/Makefile
index 801db34b4c3f..8d71119918b6 100644
--- a/wizards/source/tools/makefile.mk
+++ b/wizards/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,22 +25,15 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=tools
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-# --- Settings -----------------------------------------------------
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-ZIP1TARGET      = $(TOOLS_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- 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/com/sun/star/wizards/reportbuilder/makefile.mk b/wizards/Module_wizards.mk
index 41e4d3cd9c79..7f08d0f08cfe 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk
+++ b/wizards/Module_wizards.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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,28 +26,45 @@
 #
 #*************************************************************************
 
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET  = reportbuilderwizard
-PACKAGE = com$/sun$/star$/wizards$/reportbuilder
+$(eval $(call gb_Module_Module,wizards))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_add_targets,wizards,\
+	AllLangResTarget_cal \
+	AllLangResTarget_dbw \
+	AllLangResTarget_eur \
+	AllLangResTarget_imp \
+	AllLangResTarget_tpl \
+	AllLangResTarget_wwz \
+	AllLangResTarget_wzi \
+	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 \
+))
 
-.INCLUDE : settings.mk
+ifeq ($(SOLAR_JAVA),TRUE)
+$(eval $(call gb_Module_add_targets,wizards,\
+	Jar_commonwizards \
+	Jar_agenda \
+	Jar_fax \
+	Jar_form \
+	Jar_letter \
+	Jar_query \
+	Jar_report \
+	Jar_reportbuilder \
+	Jar_table \
+	Jar_web \
+))
+endif
 
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar
-
-JARCLASSDIRS	= com$/sun$/star$/wizards$/reportbuilder
-JARTARGET	= $(TARGET).jar
-JARCLASSPATH = commonwizards.jar report.jar
-
-# --- Files --------------------------------------------------------
-
-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/Zip_depot.mk b/wizards/Zip_depot.mk
new file mode 100644
index 000000000000..8dd5fef64c33
--- /dev/null
+++ b/wizards/Zip_depot.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,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 000000000000..ac71ce946978
--- /dev/null
+++ b/wizards/Zip_euro.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 000000000000..8a2d577484c9
--- /dev/null
+++ b/wizards/Zip_form.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 000000000000..1099756f6bee
--- /dev/null
+++ b/wizards/Zip_gimmicks.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 000000000000..1cabc80d74d4
--- /dev/null
+++ b/wizards/Zip_import.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/Zip_launcher.mk b/wizards/Zip_launcher.mk
new file mode 100644
index 000000000000..1fb18b0421e5
--- /dev/null
+++ b/wizards/Zip_launcher.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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,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/source/depot/makefile.mk b/wizards/Zip_schedule.mk
index 9de23408e575..ec294746608e 100644
--- a/wizards/source/depot/makefile.mk
+++ b/wizards/Zip_schedule.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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 +25,21 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
-
-PRJNAME=wizards
-TARGET=depotall
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-# --- Files --------------------------------------------------------
-
-ZIP1TARGET      = $(DEPOT_ALL_TARGET)
-ZIP1LIST        = *.xdl *.xba *.xlb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
 
+$(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/util/makefile.mk b/wizards/Zip_share.mk
index 16cf678b4281..5f90a1a3a289 100644
--- a/wizards/util/makefile.mk
+++ b/wizards/Zip_share.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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,18 +26,11 @@
 #
 #*************************************************************************
 
-PRJ=..
+$(eval $(call gb_Zip_Zip,basicshare,$(SRCDIR)/wizards/source/configshare))
 
-PRJNAME=wizards
-TARGET=NOTARGET
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(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 000000000000..87bbb4a43814
--- /dev/null
+++ b/wizards/Zip_standard.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 000000000000..238a3752736f
--- /dev/null
+++ b/wizards/Zip_template.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 000000000000..f7231138109d
--- /dev/null
+++ b/wizards/Zip_tools.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 000000000000..6c0608a6e505
--- /dev/null
+++ b/wizards/Zip_tutorials.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/source/configshare/makefile.mk b/wizards/Zip_usr.mk
index 63c8b5304296..efb2968c63ec 100644
--- a/wizards/source/configshare/makefile.mk
+++ b/wizards/Zip_usr.mk
@@ -1,8 +1,9 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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,15 +25,12 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=wizards
-TARGET=configshare
+$(eval $(call gb_Zip_Zip,basicusr,$(SRCDIR)/wizards/source/config))
 
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+$(eval $(call gb_Zip_add_files,basicusr,\
+	dialog.xlc \
+	script.xlc \
+))
 
-ZIP1TARGET      = $(CONFIG_SHARE_TARGET)
-ZIP1LIST        = * -x makefile.*
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/Zip_web.mk b/wizards/Zip_web.mk
new file mode 100644
index 000000000000..c552440b5414
--- /dev/null
+++ b/wizards/Zip_web.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/common/MANIFEST.MF b/wizards/com/sun/star/wizards/common/MANIFEST.MF
index a670e80c31e7..e69de29bb2d1 100644
--- a/wizards/com/sun/star/wizards/common/MANIFEST.MF
+++ b/wizards/com/sun/star/wizards/common/MANIFEST.MF
@@ -1 +0,0 @@
-Class-Path: saxon9.jar
diff --git a/wizards/com/sun/star/wizards/common/prova.py b/wizards/com/sun/star/wizards/common/prova.py
new file mode 100644
index 000000000000..1219ba9aff7b
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/prova.py
@@ -0,0 +1,7 @@
+from PropertyNames import PropertyNames
+
+class prova:
+
+    def Imprimir(self):
+        print PropertyNames.PROPERTY_STEP
+
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 398468f6d4b2..8469a2bc7179 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -205,7 +205,7 @@ public class SQLQueryComposer
                 {
                     sOrder += ", ";
                 }
-                sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + CurDBMetaData.AggregateFieldNames[iAggregate][0] + ")";
+                sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")";
                 sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1];
                 m_queryComposer.setOrder(sOrder);
             }
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py b/wizards/com/sun/star/wizards/fax/FaxDocument.py
index b5fee838796b..3b132e40df4c 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@ -1,5 +1,10 @@
 from text.TextDocument import *
 from text.TextSectionHandler import TextSectionHandler
+<<<<<<< HEAD
+=======
+from text.TextFieldHandler import TextFieldHandler
+from common.Configuration import Configuration
+>>>>>>> master
 from common.PropertyNames import PropertyNames
 
 from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 644f08a228db..8d7ea270f18e 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -86,7 +86,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
                 4, 74), self)
+<<<<<<< HEAD
         self.insertLabel("lblBusinessStyle",
+=======
+        self.lblBusinessStyle = self.insertLabel("lblBusinessStyle",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -97,7 +101,11 @@ class FaxWizardDialog(WizardDialog):
             (8, self.resources.reslblBusinessStyle_value,
                 110, 42, 1, 32, 60))
 
+<<<<<<< HEAD
         self.insertLabel("lblTitle1",
+=======
+        self.lblTitle1 = self.insertLabel("lblTitle1",
+>>>>>>> master
             ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -108,7 +116,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor5, 16, self.resources.reslblTitle1_value,
                 True, 91, 8, 1, 37, 212))
+<<<<<<< HEAD
         self.insertLabel("lblPrivateStyle",
+=======
+        self.lblPrivateStyle = self.insertLabel("lblPrivateStyle",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -117,7 +129,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblPrivateStyle_value, 110, 95, 1, 50, 60))
+<<<<<<< HEAD
         self.insertLabel("lblIntroduction",
+=======
+        self.lblIntroduction = self.insertLabel("lblIntroduction",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -264,7 +280,11 @@ class FaxWizardDialog(WizardDialog):
             (8, CHKUSEFOOTER_HID,
                 self.resources.reschkUseFooter_value, 97, 163,
                 0, 2, 14, 212), self)
+<<<<<<< HEAD
         self.insertLabel("lblTitle3",
+=======
+        self.lblTitle3 = self.insertLabel("lblTitle3",
+>>>>>>> master
             ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -312,7 +332,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERNAME_HID, 182, 67, 3, 17, 119), self)
+=======
+            (12, TXTSENDERNAME_HID, 182, 67, 3,
+                17, 119), self)
+>>>>>>> master
         self.txtSenderStreet = self.insertTextField("txtSenderStreet",
             TXTSENDERSTREET_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -322,7 +347,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERSTREET_HID, 182, 81, 3, 18, 119), self)
+=======
+            (12, TXTSENDERSTREET_HID, 182, 81, 3,
+                18, 119), self)
+>>>>>>> master
         self.txtSenderPostCode = self.insertTextField("txtSenderPostCode",
             TXTSENDERPOSTCODE_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -332,7 +362,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERPOSTCODE_HID, 182, 95, 3, 19, 25), self)
+=======
+            (12, TXTSENDERPOSTCODE_HID, 182, 95, 3,
+                19, 25), self)
+>>>>>>> master
         self.txtSenderState = self.insertTextField("txtSenderState",
             TXTSENDERSTATE_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -342,7 +377,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERSTATE_HID, 211, 95, 3, 20, 21), self)
+=======
+            (12, TXTSENDERSTATE_HID, 211, 95, 3,
+                20, 21), self)
+>>>>>>> master
         self.txtSenderCity = self.insertTextField("txtSenderCity",
             TXTSENDERCITY_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -352,7 +392,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERCITY_HID, 236, 95, 3, 21, 65), self)
+=======
+            (12, TXTSENDERCITY_HID, 236, 95, 3,
+                21, 65), self)
+>>>>>>> master
         self.txtSenderFax = self.insertTextField("txtSenderFax",
             TXTSENDERFAX_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -362,7 +407,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERFAX_HID, 182, 109, 3, 22, 119), self)
+=======
+            (12, TXTSENDERFAX_HID, 182, 109, 3,
+                22, 119), self)
+>>>>>>> master
         self.optReceiverPlaceholder = self.insertRadioButton(
             "optReceiverPlaceholder",
             OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
@@ -391,7 +441,11 @@ class FaxWizardDialog(WizardDialog):
             (8, OPTRECEIVERDATABASE_HID,
                 self.resources.resoptReceiverDatabase_value, 104, 160, 3,
                 24, 200), self)
+<<<<<<< HEAD
         self.insertLabel("lblSenderAddress",
+=======
+        self.lblSenderAddress = self.insertLabel("lblSenderAddress",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -400,14 +454,22 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
+<<<<<<< HEAD
         self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
+=======
+        self.FixedLine2 = self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
+>>>>>>> master
                 PropertyNames.PROPERTY_POSITION_X,
                 PropertyNames.PROPERTY_POSITION_Y,
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (5, 90, 126, 3, 51, 212))
+<<<<<<< HEAD
         self.insertLabel("lblSenderName",
+=======
+        self.lblSenderName = self.insertLabel("lblSenderName",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -415,8 +477,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (8, self.resources.reslblSenderName_value, 113, 69, 3, 52, 68))
         self.insertLabel("lblSenderStreet",
+=======
+            (8, self.resources.reslblSenderName_value, 113, 69, 3,
+                52, 68))
+        self.lblSenderStreet = self.insertLabel("lblSenderStreet",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -424,8 +492,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (8, self.resources.reslblSenderStreet_value, 113, 82, 3, 53, 68))
         self.insertLabel("lblPostCodeCity",
+=======
+            (8, self.resources.reslblSenderStreet_value, 113, 82, 3,
+                53, 68))
+        self.lblPostCodeCity = self.insertLabel("lblPostCodeCity",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -433,8 +507,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (8, self.resources.reslblPostCodeCity_value, 113, 97, 3, 54, 68))
         self.insertLabel("lblTitle4",
+=======
+            (8, self.resources.reslblPostCodeCity_value,
+                113, 97, 3, 54, 68))
+        self.lblTitle4 = self.insertLabel("lblTitle4",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -446,7 +526,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor5, 16, self.resources.reslblTitle4_value,
                  True, 91, 8, 3, 60, 212))
+<<<<<<< HEAD
         self.insertLabel("lblSenderFax",
+=======
+        self.Label1 = self.insertLabel("lblSenderFax",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -455,7 +539,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.resLabel1_value, 113, 111, 3, 68, 68))
+<<<<<<< HEAD
         self.insertLabel("Label2",
+=======
+        self.Label2 = self.insertLabel("Label2",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -505,7 +593,11 @@ class FaxWizardDialog(WizardDialog):
             (8, CHKFOOTERPAGENUMBERS_HID,
                 self.resources.reschkFooterPageNumbers_value, 97, 106,
                 0, 4, 27, 201), self)
+<<<<<<< HEAD
         self.insertLabel("lblFooter",
+=======
+        self.lblFooter = self.insertLabel("lblFooter",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -516,7 +608,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor4, 8, self.resources.reslblFooter_value,
                 97, 28, 4, 33, 116))
+<<<<<<< HEAD
         self.insertLabel("lblTitle5",
+=======
+        self.lblTitle5 = self.insertLabel("lblTitle5",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -567,7 +663,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
                 104, 123, 5, 31, 198), self)
+<<<<<<< HEAD
         self.insertLabel("lblFinalExplanation1",
+=======
+        self.lblFinalExplanation1 = self.insertLabel("lblFinalExplanation1",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -578,7 +678,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (28, self.resources.reslblFinalExplanation1_value,
                 True, 97, 28, 5, 34, 205))
+<<<<<<< HEAD
         self.insertLabel("lblProceed",
+=======
+        self.lblProceed = self.insertLabel("lblProceed",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -588,7 +692,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblProceed_value, 97, 100, 5,
                 35, 204))
+<<<<<<< HEAD
         self.insertLabel("lblFinalExplanation2",
+=======
+        self.lblFinalExplanation2 = self.insertLabel("lblFinalExplanation2",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -599,7 +707,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
                 36, 199))
+<<<<<<< HEAD
         self.insertImage("ImageControl2",
+=======
+        self.ImageControl2 = self.insertImage("ImageControl2",
+>>>>>>> master
             ("Border",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_IMAGEURL,
@@ -611,7 +723,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (0, 10, UIConsts.INFOIMAGEURL, 92, 145,
                 False, 5, 47, 10))
+<<<<<<< HEAD
         self.insertLabel("lblTemplateName",
+=======
+        self.lblTemplateName = self.insertLabel("lblTemplateName",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -622,7 +738,11 @@ class FaxWizardDialog(WizardDialog):
             (8, self.resources.reslblTemplateName_value, 97, 58, 5,
                 57, 101))
 
+<<<<<<< HEAD
         self.insertLabel("lblTitle6",
+=======
+        self.lblTitle6 = self.insertLabel("lblTitle6",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
index e5a72e195033..e690248caa70 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
@@ -38,7 +38,11 @@ CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged"
 CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
 TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
 FILETEMPLATEPATH_TEXT_CHANGED = None # "fileTemplatePathTextChanged"
+<<<<<<< HEAD
 OPTCREATEFAX_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
+=======
+OPTCREATEFAX_ITEM_CHANGED = "optCreateFaxItemChanged"
+>>>>>>> master
 OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
 imageURLImageControl2 = None #"images/ImageControl2"
 imageURLImageControl3 = None #"images/ImageControl3"
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 499cfababe2f..4da4146322c6 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -1,6 +1,7 @@
 from FaxWizardDialog import *
 from CGFaxWizard import *
 from FaxDocument import *
+<<<<<<< HEAD
 from ui.PathSelection import PathSelection
 from common.FileAccess import FileAccess
 from ui.event.UnoDataAware import UnoDataAware
@@ -12,6 +13,21 @@ from common.NoValidPathException import NoValidPathException
 from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
 from com.sun.star.uno import RuntimeException
 from com.sun.star.util import CloseVetoException
+=======
+from ui.PathSelection import *
+from common.FileAccess import *
+from ui.event.UnoDataAware import *
+from ui.event.RadioDataAware import *
+from common.Configuration import *
+from document.OfficeDocument import OfficeDocument
+from text.TextFieldHandler import TextFieldHandler
+from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
+
+from common.NoValidPathException import *
+from com.sun.star.uno import RuntimeException
+from com.sun.star.util import CloseVetoException
+
+>>>>>>> master
 from com.sun.star.view.DocumentZoomType import OPTIMAL
 from com.sun.star.document.UpdateDocMode import FULL_UPDATE
 from com.sun.star.document.MacroExecMode import ALWAYS_EXECUTE
@@ -30,11 +46,19 @@ class FaxWizardDialogImpl(FaxWizardDialog):
     RM_FOOTER = 4
     RM_FINALSETTINGS = 5
 
+<<<<<<< HEAD
     lstBusinessStylePos = None
     lstPrivateStylePos = None
 
     def __init__(self, xmsf):
         super(FaxWizardDialogImpl, self).__init__(xmsf)
+=======
+
+    def __init__(self, xmsf):
+        super(FaxWizardDialogImpl, self).__init__(xmsf)
+        self.mainDA = []
+        self.faxDA = []
+>>>>>>> master
         self.bSaveSuccess = False
         self.filenameChanged = False
         self.UserTemplatePath = ""
@@ -59,7 +83,11 @@ class FaxWizardDialogImpl(FaxWizardDialog):
     def startWizard(self, xMSF, CurPropertyValue):
         self.running = True
         try:
+<<<<<<< HEAD
             #Number of steps on WizardDialog
+=======
+            #Number of steps on WizardDialog:
+>>>>>>> master
             self.nMaxStep = 5
 
             #instatiate The Document Frame for the Preview
@@ -82,18 +110,33 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             #special Control fFrameor setting the save Path:
             self.insertPathSelectionControl()
 
+<<<<<<< HEAD
             self.initializeTemplates(xMSF)
 
+=======
+>>>>>>> master
             #load the last used settings
             #from the registry and apply listeners to the controls:
             self.initConfiguration()
 
+<<<<<<< HEAD
 
             if self.myPathSelection.xSaveTextBox.Text.lower() == "":
                 self.myPathSelection.initializePath()
 
             xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
             self.createWindowPeer(xContainerWindow)
+=======
+            self.initializeTemplates(xMSF)
+
+            #update the dialog UI according to the loaded Configuration
+            self.__updateUI()
+            if self.myPathSelection.xSaveTextBox.Text.lower() == "":
+                self.myPathSelection.initializePath()
+
+            self.xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
+            self.createWindowPeer(self.xContainerWindow)
+>>>>>>> master
 
             #add the Roadmap to the dialog:
             self.insertRoadmap()
@@ -146,8 +189,12 @@ class FaxWizardDialogImpl(FaxWizardDialog):
                 if fileAccess.exists(self.sPath, True):
                     answer = SystemDialog.showMessageBox(
                         self.xMSF, "MessBox", YES_NO + DEF_NO,
+<<<<<<< HEAD
                         self.resources.resOverwriteWarning,
                         self.xUnoDialog.Peer)
+=======
+                        self.resources.resOverwriteWarning, self.xUnoDialog.Peer)
+>>>>>>> master
                     if answer == 3:
                         # user said: no, do not overwrite...
                         endWizard = False
@@ -214,9 +261,32 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 
     def insertRoadmap(self):
         self.addRoadmap()
+<<<<<<< HEAD
         self.insertRoadMapItems(
                 [True, True, True, False, True], self.resources.RoadmapLabels)
 
+=======
+        i = 0
+        i = self.insertRoadmapItem(
+            0, True, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_TYPESTYLE - 1],
+            FaxWizardDialogImpl.RM_TYPESTYLE)
+        i = self.insertRoadmapItem(
+            i, True, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_ELEMENTS - 1],
+            FaxWizardDialogImpl.RM_ELEMENTS)
+        i = self.insertRoadmapItem(
+            i, True, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_SENDERRECEIVER - 1],
+            FaxWizardDialogImpl.RM_SENDERRECEIVER)
+        i = self.insertRoadmapItem(
+            i, False, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_FOOTER - 1], FaxWizardDialogImpl.RM_FOOTER)
+        i = self.insertRoadmapItem(i, True,
+            self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_FINALSETTINGS - 1],
+            FaxWizardDialogImpl.RM_FINALSETTINGS)
+>>>>>>> master
         self.setRoadmapInteractive(True)
         self.setRoadmapComplete(True)
         self.setCurrentRoadmapItemID(1)
@@ -235,6 +305,13 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.myPathSelection.addSelectionListener( \
             self.myPathSelectionListener())
 
+<<<<<<< HEAD
+=======
+    def __updateUI(self):
+        UnoDataAware.updateUIs(self.mainDA)
+        UnoDataAware.updateUIs(self.faxDA)
+
+>>>>>>> master
     def __initializePaths(self):
         try:
             self.sTemplatePath = FileAccess.getOfficePath2(self.xMSF,
@@ -308,6 +385,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             root = Configuration.getConfigurationRoot(self.xMSF,
                 "/org.openoffice.Office.Writer/Wizards/Fax", False)
             self.myConfig.readConfiguration(root, "cp_")
+<<<<<<< HEAD
             RadioDataAware.attachRadioButtons(
                 self.myConfig, "cp_FaxType",
                 (self.optBusinessFax, self.optPrivateFax), True).updateUI()
@@ -368,6 +446,74 @@ class FaxWizardDialogImpl(FaxWizardDialog):
                 "cp_TemplateName", self.txtTemplateName, True).updateUI()
             UnoDataAware.attachEditControl(cgl, "cp_TemplatePath",
                 self.myPathSelection.xSaveTextBox, True).updateUI()
+=======
+            self.mainDA.append(RadioDataAware.attachRadioButtons(
+                self.myConfig, "cp_FaxType",
+                (self.optBusinessFax, self.optPrivateFax), True))
+            self.mainDA.append(UnoDataAware.attachListBox(
+                self.myConfig.cp_BusinessFax, "cp_Style",
+                self.lstBusinessStyle, True))
+            self.mainDA.append(UnoDataAware.attachListBox(
+                self.myConfig.cp_PrivateFax, "cp_Style", self.lstPrivateStyle,
+                True))
+            cgl = self.myConfig.cp_BusinessFax
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintCompanyLogo", self.chkUseLogo, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintSubjectLine", self.chkUseSubject, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintSalutation", self.chkUseSalutation, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintDate", self.chkUseDate, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintCommunicationType", self.chkUseCommunicationType,
+                True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintGreeting", self.chkUseGreeting, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintFooter", self.chkUseFooter, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_Salutation", self.lstSalutation, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_Greeting", self.lstGreeting, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_CommunicationType", self.lstCommunicationType,
+                True))
+            self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+                "cp_SenderAddressType", (self.optSenderDefine, \
+                self.optSenderPlaceholder), True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderCompanyName", self.txtSenderName, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderStreet", self.txtSenderStreet, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderPostCode", self.txtSenderPostCode, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderState", self.txtSenderState, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderCity", self.txtSenderCity, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderFax", self.txtSenderFax, True))
+            self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+                "cp_ReceiverAddressType", (self.optReceiverDatabase,
+                self.optReceiverPlaceholder), True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_Footer", self.txtFooter, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_FooterOnlySecondPage", self.chkFooterNextPages,
+                True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_FooterPageNumbers", self.chkFooterPageNumbers,
+                True))
+            self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+                "cp_CreationType", (self.optCreateFax, self.optMakeChanges),
+                True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_TemplateName", self.txtTemplateName, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_TemplatePath", self.myPathSelection.xSaveTextBox,
+                True))
+>>>>>>> master
         except Exception, exception:
             traceback.print_exc()
 
@@ -388,7 +534,12 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             self.optPrivateFaxItemChanged()
 
     def optBusinessFaxItemChanged(self):
+<<<<<<< HEAD
         FaxWizardDialogImpl.lstPrivateStylePos = None
+=======
+        DataAware.setDataObjects(self.faxDA,
+            self.myConfig.cp_BusinessFax, True)
+>>>>>>> master
         self.setControlProperty("lblBusinessStyle",
             PropertyNames.PROPERTY_ENABLED, True)
         self.setControlProperty("lstBusinessStyle",
@@ -400,6 +551,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.lstBusinessStyleItemChanged()
         self.__enableSenderReceiver()
         self.__setPossibleFooter(True)
+<<<<<<< HEAD
 
     def lstBusinessStyleItemChanged(self):
         selectedItemPos = self.lstBusinessStyle.SelectedItemPos
@@ -413,6 +565,18 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 
     def optPrivateFaxItemChanged(self):
         FaxWizardDialogImpl.lstBusinessStylePos = None
+=======
+    def lstBusinessStyleItemChanged(self):
+        TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
+            self.BusinessFiles[1][self.lstBusinessStyle.SelectedItemPos],
+                False)
+        self.initializeElements()
+        self.setElements()
+
+    def optPrivateFaxItemChanged(self):
+        DataAware.setDataObjects(self.faxDA,
+            self.myConfig.cp_PrivateFax, True)
+>>>>>>> master
         self.setControlProperty("lblBusinessStyle",
             PropertyNames.PROPERTY_ENABLED, False)
         self.setControlProperty("lstBusinessStyle",
@@ -426,6 +590,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.__setPossibleFooter(False)
 
     def lstPrivateStyleItemChanged(self):
+<<<<<<< HEAD
         selectedItemPos = self.lstPrivateStyle.SelectedItemPos
         #avoid to load the same item again
         if FaxWizardDialogImpl.lstPrivateStylePos is not selectedItemPos:
@@ -434,6 +599,13 @@ class FaxWizardDialogImpl(FaxWizardDialog):
                 self.PrivateFiles[1][selectedItemPos], False)
             self.initializeElements()
             self.setElements()
+=======
+        TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
+            self.PrivateFiles[1][self.lstPrivateStyle.SelectedItemPos],
+                False)
+        self.initializeElements()
+        self.setElements()
+>>>>>>> master
 
     def txtTemplateNameTextChanged(self):
         xDocProps = TextDocument.xTextDocument.DocumentProperties
@@ -493,6 +665,23 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.txtSenderCityTextChanged()
         self.txtSenderFaxTextChanged()
 
+<<<<<<< HEAD
+=======
+    def optReceiverPlaceholderItemChanged(self):
+        OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
+            "StarBasic", "macro:#/Template.Correspondence.Placeholder()")
+
+    def optReceiverDatabaseItemChanged(self):
+        OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
+            "StarBasic", "macro:#/Template.Correspondence.Database()")
+
+    def optCreateFaxItemChanged(self):
+        self.bEditTemplate = False
+
+    def optMakeChangesItemChanged(self):
+        self.bEditTemplate = True
+
+>>>>>>> master
     def txtSenderNameTextChanged(self):
         self.myFieldHandler.changeUserFieldContent(
             "Company", self.txtSenderName.Text)
@@ -539,6 +728,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         if self.optReceiverDatabase.State:
             self.optReceiverDatabaseItemChanged()
 
+<<<<<<< HEAD
         elif self.optReceiverPlaceholder.State:
             self.optReceiverPlaceholderItemChanged()
 
@@ -546,6 +736,15 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             self.optCreateFromTemplateItemChanged()
 
         elif self.optMakeChanges.State:
+=======
+        if self.optReceiverPlaceholder.State:
+            self.optReceiverPlaceholderItemChanged()
+
+        if self.optCreateFax.State:
+            self.optCreateFaxItemChanged()
+
+        if self.optMakeChanges.State:
+>>>>>>> master
             self.optMakeChangesItemChanged()
 
     def chkUseLogoItemChanged(self):
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index bbf6921d381f..20c32c38045f 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -1,6 +1,10 @@
 from common.Resource import Resource
 
 class FaxWizardDialogResources(Resource):
+<<<<<<< HEAD
+=======
+    UNIT_NAME = "dbwizres"
+>>>>>>> master
     MODULE_NAME = "dbw"
     RID_FAXWIZARDDIALOG_START = 3200
     RID_FAXWIZARDCOMMUNICATION_START = 3270
diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.py b/wizards/com/sun/star/wizards/letter/LetterDocument.py
index f2603956ceb5..af928c8aab3f 100644
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.py
+++ b/wizards/com/sun/star/wizards/letter/LetterDocument.py
@@ -202,7 +202,6 @@ class BusinessPaperObject(object):
             Helper.setUnoPropertyValue(
                 self.xFrame,
                 "Print", False)
-
             xTextCursor = \
                 TextDocument.xTextDocument.Text.createTextCursor()
             xTextCursor.gotoEnd(True)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 8f740cdf1540..76d4f8e79969 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -1067,8 +1067,7 @@ class LetterWizardDialog(WizardDialog):
                 "lblFinalExplanation2", 104, 145, 6, 54, 199))
         self.insertImage(
             "ImageControl2",
-            (
-            "Border", PropertyNames.PROPERTY_HEIGHT,
+            ("Border", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_IMAGEURL,
                 PropertyNames.PROPERTY_NAME,
                 PropertyNames.PROPERTY_POSITION_X,
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index 5324e1c37938..12474e34c343 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -1,6 +1,7 @@
 from common.Resource import Resource
 
 class LetterWizardDialogResources(Resource):
+
     MODULE_NAME = "dbw"
     RID_LETTERWIZARDDIALOG_START = 3000
     RID_LETTERWIZARDGREETING_START = 3080
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 ca7b24941335..000000000000
--- a/wizards/com/sun/star/wizards/report/makefile.mk
+++ /dev/null
@@ -1,75 +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
-
-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/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py
index cebb8d6c6ece..df7c0e76aafa 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -218,6 +218,7 @@ class TextDocument(object):
             year = time.strftime("%Y", now)
             month = time.strftime("%m", now)
             day = time.strftime("%d", now)
+
             dateObject = dateTimeObject(int(year), int(month), int(day))
             du = Helper.DateUtils(self.xMSF, TextDocument.xTextDocument)
             ff = du.getFormat(DATE_SYS_DDMMYY)
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
index 7de9d8b04410..45b6249a942f 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@ -202,7 +202,6 @@ class UnoDialog2(UnoDialog):
             sName, sPropNames, oPropValues)
         return oLine
 
-
     def insertLabel(self, sName, sPropNames, oPropValues):
         oFixedText = self.insertControlModel(
             "com.sun.star.awt.UnoControlFixedTextModel",
@@ -238,4 +237,3 @@ class UnoDialog2(UnoDialog):
         return SystemDialog.showMessageBox(
             xMSF, self.xControl.Peer,
             windowServiceName, windowAttribute, MessageText)
-
diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.py b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
index 9da4ec4a4e0d..c94ae418036c 100644
--- a/wizards/com/sun/star/wizards/ui/event/CommonListener.py
+++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
@@ -61,7 +61,6 @@ class ItemListenerProcAdapter( unohelper.Base, XItemListener ):
             except:
                 apply( self.oProcToCall, (oItemEvent,) + self.tParams )
 
-
 from com.sun.star.awt import XTextListener
 class TextListenerProcAdapter( unohelper.Base, XTextListener ):
     def __init__( self, oProcToCall, tParams=() ):
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.py b/wizards/com/sun/star/wizards/ui/event/DataAware.py
index 5975dcad9d55..5f4df9585587 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.py
@@ -101,6 +101,7 @@ class DataAware(object):
             self.enableControls(ui)
         except Exception:
             traceback.print_exc()
+
     '''
     given a collection containing DataAware objects,
     calls updateUI() on each memebr of the collection.
diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst
index 09c8333baa47..97a8b05f3901 100644
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@ -1,28 +1,2 @@
 wz      wizards     :    TRANSLATIONS:translations DESKTOP: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 4b00b6ed5b45..e69de29bb2d1 100644
--- a/wizards/prj/d.lst
+++ b/wizards/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-mkdir: %_DEST%\pck
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
- ..\%__SRC%\bin\wzi*.res %_DEST%\bin\wzi*.res
-..\%__SRC%\bin\dbw*.res %_DEST%\bin\dbw*.res
-..\%__SRC%\bin\tpl*.res %_DEST%\bin\tpl*.res
-..\%__SRC%\bin\imp*.res %_DEST%\bin\imp*.res
-..\%__SRC%\bin\wwz*.res %_DEST%\bin\wwz*.res
-..\%__SRC%\bin\eur*.res %_DEST%\bin\eur*.res
-..\%__SRC%\bin\cal*.res %_DEST%\bin\cal*.res
-..\%__SRC%\bin\com*.res %_DEST%\bin\com*.res
-REM ..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\misc\agenda.component %_DEST%\xml\agenda.component
-..\%__SRC%\misc\fax.component %_DEST%\xml\fax.component
-..\%__SRC%\misc\form.component %_DEST%\xml\form.component
-..\%__SRC%\misc\letter.component %_DEST%\xml\letter.component
-..\%__SRC%\misc\query.component %_DEST%\xml\query.component
-..\%__SRC%\misc\report.component %_DEST%\xml\report.component
-..\%__SRC%\misc\table.component %_DEST%\xml\table.component
-..\%__SRC%\misc\web.component %_DEST%\xml\web.component
diff --git a/wizards/source/config/makefile.mk b/wizards/prj/makefile.mk
index 42ec8d468782..d4cf94ec9f4e 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$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/wizards/source/depot/delzip b/wizards/source/depot/delzip
deleted file mode 100644
index 636fda90bfcb..000000000000
--- a/wizards/source/depot/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 2de1252c7e48..9cd6710c67bc 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -71,6 +71,7 @@ Public sCurrSLOVENIAN as String
 Public sCurrCYPRIOT as String
 Public sCurrMALTESE as String
 Public sCurrSLOVAK as String
+Public sCurrESTONIAN as String
 Public sCurrUNKNOWN as String
 Public sCurrSYSUNKNOWN as String
 
@@ -79,7 +80,7 @@ Public sPrgsCONVERTING as String
 Public sPrgsUNPROTECT as String
 Public sInclusiveSubDir as String
 
-Public Const SBCOUNTRYCOUNT = 15
+Public Const SBCOUNTRYCOUNT = 17
 Public CurMimeType as String
 Public CurCellCount as Long
 Public oSheets as Object
@@ -115,8 +116,8 @@ Public CurExtension(2) as String
 Public Currfactor as Double
 Public CurrSymbolList(2) as String
 Public CurrLanguage as String
-Public CurrValue(15,5)
-Public LangIDValue(15,2,2) as String
+Public CurrValue(16,5)
+Public LangIDValue(16,2,2) as String
 Public PreName as String
 Public Separator as String
 Public BitmapDir as String
@@ -195,8 +196,9 @@ Dim LocWorkPath as String
 		sCurrCYPRIOT = GetResText(1513)
 		sCurrMALTESE = GetResText(1514)
 		sCurrSLOVAK = GetResText(1515)
-		sCurrUNKNOWN = GetResText(1516)
-		sCurrSYSUNKNOWN = GetResText(1517)
+		sCurrESTONIAN = GetResText(1516)
+		sCurrUNKNOWN = GetResText(1517)
+		sCurrSYSUNKNOWN = GetResText(1518)
 		.cmdCancel.Label =  sCANCEL
 		.cmdHelp.Label =  sHELP
 		.cmdBack.Label =  GetResText(1002)
@@ -357,6 +359,11 @@ Sub InitializeLanguages()
 	LangIDValue(15,0,1) = &quot;SK&quot;
 	LangIDValue(15,0,2) = &quot;-41B&quot;
 
+&apos; CURRENCIES_ESTONIAN
+       LangIDValue(16,0,0) = &quot;et&quot;
+       LangIDValue(16,0,1) = &quot;ET&quot;
+       LangIDValue(16,0,2) = &quot;-425&quot;
+
 End Sub
 
 
@@ -509,6 +516,15 @@ Dim i as Integer
 	CurrValue(15,4) = &quot;Sk&quot;
 	CurrValue(15,5) = &quot;SKK&quot;
 
+	CurrValue(16,0) = sCurrESTONIAN
+	&apos; real conversion rate
+	CurrValue(16,1) = 15.6466
+	&apos; rounded conversion rate
+	CurrValue(16,2) = 16
+	CurrValue(16,3) = &quot;kr&quot;
+	CurrValue(16,4) = &quot;kr&quot;
+	CurrValue(16,5) = &quot;EEK&quot;
+
 	i = -1
 	CurrSymbolList(0) = &quot;&quot;
 	CurrSymbolList(1) = &quot;&quot;
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 86fd356ed175..274beeaafd83 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -441,11 +441,16 @@ Text [ en-US ] = "Slovak Koruna";
 
 String CURRENCIES + 16
 {
-Text [ en-US ] = "The currency set for the document is not a European currency!";
+Text [ en-US ] = "Estonian Kroon";
 };
 
 String CURRENCIES + 17
 {
+Text [ en-US ] = "The currency set for the document is not a European currency!";
+};
+
+String CURRENCIES + 18
+{
 Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union.";
 };
 
diff --git a/wizards/source/formwizard/makefile.mk b/wizards/source/formwizard/makefile.mk
deleted file mode 100644
index 3a5ec422625f..000000000000
--- 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/importwizard/makefile.mk b/wizards/source/importwizard/makefile.mk
deleted file mode 100644
index 5c7ef4ce916a..000000000000
--- 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 f5c549b878ce..000000000000
--- 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/template/makefile.mk b/wizards/source/template/makefile.mk
deleted file mode 100644
index 82a30d0d25a8..000000000000
--- 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 a5f673b1d3f0..000000000000
--- 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 415e08bf9475..000000000000
--- 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/soffice.lnk b/wizards/util/soffice.lnk
deleted file mode 100644
index f9f1eb297f90..000000000000
--- 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 59a7066d85ff..000000000000
--- 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