[libreoffice] 01/01: fix --enable-mergelibs build (patch from master)...

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 798da5555b568a925bde54a11b8ecbdf502fedc6
Author: Rene Engelhard <rene at debian.org>
Date:   Tue May 2 18:38:46 2017 +0200

    fix --enable-mergelibs build (patch from master)...
---
 patches/fix-enable-mergelibs-build.diff | 35 +++++++++++++++++++++++++++++++++
 patches/series                          |  1 +
 2 files changed, 36 insertions(+)

diff --git a/patches/fix-enable-mergelibs-build.diff b/patches/fix-enable-mergelibs-build.diff
new file mode 100644
index 0000000..42eaa83
--- /dev/null
+++ b/patches/fix-enable-mergelibs-build.diff
@@ -0,0 +1,35 @@
+From 974d48b9b8d12eecbe83a5a741c6ac729794309f Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl at redhat.com>
+Date: Fri, 28 Apr 2017 21:51:59 +0200
+Subject: xmloff: fix --enable-mergedlibs build
+
+multiple definition of `toBool(rtl::OUString const&)' since
+commit 836c9bbb6486e9c0c81de9d7534b934699131d3d
+
+Change-Id: I6a3e6a4e8a2af3c37f925cbdd684b8a99c088b1c
+
+diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
+index 88fb3e3..c335197 100644
+--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
++++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
+@@ -78,6 +78,8 @@ XFormsSubmissionContext::XFormsSubmissionContext(
+     xModel->getSubmissions()->insert( makeAny( mxSubmission ) );
+ }
+ 
++namespace {
++
+ Any toBool( const OUString& rValue )
+ {
+     Any aValue;
+@@ -89,6 +91,8 @@ Any toBool( const OUString& rValue )
+     return aValue;
+ }
+ 
++} // namespace
++
+ void XFormsSubmissionContext::HandleAttribute( sal_uInt16 nToken,
+                                                const OUString& rValue )
+ {
+-- 
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 8cc6bee..f2e945f 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ no-packagekit-per-default.diff
 system-officeotron-and-odfvalidator.diff
 no-openssl.diff
 fix-disable-pdfium-build.diff
+fix-enable-mergelibs-build.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git