INTEGRATION: CWS swqbf52 (1.16.176); FILE MERGED

2006/01/18 13:34:31 od 1.16.176.1: #129959# class <SwDrawContact>
	 - introduce data member for nested <SdrObjUserCall> events in
	   method <_Changed(..)>

1 files changed, 17 insertions, 2 deletions

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index a2dfcc9a22..062351dbce 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dcontact.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 01:39:35 $
+ *  last change: $Author: kz $ $Date: 2006-02-03 17:15:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -404,6 +404,10 @@ bool CheckControlLayer( const SdrObject *pObj );
 //Zeichenobjekte im StarWriter (SwClient) und den Objekten selbst im Drawing
 //(SdrObjUserCall).
 
+// --> OD 2006-01-18 #129959#
+class NestedUserCallHdl;
+// <--
+
 class SwDrawContact : public SwContact
 {
     private:
@@ -423,6 +427,17 @@ class SwDrawContact : public SwContact
         // drawing object supporting drawing objects in headers/footers.
         std::list<SwDrawVirtObj*> maDrawVirtObjs;
 
+        // --> OD 2006-01-18 #129959#
+        // Needed data for handling of nested <SdrObjUserCall> events in
+        // method <_Changed(..)>
+        bool mbUserCallActive;
+        // event type, which is handled for <mpSdrObjHandledByCurrentUserCall>.
+        // Note: value only valid, if <mbUserCallActive> is TRUE.
+        SdrUserCallType meEventTypeOfCurrentUserCall;
+
+        friend class NestedUserCallHdl;
+        // <--
+
         // unary function used by <list> iterator to find a disconnected 'virtual'
         // drawing object
         struct UsedOrUnusedVirtObjPred