[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Markus Mohrhard]

 sc/source/filter/excel/xetable.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 462f94c2b93a65e5388e2935baaeeac165679a14
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 25 12:29:02 2012 +0200

    only export the supported number of rows/columns, fdo#49582
    
    Change-Id: I51fc4d0a6d9cc09c82268351ad069467bf8acc31

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 5656b71..150c730 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2210,6 +2210,12 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
     SCROW nLastUsedScRow;
     rDoc.GetFormattedAndUsedArea( nScTab, nLastUsedScCol, nLastUsedScRow );
 
+    if(nLastUsedScCol > nMaxScCol)
+        nLastUsedScCol = nMaxScCol;
+
+    if(nLastUsedScRow > nMaxScRow)
+        nLastUsedScRow = nMaxScRow;
+
     ScRange aUsedRange( 0, 0, nScTab, nLastUsedScCol, nLastUsedScRow, nScTab );
     GetAddressConverter().ValidateRange( aUsedRange, true );
     nLastUsedScCol = aUsedRange.aEnd.Col();