[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 6 03:41:32 PST 2012


 oox/source/xls/addressconverter.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6968966d5f8506c14626cbd1fcfaafcbd68593f5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Oct 11 14:32:49 2012 +0200

    kill this hard coded sheet limit for xlsx import, rhbz#864858
    
    (cherry picked from commit 458d68fffa883bc706638299e5a5b2d1399beb0d)
    
    Conflicts:
    
    	sc/source/filter/oox/addressconverter.cxx
    
    Backported change of sc/source/filter/oox/addressconverter.cxx to
    oox/source/xls/addressconverter.cxx, it's just another hard coded value
    here in 3-5, but ...
    
    Change-Id: I8fe6523afb11e5b24b8c83784e1198e8c694922a
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/oox/source/xls/addressconverter.cxx b/oox/source/xls/addressconverter.cxx
index fd7217a..d6e2a38 100644
--- a/oox/source/xls/addressconverter.cxx
+++ b/oox/source/xls/addressconverter.cxx
@@ -58,7 +58,8 @@ using ::rtl::OUStringToOString;
 namespace {
 
 //! TODO: this limit may change, is there a way to obtain it via API?
-const sal_Int16 API_MAXTAB          = 255;
+//! same value as MAXTAB in sc/inc/address.hxx
+const sal_Int16 API_MAXTAB          = 9999;
 
 const sal_Int32 OOX_MAXCOL          = static_cast< sal_Int32 >( (1 << 14) - 1 );
 const sal_Int32 OOX_MAXROW          = static_cast< sal_Int32 >( (1 << 20) - 1 );


More information about the Libreoffice-commits mailing list