INTEGRATION: CWS dr58_SRC680 (1.24.188); FILE MERGED

2008/01/14 15:14:19 dr 1.24.188.2: #i84878# shared formulas still broken sometimes
2008/01/10 10:00:25 dr 1.24.188.1: #i84878# clear shared formula buffer for every sheet

1 files changed, 10 insertions, 5 deletions

diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index d04f9dafa8f9..5e525826938a 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: namebuff.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: vg $ $Date: 2007-02-27 12:23:43 $
+ *  last change: $Author: rt $ $Date: 2008-01-29 15:24:45 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -141,9 +141,7 @@ UINT16  nShrCnt;
 size_t ShrfmlaBuffer::ScAddressHashFunc::operator() (const ScAddress &addr) const
 {
     // Use something simple, it is just a hash.
-    return (static_cast <UINT16> (addr.Row()) << 0) |
-           (static_cast <UINT8> (addr.Col()) << 16) |
-           (static_cast <UINT8> (addr.Tab()) << 24);
+    return static_cast< UINT16 >( addr.Row() ) | (static_cast< UINT8 >( addr.Col() ) << 16);
 }
 
 const size_t nBase = 16384; // Range~ und Shared~ Dingens mit jeweils der Haelfte Ids
@@ -160,6 +158,13 @@ ShrfmlaBuffer::~ShrfmlaBuffer()
 {
 }
 
+void ShrfmlaBuffer::Clear()
+{
+    index_hash.clear();
+    // do not clear index_list, index calculation depends on complete list size...
+    // do not change mnCurrIdx
+}
+
 void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
 {
     String          aName( CreateName( rRange.aStart ) );