writerfilter/source/dmapper/PropertyMap.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2b8d4903d64557a3f467672ea943202c2cfdf8a2
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Dec 17 12:12:55 2019 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Dec 17 16:10:13 2019 +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.st...@cib.de>
(cherry picked from commit d7e9daf2d21d3bcafaa6aae4aed6c9df5e0999c4)
Reviewed-on: https://gerrit.libreoffice.org/85300
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 66a1eedf9ade..e60312d02bea 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1416,8 +1416,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;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
