[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - writerfilter/source

[Michael Stahl (via logerrit)]

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

New commits:
commit ebb432874c67c40fca066a9cda926cb0a2a4a63c
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Dec 17 12:12:55 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jan 16 18:08:35 2020 +0100

    tdf#112201 writerfilter: continuous sections:
    
    always replace break with follow-page-style, not first-page-style.
    
    It looks like Word ignores <w:titlePg> on continuous section breaks,
    unless it's the first section, which was already handled by code above.
    
    Change-Id: If7c0fe96a1789f64f1943ece453db3dbc284ca48
    Reviewed-on: https://gerrit.libreoffice.org/85293
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit d7e9daf2d21d3bcafaa6aae4aed6c9df5e0999c4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86912
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 7e63ef0de9db..430389495ff8 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1406,8 +1406,9 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                         if ((xElem->getPropertyValue("BreakType") >>= bt)
                             && bt == style::BreakType_PAGE_BEFORE)
                         {
+                            // tdf#112201: do *not* use m_sFirstPageStyleName here!
                             xElem->setPropertyValue(getPropertyName(PROP_PAGE_DESC_NAME),
-                                    uno::makeAny(aName));
+                                    uno::makeAny(m_sFollowPageStyleName));
                             break;
                         }
                     }