INTEGRATION: CWS swqbugfixes06 (1.4.8); FILE MERGED

2004/08/30 12:35:29 od 1.4.8.3: RESYNC: (1.4-1.5); FILE MERGED
2004/08/25 14:43:12 od 1.4.8.2: #i3317# class <SwAnchoredObject> - new member and methods to apply
temporarly the 'straightforward positioning process' for the
anchored object.
2004/08/12 14:19:22 od 1.4.8.1: #i28795# - correct comment for method <IsFormatPossible()>

1 files changed, 33 insertions, 3 deletions

diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index f62e6facdae5..6a34dd9fe69e 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: anchoredobject.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2004-08-23 08:00:41 $
+ *  last change: $Author: obo $ $Date: 2004-09-09 10:54:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,6 +144,18 @@ class SwAnchoredObject
         bool mbRestartLayoutProcess;
         // <--
 
+        // --> OD 2004-08-25 #i3317# - boolean, indicating that temporarly
+        // the wrapping style influence of the anchored object has to be
+        // considered during its positioning.
+        // This boolean is used, if compatibility option 'Consider wrapping style
+        // influence on object positioning' is OFF and a positioning loop is
+        // detected in method <SwFlyAtCntFrm::MakeAll()> or method
+        // <SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()>.
+        // The boolean is reset to <false>, when the layout process for a
+        // page frame starts - see class <NotifyLayoutOfPageInProgress>.
+        bool mbTmpConsiderWrapInfluence;
+        // <--
+
         /** method to indicate, that positioning of anchored object is in progress
 
             note: method is implemented empty
@@ -416,12 +428,30 @@ class SwAnchoredObject
         /** method to determine, if a format on the anchored object is possible
 
             OD 2004-07-23 #i28701#
-            A format is possible, if anchored object is in an invisible layer.
+            A format isn't possible, if anchored object is in an invisible layer.
             Note: method is virtual to refine the conditions for the sub-classes.
 
             @author OD
         */
         virtual bool IsFormatPossible() const;
+
+        // --> OD 2004-08-25 #i3317# - accessors to member <mbTmpConsiderWrapInfluence>
+        void SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrapInfluence );
+        bool IsTmpConsiderWrapInfluence() const;
+        // <--
+
+        /** method to determine, if the anchored object is overlapping with a
+            previous column
+
+            OD 2004-08-25 #i3317#
+            overlapping with a previous column means, that the object overlaps
+            with a column, which is a previous one of the column its anchor
+            frame is in.
+            Only applied for at-paragraph and at-character anchored objects.
+
+            @author OD
+        */
+        bool OverlapsPrevColumn() const;
 };
 
 // ============================================================================