summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-04-24 13:10:08 +0200
committerEike Rathke <erack@redhat.com>2018-04-24 13:14:18 +0200
commit16265dcdb21d7cf69c65c2a84f1d21a5d8574dd4 (patch)
treebb8f284a6154dbef4061bd43d13a1acd8c522c88 /sc
parentbfdbc0dee88eff6ce283d40aa494199f024caf6d (diff)
Related: tdf#116274 ignore the one excess cols definition's last column
<cols> ... <col min="5" max="16384" width="31.75" style="3"/> </cols> may be present even if there isn't any content. Apparently used with pageBreakPreview to grey out the area. Change-Id: I6a79f9ec692ec07b02f4b4205ccd0cf3cf9f363f
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/worksheethelper.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 5f7dfeb36426..02566cba911c 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -770,6 +770,13 @@ void WorksheetGlobals::setColumnModel( const ColumnModel& rModel )
// checkCol(). Cater for this oddity.
if (nLastCol == mrMaxApiPos.Col() + 1)
--nLastCol;
+ // Excel may add a column range for the remaining columns (with
+ // <cols><col .../></cols>), even if not used or only used to grey out
+ // columns in page break view. Don't let that trigger overflow warning,
+ // so check for the last possible column. If there really is content in
+ // the range that should be caught anyway.
+ else if (nLastCol == getAddressConverter().getMaxXlsAddress().Col())
+ nLastCol = mrMaxApiPos.Col();
else if( !getAddressConverter().checkCol( nLastCol, true ) )
nLastCol = mrMaxApiPos.Col();
// try to find entry in column model map that is able to merge with the passed model