diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-07-04 18:27:52 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-10-10 19:56:23 +0200 |
| commit | 19cbdad9ee0fd3a98f01d5d09a647cfc14e6bfd5 (patch) | |
| tree | a30a5974b725eec4be73eeba9dd3cdd170d32b19 /writerfilter | |
| parent | 10fc2022df07b1ee8a29f2ede006b0a720d341cf (diff) | |
tdf#95367 inherit page style if no new one imported
CopyLastHeaderFooter doesn't do much good
if the previous section has blank stylenames.
(usually because of continuous section breaks).
Reviewed-on: https://gerrit.libreoffice.org/26911
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 1127bed4d943036473dbbda6bcfae1ec0a23ed2e)
Change-Id: Ida1e42ab0b650c7c43f06539b3cc058fe5c27919
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index fc0f2d5f30b5..fe5df467e739 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1134,6 +1134,16 @@ throw ( css::beans::UnknownPropertyException, // otherwise apply this section's settings to the new style. // Ensure that FollowPage is inherited first - otherwise GetPageStyle may auto-create a follow when checking FirstPage. SectionPropertyMap* pLastContext = rDM_Impl.GetLastSectionContext(); + if( pLastContext && m_sFirstPageStyleName.isEmpty() ) + m_sFirstPageStyleName = pLastContext->GetPageStyleName( /*bFirst=*/true ); + else + { + HandleMarginsHeaderFooter( /*bFirst=*/true, rDM_Impl ); + GetPageStyle( xPageStyles, xTextFactory, /*bFirst=*/true ); + if( rDM_Impl.IsNewDoc() && m_aFirstPageStyle.is() ) + ApplyProperties_( m_aFirstPageStyle ); + } + if( pLastContext && m_sFollowPageStyleName.isEmpty() ) m_sFollowPageStyleName = pLastContext->GetPageStyleName(); else |