diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-29 12:27:23 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-06 10:39:55 +0200 |
| commit | eab61f66c6cfa4b290c8789a375e6894be054f32 (patch) | |
| tree | 06f9015c0bf2d7cb072302a98671a1467b5413c9 | |
| parent | e0ea7df25faeaae9f98ebde32f49eec92603d629 (diff) | |
Resolves: tdf#112018 number-columns-repeated has the data type positiveInteger
Change-Id: I534885fe7a36a8e3ad891a3f5ed50b589f36e3b9
Reviewed-on: https://gerrit.libreoffice.org/41692
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3415764d00044a19568b3a1b5d5382c73a0342c9)
Reviewed-on: https://gerrit.libreoffice.org/41964
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -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 05d0d15f4e35..b44a68cb47ce 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -770,7 +770,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; } |