Merge branch 'master' into feature/killsdf

Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk

4 files changed, 96 insertions, 1 deletions

diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 1cace5a4207f..f3f146b7f7a2 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -20,6 +20,6 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE.odt,odt/L
 $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.odt,odt/LICENSE.odt))
 $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDITS.odt))
 
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/THIRDPARTYLICENSEREADME.html,html/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html))
 
 # vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/LICENSE.html
index 46fc32f771f0..7753ed92fddc 100644
--- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -5284,6 +5284,48 @@ advertising or publicity pertaining to the software without specific,
 written prior permission. Title to copyright in this software and any
 associated documentation will at all times remain with copyright
 holders.</P>
+<H2 CLASS="western">ODMA header</H2>
+<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">The
+following software may be included in this product: odma.h -
+Definitions, prototypes, etc. for Open Document Managment API (ODMA)
+version 2.0. Use of any of this software is governed by the terms of
+the license below:</P>
+<H3 CLASS="western">OPEN DOCUMENT MANAGEMENT API LICENSE 1.0</H3>
+<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">ODMA
+2.0 SPECIFICATIONS AND SOFTWARE</P>
+<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">Copyright
+© 1994-1998 AIIM International. All Right Reserved.</P>
+<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">LICENSE:</P>
+<UL STYLE="margin-left: 0.25in">
+	<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
+	Redistribution and use in source and binary forms, with or without
+	modifications, are permitted provided that the following conditions
+	are met:</P>
+	<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
+	Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.</P>
+	<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
+	Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.</P>
+	<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
+	Neither the name of AIIM International nor the names of its
+	contributors may be used to endorse or promote products derived from
+	this software without specific prior written permission.</P>
+</UL>
+<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">DISCLAIMER:</P>
+<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">THIS
+SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS
+IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
 <H1 CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12227_1300998327"></A><A NAME="2.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="4.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A>
 GNU Lesser General Public License Version 3</H1>
 <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
index 05e768f32a60..456ce3da79fe 100644
--- a/readlicense_oo/odt/LICENSE.odt
+++ b/readlicense_oo/odt/LICENSE.odt
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index 6acf5b6dc714..8e06f1f25286 100644
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
@@ -5352,6 +5352,59 @@ MathML DTD
    associated documentation will at all times remain with copyright
    holders.
 
+ODMA header
+
+   The following software may be included in this product:
+   odma.h - Definitions, prototypes, etc. for Open Document Managment API
+   (ODMA) version 2.0. Use of any of this software is governed by the terms
+   of the license below:
+
+               OPEN DOCUMENT MANAGEMENT API LICENSE 1.0
+
+                 ODMA 2.0 SPECIFICATIONS AND SOFTWARE
+                 ------------------------------------
+
+               Copyright © 1994-1998 AIIM International
+                           All Right Reserved
+
+LICENSE:
+
+    Redistribution and use in source and binary forms, with or
+    without modifications, are permitted provided that the
+    following conditions are met:
+
+      * Redistributions of source code must retain the above
+        copyright notice, this list of conditions and the
+        following disclaimer.
+
+      * Redistributions in binary form must reproduce the
+        above copyright notice, this list of conditions and
+        the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+
+      * Neither the name of AIIM International nor the names
+        of its contributors may be used to endorse or promote
+        products derived from this software without specific
+        prior written permission.
+
+DISCLAIMER:
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+    CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+
                   GNU Lesser General Public License Version 3
 
    Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>