From 1524aa18b9ddf7a4181e3f278155c48655084452 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Fri, 13 Feb 2009 10:05:35 +0000
Subject: CWS-TOOLING: integrate CWS sw31bf04 2009-01-21 14:24:10 +0100 od 
 r266670 : #i59051# correction of metric change for PolyPolygonBezier needed
 2009-01-21 09:35:44 +0100 od  r266632 : #i96062# adjustment of fix after
 rebasing 2009-01-21 09:34:56 +0100 od  r266631 : #i94152# adjustment of fix
 after rebasing 2009-01-20 16:43:12 +0100 od  r266596 : CWS-TOOLING: rebase
 CWS sw31bf04 to trunk@266428 (milestone: DEV300:m39) 2009-01-20 11:52:22
 +0100 od  r266561 : #i94152 method <SwDoc::SetOutlineNumRule(..)> 	-
 assure that at outline list style registered text node have the correct list
 level set 2009-01-20 10:43:53 +0100 od  r266556 : #i93399# methods
 <SwNumRule::SetIndent(..)> and <SwNumRule::ChangeIndent(..)> 	 - adjust also
 the list tab position, if a list tab stop is applied 2009-01-16 16:26:56
 +0100 od  r266432 : #i59051# adjust Writer's UNO-API for drawing objects 
  - correct conversion of "StartPosition" and "EndPosition" 	 - conversion
 of "PolyPolygonBezier" 2009-01-16 16:20:49 +0100 od  r266430 : #i59051# -
 adjust UNO-API of connector shape 	 -- convert "PolyPolygonBezier" to
 correct metric 	 -- convert "StartPosition" and "EndPosition" in
 set-method before applying anchor position 	 - adjust UNO-API of measure
 shape 	 -- convert "StartPosition" and "EndPosition" to correct metric
 2009-01-16 15:01:21 +0100 od  r266419 : #i95698# method
 <SwFrm::GetPrevSctLeaf(..)> 	 - only columns as previous section leaves for
 tables inside sections, which are inside another table. 2009-01-14 14:34:58
 +0100 od  r266304 : #i96092# method
 <HandleResetAttrAtTxtNode::~HandleResetAttrAtTxtNode()> 	 - set list
 level to outline level, if needed. 2009-01-13 17:09:43 +0100 od  r266238 :
 #i98037# method <SwWW8ImplReader::IsObjectLayoutInTableCell(..)> 	 -
 adjust evaluation of WW8 attributes 2009-01-13 11:49:48 +0100 od  r266203 :
 #i94187# method <SwTxtFormatter::NewTabPortion(..)> 	 - correct
 consideration of compatibility option TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST
 2009-01-13 11:48:45 +0100 od  r266202 : #i94187# method
 <OutWW8_SwTxtNode(..)> 	 - set list style directly at paragraph only
 in position and space mode LABEL_WIDTH_AND_POSITION 2009-01-12 12:22:58 +0100
 od  r266143 : #i70582# method <SwFlyAtCntFrm::SetAbsPos(..)> and local method
 <lcl_CalcDownDist(..)> 	 - correct determination of anchor's frame top
 for object positioning.

---
 sw/inc/unodraw.hxx | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'sw/inc/unodraw.hxx')

diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index d0d405a99da4..0103e969e8be 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -34,6 +34,9 @@
 #include <calbck.hxx>
 #include <frmfmt.hxx>
 #include <com/sun/star/text/XTextContent.hpp>
+// --> OD 2009-01-13 #i59051#
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
+// <--
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -221,36 +224,25 @@ class SwXShape : public SwXShapeBaseClass,
     */
     void _AdjustPositionProperties( const ::com::sun::star::awt::Point _aPosition );
 
-    /** method to convert start and end position of the drawing object to the
-        Writer specific position, which is the attribute position in layout direction
-
-        OD 2004-10-28 #i36248#
-
-        @author OD
-    */
-    void __ConvertStartEndPosToLayoutDir(
-                                    ::com::sun::star::awt::Point& _rioStartPos,
-                                    ::com::sun::star::awt::Point& _rioEndPos );
-
-    /** method to convert start position of the drawing object to the
+    /** method to convert start or end position of the drawing object to the
         Writer specific position, which is the attribute position in layout direction
 
-        OD 2004-10-28 #i36248#
+        OD 2009-01-12 #i59051#
 
         @author OD
     */
-    ::com::sun::star::awt::Point _ConvertStartPosToLayoutDir(
-                                const ::com::sun::star::awt::Point& _aStartPos );
+    ::com::sun::star::awt::Point _ConvertStartOrEndPosToLayoutDir(
+                            const ::com::sun::star::awt::Point& aStartOrEndPos );
 
-    /** method to convert end position of the drawing object to the
+    /** method to convert PolyPolygonBezier of the drawing object to the
         Writer specific position, which is the attribute position in layout direction
 
-        OD 2004-10-28 #i36248#
+        OD 2009-01-13 #i59051#
 
         @author OD
     */
-    ::com::sun::star::awt::Point _ConvertEndPosToLayoutDir(
-                                const ::com::sun::star::awt::Point& _aEndPos );
+    ::com::sun::star::drawing::PolyPolygonBezierCoords _ConvertPolyPolygonBezierToLayoutDir(
+                    const ::com::sun::star::drawing::PolyPolygonBezierCoords& aPath );
 
     /** method to get property from aggregation object
 
-- 
cgit