This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 7ea3231c1199539ab511f16aa91dfc532eb05da8 Author: Jim Jagielski <[email protected]> AuthorDate: Tue Nov 3 09:23:02 2026 -0500 xmloff: write style:layout-grid-snap-to in ODF 1.4 Extended --- main/xmloff/source/style/PageMasterExportPropMapper.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main/xmloff/source/style/PageMasterExportPropMapper.cxx b/main/xmloff/source/style/PageMasterExportPropMapper.cxx index 631096c8e3..f52dfc92ef 100644 --- a/main/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/main/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -536,10 +536,12 @@ void XMLPageMasterExportPropMapper::ContextFilter( lcl_RemoveState(pPMGridSnapTo); } - // ODF 1.2 calls it style:layout-grid-snap-to; the other modes keep the old name, which released versions read + // ODF 1.2 calls it style:layout-grid-snap-to; the other modes keep the old name, which released versions read. + // The ODF 1.4 schema has only the new name, also for 1.4 Extended. if( pPMGridSnapToChars && pPMGridSnapTo ) { - if( SvtSaveOptions::IsODFStrict( SvtSaveOptions().GetODFDefaultVersion() ) ) + const SvtSaveOptions::ODFDefaultVersion eVersion( SvtSaveOptions().GetODFDefaultVersion() ); + if( SvtSaveOptions::IsODFStrict( eVersion ) || eVersion == SvtSaveOptions::ODFVER_014_EXT ) lcl_RemoveState( pPMGridSnapToChars ); else lcl_RemoveState( pPMGridSnapTo );
