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

3 files changed, 41 insertions, 50 deletions

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/prj/makefile.mk b/wizards/prj/makefile.mk
new file mode 100644
index 000000000000..d4cf94ec9f4e
--- /dev/null
+++ b/wizards/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog