diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-29 12:27:23 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-29 17:23:24 +0200 |
| commit | dccb73d961799a88f5fd28423808f184db5de985 (patch) | |
| tree | 73b7da47b33b25ca06eeafbca6ceec1978e8558f | |
| parent | d2eb1a06fdd823a985c0e1f58df6c92bcc1f3629 (diff) | |
Resolves: tdf#112018 number-columns-repeated has the data type positiveInteger
Change-Id: I534885fe7a36a8e3ad891a3f5ed50b589f36e3b9
Reviewed-on: https://gerrit.libreoffice.org/41697
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/qa/core/data/odt/pass/tdf102018.odt | bin | 0 -> 2851 bytes | |||
| -rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/core/data/odt/pass/tdf102018.odt b/sw/qa/core/data/odt/pass/tdf102018.odt Binary files differnew file mode 100644 index 000000000000..d804aec11df0 --- /dev/null +++ b/sw/qa/core/data/odt/pass/tdf102018.odt diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index e4d8147515b9..99c015e6fc04 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -753,7 +753,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( if( IsXMLToken( aLocalName, XML_STYLE_NAME ) ) aStyleName = rValue; else if( IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) ) - nColRep = (sal_uInt32)rValue.toInt32(); + nColRep = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) ) aDfltCellStyleName = rValue; } |