[Libreoffice-commits] core.git: sfx2/source sw/source writerfilter/source

Noel Grandin noel.grandin at collabora.co.uk
Thu Sep 21 09:32:22 UTC 2017


 sfx2/source/view/classificationhelper.cxx      |    2 +-
 sw/source/core/edit/edfcol.cxx                 |    4 ++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 33725d5be1b2d4d4c34fa40070fd8e99de600473
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Sep 21 11:29:56 2017 +0200

    attempt to fix android build
    
    Change-Id: Ie3eede03b90db272d70e7cb383c7a69d9db0f2ae

diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 8a0574468c27..3cff7ae172db 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -400,7 +400,7 @@ void SfxClassificationHelper::Impl::parsePolicy()
     m_aIPPartNumbers = xClassificationParser->m_aIPPartNumbers;
 }
 
-bool lcl_containsProperty(const uno::Sequence<beans::Property>& rProperties, const OUString& rName)
+static bool lcl_containsProperty(const uno::Sequence<beans::Property>& rProperties, const OUString& rName)
 {
     return std::find_if(rProperties.begin(), rProperties.end(), [&](const beans::Property& rProperty)
     {
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index b413b0e290ed..2cd631b047f6 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -304,7 +304,7 @@ OUString lcl_getProperty(uno::Reference<beans::XPropertyContainer> const & rxPro
     return xPropertySet->getPropertyValue(rName).get<OUString>();
 }
 
-bool lcl_containsProperty(const uno::Sequence<beans::Property> & rProperties, const OUString& rName)
+static bool lcl_containsProperty(const uno::Sequence<beans::Property> & rProperties, const OUString& rName)
 {
     return std::find_if(rProperties.begin(), rProperties.end(), [&](const beans::Property& rProperty)
     {
@@ -312,7 +312,7 @@ bool lcl_containsProperty(const uno::Sequence<beans::Property> & rProperties, co
     }) != rProperties.end();
 }
 
-void lcl_removeAllProperties(uno::Reference<beans::XPropertyContainer> const & rxPropertyContainer)
+static void lcl_removeAllProperties(uno::Reference<beans::XPropertyContainer> const & rxPropertyContainer)
 {
     uno::Reference<beans::XPropertySet> xPropertySet(rxPropertyContainer, uno::UNO_QUERY);
     uno::Sequence<beans::Property> aProperties = xPropertySet->getPropertySetInfo()->getProperties();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 59ea16061a84..5a177bb58ff2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1897,7 +1897,7 @@ void RTFDocumentImpl::resetAttributes()
     m_aStates.top().aParagraphAttributes.clear();
 }
 
-bool lcl_containsProperty(const uno::Sequence<beans::Property>& rProperties, const OUString& rName)
+static bool lcl_containsProperty(const uno::Sequence<beans::Property>& rProperties, const OUString& rName)
 {
     return std::find_if(rProperties.begin(), rProperties.end(), [&](const beans::Property& rProperty)
     {


More information about the Libreoffice-commits mailing list