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

4 files changed, 89 insertions, 0 deletions

diff --git a/libwpd/libwpd-0.9.2.patch b/libwpd/libwpd-0.9.2.patch
new file mode 100644
index 000000000000..2fc70745354b
--- /dev/null
+++ b/libwpd/libwpd-0.9.2.patch
@@ -0,0 +1,14 @@
+--- misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
++++ misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
+@@ -1229,7 +1229,11 @@
+ 		tempString.sprintf("0.0000");
+ 	else
+ 		tempString.sprintf("%.4f", value);
++#ifndef __ANDROID__
+ 	std::string decimalPoint(localeconv()->decimal_point);
++#else
++	std::string decimalPoint(".");
++#endif
+ 	if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+ 		return tempString;
+ 	std::string stringValue(tempString.cstr());
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
new file mode 100644
index 000000000000..8761bbb53e84
--- /dev/null
+++ b/libwpd/makefile.mk
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# 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=wpd
+TARGET=wpd
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+@all:
+    @echo "Using system libwpd..."
+.ENDIF
+
+TARFILE_NAME=libwpd-0.9.2
+TARFILE_MD5=8d265a592619166f29c4672ea54812b7
+
+PATCH_FILES=$(TARFILE_NAME).patch
+
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+BUILD_DIR=src$/lib
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE :	target.mk
+.INCLUDE :	tg_ext.mk
+
diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst
new file mode 100644
index 000000000000..1da425b02ab3
--- /dev/null
+++ b/libwpd/prj/build.lst
@@ -0,0 +1,3 @@
+lw	libwpd	: soltools NULL
+lw	libwpd	usr1	-	all	lw_mkout NULL
+lw	libwpd	nmake	-	all	lw_libwpd NULL
diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst
new file mode 100644
index 000000000000..f891f3b94f3d
--- /dev/null
+++ b/libwpd/prj/d.lst
@@ -0,0 +1,15 @@
+mkdir: %_DEST%\inc\libwpd
+mkdir: %_DEST%\inc\libwpd-stream
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib