#i1843# DeleteCol/DeleteRow: correctly reestablish listeners on absolute name references

4 files changed, 23 insertions, 12 deletions

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 2e51d8085ecc..3124ec797e83 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cell.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: er $ $Date: 2001-10-12 12:31:07 $
+ *  last change: $Author: er $ $Date: 2001-10-18 08:56:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,6 +92,11 @@
 // set (in nScriptType) if type has not been determined yet
 #define SC_SCRIPTTYPE_UNKNOWN   0x08
 
+// For StartListeningTo()/EndListeningTo() restricted to absolute/relative names
+#define SC_LISTENING_NAMES_REL  0x01
+#define SC_LISTENING_NAMES_ABS  0x02
+#define SC_LISTENING_EXCEPT     0x04
+
 class ScDocument;
 class EditTextObject;
 class ScMatrix;
@@ -146,10 +151,11 @@ public:
                         // String- oder EditCell
     static ScBaseCell* CreateTextCell( const String& rString, ScDocument* );
 
+    // nOnlyNames may be one or more of SC_LISTENING_NAMES_*
     void            StartListeningTo( ScDocument* pDoc,
-                                      BOOL bOnlyRelNames = FALSE );
+                                      USHORT nOnlyNames = 0 );
     void            EndListeningTo( ScDocument* pDoc,
-                                    BOOL bOnlyRelNames = FALSE,
+                                    USHORT nOnlyNames = 0,
                                     ScTokenArray* pArr = NULL,
                                     ScAddress aPos = ScAddress() );
 
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 541a2dd3fe75..dce1559031d1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: column.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: er $ $Date: 2001-02-13 18:51:12 $
+ *  last change: $Author: er $ $Date: 2001-10-18 08:56:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -417,7 +417,7 @@ public:
     void        EndListening( SfxListener& rLst, USHORT nRow );
     void        MoveListeners( ScBroadcasterList& rSource, USHORT nDestRow );
     void        StartAllListeners();
-    void        StartRelNameListeners();
+    void        StartNameListeners( BOOL bOnlyRelNames );
     void        SetRelNameDirty();
 
     void        CompileDBFormula();
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f181d4a108bb..249687b66380 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: er $ $Date: 2001-09-05 09:41:14 $
+ *  last change: $Author: er $ $Date: 2001-10-18 08:56:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -692,7 +692,7 @@ private:
     void        StartListening( const ScAddress& rAddress, SfxListener* pListener );
     void        EndListening( const ScAddress& rAddress, SfxListener* pListener );
     void        StartAllListeners();
-    void        StartRelNameListeners();
+    void        StartNameListeners( BOOL bOnlyRelNames );
     void        SetRelNameDirty();
 
     USHORT      FillMaxRot( RowInfo* pRowInfo, USHORT nArrCount, USHORT nX1, USHORT nX2,
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index bc3ed8d8dc40..21fa5388e3f0 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: token.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: er $ $Date: 2001-10-12 12:31:07 $
+ *  last change: $Author: er $ $Date: 2001-10-18 08:56:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,6 +171,11 @@ public:
             BOOL                TextEqual( const ScToken& rToken ) const;
             BOOL                Is3DRef() const;    // reference with 3D flag set
 
+    // If token in RPN resulted from resolving a name and contains an absolute
+    // reference. Token must be obtained through ScTokenArray::GetNextReferenceRPN()
+    // or similar.
+            BOOL                IsRPNReferenceAbsName() const;
+
     static  size_t              GetStrLenBytes( xub_StrLen nLen )
                                     { return nLen * sizeof(sal_Unicode); }
     static  size_t              GetStrLenBytes( const String& rStr )