From 1f87318abb50e164aa4125747493c5ee02e8687c Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 18 Jan 2017 15:52:33 +0300 Subject: tdf#77111 odt import: treat PAGEDESC_PAGENUMOFFSET==0 as auto Ever since 2010 commit 7edaf190 zeroes have been saved as XML_AUTO. Ever since 2014 commit c2ccd20c, a numoffset of zero is no longer considered to be auto (for MS compatibility) but is still treated as auto during xml export. Thus, any older documents that had been saved with a zero should still xml import as auto instead of as 0. Change-Id: I1a0df32a8e2f1b30b2bedbf4c9bb07ebec239637 Reviewed-on: https://gerrit.libreoffice.org/33267 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: Michael Stahl (cherry picked from commit e36f0860f00af139a8fa94d36302f7b0c56383fe) Reviewed-on: https://gerrit.libreoffice.org/34695 --- sw/source/filter/xml/xmlimpit.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index ed7fb7c295a5..8125c1974b99 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -787,7 +787,7 @@ bool SvXMLImportItemMapper::PutXMLValue( sal_Int32 nVal; bOk = ::sax::Converter::convertNumber( nVal, rValue, 0, USHRT_MAX); - if( bOk ) + if( bOk && nVal > 0 ) rPageDesc.SetNumOffset( (sal_uInt16)nVal ); } } -- cgit v1.2.3