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

6 files changed, 196 insertions, 0 deletions

diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch
new file mode 100644
index 000000000000..1d8b805ceaa8
--- /dev/null
+++ b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch
@@ -0,0 +1,16 @@
+diff -purN misc/description.xml misc/build/description.xml
+--- misc/description.xml	2009-02-03 00:07:30.000000000 +0100
++++ misc/build/description.xml	2010-03-05 21:38:48.000000000 +0100
+@@ -5,12 +5,4 @@
+  xmlns:xlink="http://www.w3.org/1999/xlink">

+ 	<identifier value="nl.nouenoff.ct2n"/>

+ 	<version value="1.3.2"/>

+-	<!-- <dependencies>

+-

+-	</dependencies> -->

+-	<registration>

+-		<simple-license  accept-by="admin" default-license-id="ID0" suppress-on-update="true" >

+-			<license-text xlink:href="registration/COPYING" lang="en" license-id="ID0" />

+-		</simple-license>

+-	</registration>

+ </description>

diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
new file mode 100644
index 000000000000..e764b55e3b8b
--- /dev/null
+++ b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
@@ -0,0 +1,104 @@
+diff -purN misc/Office/UI/BaseWindowState.xcu misc/build/Office/UI/BaseWindowState.xcu
+--- misc/Office/UI/BaseWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/BaseWindowState.xcu	2010-03-05 21:36:37.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

+diff -purN misc/Office/UI/BasicIDEWindowState.xcu misc/build/Office/UI/BasicIDEWindowState.xcu
+--- misc/Office/UI/BasicIDEWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/BasicIDEWindowState.xcu	2010-03-05 21:36:46.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

+diff -purN misc/Office/UI/CalcWindowState.xcu misc/build/Office/UI/CalcWindowState.xcu
+--- misc/Office/UI/CalcWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/CalcWindowState.xcu	2010-03-05 21:36:32.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

+diff -purN misc/Office/UI/DrawWindowState.xcu misc/build/Office/UI/DrawWindowState.xcu
+--- misc/Office/UI/DrawWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/DrawWindowState.xcu	2010-03-05 21:36:54.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

+diff -purN misc/Office/UI/ImpressWindowState.xcu misc/build/Office/UI/ImpressWindowState.xcu
+--- misc/Office/UI/ImpressWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/ImpressWindowState.xcu	2010-03-05 21:36:59.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

+diff -purN misc/Office/UI/MathWindowState.xcu misc/build/Office/UI/MathWindowState.xcu
+--- misc/Office/UI/MathWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/MathWindowState.xcu	2010-03-05 21:37:03.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

+diff -purN misc/Office/UI/StartModuleWindowState.xcu misc/build/Office/UI/StartModuleWindowState.xcu
+--- misc/Office/UI/StartModuleWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/StartModuleWindowState.xcu	2010-03-05 21:37:09.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

+diff -purN misc/Office/UI/WriterWindowState.xcu misc/build/Office/UI/WriterWindowState.xcu
+--- misc/Office/UI/WriterWindowState.xcu	2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/WriterWindowState.xcu	2010-03-05 21:37:17.000000000 +0100
+@@ -9,6 +9,9 @@
+ 				<prop oor:name="UIName" oor:type="xs:string">

+ 					<value>CT2N</value>

+ 				</prop>

++				<prop oor:name="Visible" oor:type="xs:boolean">

++					<value>false</value>

++				</prop>

+ 			</node>

+ 		</node>

+ 	</node>

diff --git a/ct2n/delzip b/ct2n/delzip
new file mode 100644
index 000000000000..00d6fa1d41c7
--- /dev/null
+++ b/ct2n/delzip
@@ -0,0 +1,2 @@
+*.orig
+so_*_ct2n
diff --git a/ct2n/makefile.mk b/ct2n/makefile.mk
new file mode 100644
index 000000000000..62e70521d3f2
--- /dev/null
+++ b/ct2n/makefile.mk
@@ -0,0 +1,70 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.10 $
+#
+# 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=ct2n
+TARGET=ct2n
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_MD5=451ccf439a36a568653b024534669971
+TARFILE_NAME=ConvertTextToNumber-1.3.2
+TARFILE_ROOTDIR=.
+BUILD_DIR=.
+
+PATCH_FILES=\
+    ConvertTextToNumber-1.3.2-no-license.patch \
+    ConvertTextToNumber-1.3.2-no-visible-by-default.patch
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+CONFIGURE_FLAGS=
+BUILD_ACTION=
+
+ZIP1TARGET=ConvertTextToNumber
+ZIP1EXT=.oxt
+ZIP1FLAGS=-u -r
+ZIP1DIR=$(MISC)/build$/$(TARFILE_ROOTDIR)
+ZIP1LIST= * -x "*.orig" -x "so_*_ct2n"
+ZIP1DEPS=$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : tg_ext.mk
+.INCLUDE : target.mk
+
+ZIP1TARGET : $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
new file mode 100644
index 000000000000..714d9265d372
--- /dev/null
+++ b/ct2n/prj/build.lst
@@ -0,0 +1,3 @@
+ct2n	ct2n	:	solenv NULL
+ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
+ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
diff --git a/ct2n/prj/d.lst b/ct2n/prj/d.lst
new file mode 100644
index 000000000000..bb394d57baef
--- /dev/null
+++ b/ct2n/prj/d.lst
@@ -0,0 +1 @@
+..\%__SRC%\bin\ConvertTextToNumber*.oxt %_DEST%\bin\*