INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED

2004/06/17 10:21:32 od 1.2.6.3: #i26791# - further adjustments for the unification of the positioning
	   of Writer fly frames and drawing objects.
2004/04/08 09:19:18 od 1.2.6.2: RESYNC: (1.2-1.3); FILE MERGED
2004/04/07 11:59:19 od 1.2.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects

1 files changed, 14 insertions, 7 deletions

diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 6f041fdde720..9998cfb21af4 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tocntntanchoredobjectposition.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-31 15:08:00 $
+ *  last change: $Author: hjs $ $Date: 2004-06-28 13:36:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,10 @@ namespace objectpositioning
         private:
             // calculated data for object position
             const SwLayoutFrm* mpVertPosOrientFrm;
+            // --> OD 2004-06-17 #i26791#
+            // determine offset to frame anchor position according to the
+            // positioning alignments
+            Point maOffsetToFrmAnchorPos;
 
             // data for calculation of position
             bool          mbAnchorToChar;
@@ -96,11 +100,6 @@ namespace objectpositioning
             // the needed type
             SwTxtFrm&       GetAnchorTxtFrm() const;
 
-            // method to cast <SwAnchoredObjectPosition::GetFrmOfObj()> to
-            // the needed type
-            SwFlyAtCntFrm*  GetFlyAtCntFrmOfObj() const;
-
-
         // *********************************************************************
             /** determine frame for horizontal position
 
@@ -137,6 +136,14 @@ namespace objectpositioning
                 @author OD
             */
             const SwLayoutFrm& GetVertPosOrientFrm() const;
+
+            /** determined offset to frame anchor position
+
+                --> OD 2004-06-17 #i26791#
+
+                @author OD
+            */
+            Point GetOffsetToFrmAnchorPos() const;
     };
 };