INTEGRATION: CWS swqbf89 (1.30.78); FILE MERGED

2006/11/07 09:33:22 od 1.30.78.1: #130889# new undo class <SwUndoDrawUnGroupConnectToLayout>, because
undo action has to reflect change to action "ungroup of drawing
group objects"

1 files changed, 36 insertions, 2 deletions

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 29d4fa6fd823..2e46131c494f 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: undobj.hxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: hr $ $Date: 2006-08-14 15:36:15 $
+ *  last change: $Author: rt $ $Date: 2006-12-01 14:23:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -65,6 +65,10 @@
 #endif
 #include <svx/svdundo.hxx> // #111827#
 
+// --> OD 2006-11-01 #130889#
+#include <vector>
+// <--
+
 class SwUndoIter;
 class SwHistory;
 class SwIndex;
@@ -1525,6 +1529,18 @@ public:
     void SetGroupFmt( SwDrawFrmFmt* );
 };
 
+// --> OD 2006-11-01 #130889#
+// Action "ungroup drawing object" is now splitted into three parts - see
+// method <SwDoc::UnGroupSelection(..)>:
+// - creation for <SwDrawFrmFmt> instances for the group members of the
+//   selected group objects
+// - intrinsic ungroup of the selected group objects
+// - creation of <SwDrawContact> instances for the former group members and
+//   connection to the Writer layout.
+// Thus, two undo actions (instances of <SwUndo>) are needed:
+// - Existing class <SwUndoDrawUnGroup> takes over the part for the formats.
+// - New class <SwUndoDrawUnGroupConnectToLayout> takes over the part for
+//   contact object.
 class SwUndoDrawUnGroup : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
@@ -1540,6 +1556,24 @@ public:
     void AddObj( USHORT nPos, SwDrawFrmFmt* );
 };
 
+// --> OD 2006-11-01 #130889#
+class SwUndoDrawUnGroupConnectToLayout : public SwUndo
+{
+    private:
+        std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > > aDrawFmtsAndObjs;
+
+    public:
+        SwUndoDrawUnGroupConnectToLayout();
+        virtual ~SwUndoDrawUnGroupConnectToLayout();
+        virtual void Undo( SwUndoIter& );
+        virtual void Redo( SwUndoIter& );
+
+        void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
+                           SdrObject* pDrawObject );
+};
+// <--
+
+
 class SwUndoDrawDelete : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;