INTEGRATION: CWS calcundo (1.3.58); FILE MERGED

2004/07/14 00:13:18 nn 1.3.58.3: RESYNC: (1.3-1.5); FILE MERGED
2004/07/13 18:16:12 nn 1.3.58.2: #i21498# undo for AutoFilter
2004/05/26 13:14:23 nn 1.3.58.1: #106681# handle drawing objects in undo of filter

1 files changed, 30 insertions, 5 deletions

diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 23fe979026b7..7a61db41656b 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: undodat.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-04 14:14:27 $
+ *  last change: $Author: kz $ $Date: 2004-07-23 10:53:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,6 +93,7 @@ class ScRangeName;
 class ScDBData;
 class ScDBCollection;
 class ScDPObject;
+class SdrUndoAction;
 
 //----------------------------------------------------------------------------
 
@@ -257,7 +258,7 @@ private:
 };
 
 
-class ScUndoSubTotals: public ScSimpleUndo
+class ScUndoSubTotals: public ScDBFuncUndo
 {
 public:
                     TYPEINFO();
@@ -287,7 +288,7 @@ private:
 };
 
 
-class ScUndoSort: public ScSimpleUndo
+class ScUndoSort: public ScDBFuncUndo
 {
 public:
                     TYPEINFO();
@@ -315,7 +316,7 @@ private:
 };
 
 
-class ScUndoQuery: public ScSimpleUndo
+class ScUndoQuery: public ScDBFuncUndo
 {
 public:
                     TYPEINFO();
@@ -333,6 +334,7 @@ public:
     virtual String  GetComment() const;
 
 private:
+    SdrUndoAction*  pDrawUndo;
     SCTAB           nTab;
     ScQueryParam    aQueryParam;
     ScDocument*     pUndoDoc;
@@ -345,6 +347,29 @@ private:
 };
 
 
+class ScUndoAutoFilter: public ScDBFuncUndo
+{
+private:
+    String          aDBName;
+    BOOL            bFilterSet;
+
+    void            DoChange( BOOL bUndo );
+
+public:
+                    TYPEINFO();
+                    ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange,
+                            const String& rName, BOOL bSet );
+    virtual         ~ScUndoAutoFilter();
+
+    virtual void    Undo();
+    virtual void    Redo();
+    virtual void    Repeat(SfxRepeatTarget& rTarget);
+    virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+
+    virtual String  GetComment() const;
+};
+
+
 class ScUndoDBData: public ScSimpleUndo
 {
 public: