You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2026/10/23 20:12:22 UTC
(openoffice) 03/04: xmloff: don't write draw:fill* on page layouts in default mode
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch odf-devel
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit db0824548179b48e137705599aba6a8a0bb5828e
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Fri Oct 23 16:12:11 2026 -0400
xmloff: don't write draw:fill* on page layouts in default mode
Header and footer fills are still written.
---
main/xmloff/source/style/PageMasterExportPropMapper.cxx | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/main/xmloff/source/style/PageMasterExportPropMapper.cxx b/main/xmloff/source/style/PageMasterExportPropMapper.cxx
index d5dce1806f..dadb5195f3 100644
--- a/main/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/main/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -553,6 +553,18 @@ void XMLPageMasterExportPropMapper::ContextFilter(
lcl_RemoveState(pPMFooterGraphicUrl);
}
+ // ext output writes the page fill as the drawing page style of the master page instead
+ if( SvtSaveOptions().GetODFDefaultVersion() == SvtSaveOptions::ODFVER_LATEST )
+ {
+ for( ::std::vector< XMLPropertyState >::iterator aIter = rPropState.begin(); aIter != rPropState.end(); ++aIter )
+ {
+ if( aIter->mnIndex != -1 &&
+ ( aPropMapper->GetEntryType( aIter->mnIndex ) & XML_TYPE_PROP_MASK ) == XML_TYPE_PROP_PAGE_LAYOUT &&
+ aPropMapper->GetEntryAPIName( aIter->mnIndex ).matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "Fill" ) ) )
+ lcl_RemoveState( &(*aIter) );
+ }
+ }
+
if( pPMGridBaseWidth && pPMStandardMode )
lcl_RemoveState(pPMStandardMode);