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

1 files changed, 88 insertions, 0 deletions

diff --git a/xmerge/build.xml b/xmerge/build.xml
new file mode 100644
index 000000000000..5878c1acf0b9
--- /dev/null
+++ b/xmerge/build.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+  Copyright 2000, 2010 Oracle and/or its affiliates.
+
+  OpenOffice.org - a multi-platform office productivity suite
+
+  This file is part of OpenOffice.org.
+
+  OpenOffice.org is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 3
+  only, as published by the Free Software Foundation.
+
+  OpenOffice.org is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License version 3 for more details
+  (a copy is included in the LICENSE file that accompanied this code).
+
+  You should have received a copy of the GNU Lesser General Public License
+  version 3 along with OpenOffice.org.  If not, see
+  <http://www.openoffice.org/license.html>
+  for a copy of the LGPLv3 License.
+
+-->
+<project name="xmerge" default="main" basedir=".">
+
+    <property environment="env"/>
+    <property name="solar.platform" value="${env.COMP_ENV}${env.PROEXT}"/>
+    <property name="out" location="${basedir}/${solar.platform}"/>
+    <property name="solar.jar" location="${env.SOLARVER}/${solar.platform}/bin${env.UPDMINOREXT}"/>
+    <property name="debug" value="yes"/>
+    <property name="optimize" value="no"/>
+
+    <target name="init">
+        <echoproperties prefix="solar"/>
+        <mkdir dir="${out}"/>
+        <mkdir dir="${out}/class"/>
+    </target>
+
+    <target name="xmerge" depends="init">
+        <ant dir="source/xmerge" target="all"/>
+    </target>
+
+    <target name="bridge" depends="xmerge, init">
+        <ant dir="source/bridge" target="all"/>
+    </target>
+
+    <target name="aportisdoc" depends="xmerge, init">
+        <ant dir="source/aportisdoc" target="all"/>
+    </target>
+
+    <target name="pexcel" depends="xmerge, init">
+        <ant dir="source/pexcel" target="all"/>
+    </target>
+
+    <target name="pocketword" depends="xmerge, init">
+        <ant dir="source/pocketword" target="all"/>
+    </target>
+
+    <target name="htmlsoff" depends="init">
+        <ant dir="source/htmlsoff" target="all"/>
+    </target>
+
+    <target name="wordsmith" depends="xmerge">
+        <echo>wordsmith filter is not supported</echo>
+        <ant dir="source/wordsmith" target="all"/>
+    </target>
+
+    <target name="minicalc" depends="xmerge">
+        <echo>minicalc filter is not supported</echo>
+        <ant dir="source/minicalc" target="all"/>
+    </target>
+
+    <target name="util" depends="xmerge, bridge, aportisdoc, pexcel, pocketword, htmlsoff">
+        <ant dir="util" target="all"/>
+    </target>
+
+    <target name="all" depends="xmerge, bridge, aportisdoc, pexcel, pocketword, htmlsoff, util">
+    </target>
+
+    <target name="clean">
+        <delete dir="${out}" />
+    </target>
+
+</project>
+