sc/source/filter/xml/xmlsubti.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 1b1f201b58b392a372ffc9070d41844997a2ec7d Author: Eike Rathke <er...@redhat.com> Date: Mon Jan 21 20:29:33 2013 +0100 it's a column count, so MAXCOLCOUNT instead of MAXCOL Number of repeated column styles were limited to MAXCOL effectively being MAXCOLCOUNT-1 and in an --enable-dbgutil build yielded lots of warnings when importing a document that has a style applied to all including the last column. For example see attachment of fdo#59583 https://bugs.freedesktop.org/attachment.cgi?id=73282 or fdo#59325 https://bugs.freedesktop.org/attachment.cgi?id=73014 Change-Id: I74dbbe3065a46015b0b7c8f61d58690a1c08c855 diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 1950e3c..c9f46b1 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -220,8 +220,8 @@ void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCell { rImport.GetStylesImportHelper()->AddColumnStyle(rCellStyleName, nCurrentColCount, nRepeat); nCurrentColCount += nRepeat; - SAL_WARN_IF(nCurrentColCount > MAXCOL, "sc", "more columns than fit into SCCOL"); - nCurrentColCount = std::min<sal_Int32>( nCurrentColCount, MAXCOL ); + SAL_WARN_IF(nCurrentColCount > MAXCOLCOUNT, "sc", "more columns than fit into SCCOL"); + nCurrentColCount = std::min<sal_Int32>( nCurrentColCount, MAXCOLCOUNT ); } uno::Reference< drawing::XDrawPage > ScMyTables::GetCurrentXDrawPage() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits