[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/odt/pass/tdf102018.odt |binary
 sw/source/filter/xml/xmltbli.cxx       |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eab61f66c6cfa4b290c8789a375e6894be054f32
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 29 12:27:23 2017 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 3415764d00044a19568b3a1b5d5382c73a0342c9)
    Reviewed-on: https://gerrit.libreoffice.org/41964
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/qa/core/data/odt/pass/tdf102018.odt b/sw/qa/core/data/odt/pass/tdf102018.odt
new file mode 100644
index 000000000000..d804aec11df0
Binary files /dev/null and b/sw/qa/core/data/odt/pass/tdf102018.odt differ
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;
         }