[Libreoffice-commits] core.git: xmloff/source

[Michael Stahl]

 xmloff/source/xforms/XFormsSubmissionContext.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 974d48b9b8d12eecbe83a5a741c6ac729794309f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Apr 28 21:51:59 2017 +0200

    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 88fb3e374abd..c335197004a6 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 )
 {