diff options
| author | Eike Rathke <erack@redhat.com> | 2013-01-21 20:29:33 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-01-21 20:41:47 +0100 |
| commit | 1b1f201b58b392a372ffc9070d41844997a2ec7d (patch) | |
| tree | 4cfa5a6df5792246f166b5be88c2be58ed0a3368 | |
| parent | 221ebb71ee329e55a8ca8f8d39f88ac01f93329e (diff) | |
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
| -rw-r--r-- | sc/source/filter/xml/xmlsubti.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 1950e3c48d9d..c9f46b11e7ab 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() |