INTEGRATION: CWS swqbf35 (1.13.134); FILE MERGED

2005/09/22 12:27:00 fme 1.13.134.2: RESYNC: (1.13-1.14); FILE MERGED
2005/08/09 07:03:10 od 1.13.134.1: #i52904# class <SwObjPositioningInProgress>
	 - consider nested usage of this class

1 files changed, 16 insertions, 4 deletions

diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 62303c737488..364843a19bdb 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: anchoredobject.hxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 01:32:40 $
+ *  last change: $Author: hr $ $Date: 2005-09-28 11:02:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -145,7 +145,11 @@ class SwAnchoredObject
             @author OD
         */
         friend class SwObjPositioningInProgress;
-        void SetPositioningInProgress( const bool _bPosInProgress );
+        inline void SetPositioningInProgress( const bool _bPosInProgress )
+        {
+            mbPositioningInProgress = _bPosInProgress;
+        }
+
 
         /** check anchor character rectangle
 
@@ -357,7 +361,10 @@ class SwAnchoredObject
 
             @author OD
         */
-        bool IsPositioningInProgress() const;
+        inline bool IsPositioningInProgress() const
+        {
+            return mbPositioningInProgress;
+        }
 
         /** method to determine, if invalidation of position is allowed
 
@@ -600,6 +607,11 @@ class SwObjPositioningInProgress
 {
     private:
         SwAnchoredObject* mpAnchoredObj;
+        // --> OD 2005-08-09 #i52904# - introduce boolean indicating old state
+        // of anchored object regarding positioning in progress in order to
+        // consider nested usage of class <SwObjPositioningInProgress>
+        bool mbOldObjPositioningInProgress;
+        // <--
 
     public:
         SwObjPositioningInProgress( SdrObject& _rSdrObj );