summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-01-18 15:52:33 +0300
committerMichael Stahl <mstahl@redhat.com>2017-02-27 21:55:28 +0000
commit1f87318abb50e164aa4125747493c5ee02e8687c (patch)
tree099412063e2fee8fff95304c15926982e79ab200
parent0863aae1ad6ee4065958873b055816833e49a702 (diff)
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 <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e36f0860f00af139a8fa94d36302f7b0c56383fe) Reviewed-on: https://gerrit.libreoffice.org/34695
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx2
1 files changed, 1 insertions, 1 deletions
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 );
}
}