[ooo-build-commit] Branch 'ooo-build-3-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-xls-import-shared-formula-refwrap.diff |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0f4e845a26ee4b5f6b1306cd1927153e7dc97596
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Jul 28 16:22:42 2009 -0400

    Set different grid size for different BIFF versions.
    
    * patches/dev300/calc-xls-import-shared-formula-refwrap.diff:

diff --git a/patches/dev300/calc-xls-import-shared-formula-refwrap.diff b/patches/dev300/calc-xls-import-shared-formula-refwrap.diff
index 3e14ae3..6a7ff88 100644
--- a/patches/dev300/calc-xls-import-shared-formula-refwrap.diff
+++ b/patches/dev300/calc-xls-import-shared-formula-refwrap.diff
@@ -315,12 +315,13 @@ diff --git sc/source/filter/excel/namebuff.cxx sc/source/filter/excel/namebuff.c
 index f007482..3c71823 100644
 --- sc/source/filter/excel/namebuff.cxx
 +++ sc/source/filter/excel/namebuff.cxx
-@@ -127,6 +127,8 @@ void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
+@@ -127,6 +127,9 @@ void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
      DBG_ASSERT( mnCurrIdx <= 0xFFFF, "*ShrfmlaBuffer::Store(): Gleich wird mir schlecht...!" );
  
      ScRangeData* pData = new ScRangeData( pExcRoot->pIR->GetDocPtr(), aName, rToken, rRange.aStart, RT_SHARED );
-+    pData->SetMaxCol(255);
-+    pData->SetMaxRow(65535);
++    const ScAddress& rMaxPos = pExcRoot->pIR->GetMaxPos();
++    pData->SetMaxCol(rMaxPos.Col());
++    pData->SetMaxRow(rMaxPos.Row());
      pData->SetIndex( static_cast< USHORT >( mnCurrIdx ) );
      pExcRoot->pIR->GetNamedRanges().Insert( pData );
      index_hash[rRange.aStart] = static_cast< USHORT >( mnCurrIdx );