[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/PropertyMap.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bb188a0c09c2e2debbbc0e347f0a9867479c7ee2
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Tue Jan 8 18:37:21 2019 +0300
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 9 17:11:26 2019 +0100

    writerfilter: avoid exception - IsProtect not page style property.
    
    Change-Id: I3e91bc82e5857116f5d94103a7c22ce333e4f89b
    Reviewed-on: https://gerrit.libreoffice.org/65976
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    (cherry picked from commit 93d3ef817af1e07ff8b6ea2e6636358c1762a62a)
    Reviewed-on: https://gerrit.libreoffice.org/65992
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index ff81c20286d5..b52d1da6c253 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1708,7 +1708,9 @@ void SectionPropertyMap::ApplyProperties_( const uno::Reference< beans::XPropert
 
         for ( beans::PropertyValue* pIter = vPropVals.begin(); pIter != vPropVals.end(); ++pIter )
         {
-            if ( pIter != pCharGrabBag && pIter != pParaGrabBag )
+            if ( pIter != pCharGrabBag && pIter != pParaGrabBag
+                 && pIter->Name != "IsProtected" //section-only property
+               )
             {
                 vNames.push_back( pIter->Name );
                 vValues.push_back( pIter->Value );