Kaydet (Commit) 1b1f201b authored tarafından Eike Rathke's avatar Eike Rathke

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
üst 221ebb71
...@@ -220,8 +220,8 @@ void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCell ...@@ -220,8 +220,8 @@ void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCell
{ {
rImport.GetStylesImportHelper()->AddColumnStyle(rCellStyleName, nCurrentColCount, nRepeat); rImport.GetStylesImportHelper()->AddColumnStyle(rCellStyleName, nCurrentColCount, nRepeat);
nCurrentColCount += nRepeat; nCurrentColCount += nRepeat;
SAL_WARN_IF(nCurrentColCount > MAXCOL, "sc", "more columns than fit into SCCOL"); SAL_WARN_IF(nCurrentColCount > MAXCOLCOUNT, "sc", "more columns than fit into SCCOL");
nCurrentColCount = std::min<sal_Int32>( nCurrentColCount, MAXCOL ); nCurrentColCount = std::min<sal_Int32>( nCurrentColCount, MAXCOLCOUNT );
} }
uno::Reference< drawing::XDrawPage > ScMyTables::GetCurrentXDrawPage() uno::Reference< drawing::XDrawPage > ScMyTables::GetCurrentXDrawPage()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment