CWS-TOOLING: integrate CWS aw057

7 files changed, 31 insertions, 25 deletions

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index da9bc4bb9b..ee59739852 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -345,7 +345,7 @@ class SwDrawVirtObj : public SdrVirtObj
         // All overloaded methods which need to use the offset
         virtual void RecalcBoundRect();
         virtual SdrObject* CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const;
-        virtual ::basegfx::B2DPolyPolygon TakeXorPoly(sal_Bool bDetail) const;
+        virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
         virtual ::basegfx::B2DPolyPolygon TakeContour() const;
         virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
         virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index c47d79a1a3..6156fc9718 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: precompiled_sw.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.222.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -839,7 +839,6 @@
 #include "svx/xmlexchg.hxx"
 #include "svx/xmlgrhlp.hxx"
 #include "svx/xoutbmp.hxx"
-#include "svx/xoutx.hxx"
 #include "svx/xpoly.hxx"
 #include "svx/xtable.hxx"
 #include "svx/xtextit0.hxx"
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 25845fca00..d3565fc009 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2256,7 +2256,7 @@ namespace sdr
                             // get ranges
                             const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(rCandidate.GetObjectContact().getViewInformation2D());
                             const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
-                            basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(aNewSequence, rViewInformation2D));
+                            basegfx::B2DRange aObjectRange(rCandidate.getObjectRange());
 
                             // correct with virtual object's offset
                             aObjectRange.transform(rOffsetMatrix);
@@ -2518,20 +2518,20 @@ SdrObject* SwDrawVirtObj::CheckHit(const Point& rPnt, USHORT nTol, const SetOfBy
     return bRet ? (SdrObject*)this : NULL;
 }
 
-::basegfx::B2DPolyPolygon SwDrawVirtObj::TakeXorPoly(sal_Bool bDetail) const
+basegfx::B2DPolyPolygon SwDrawVirtObj::TakeXorPoly() const
 {
-    ::basegfx::B2DPolyPolygon aRetval(rRefObj.TakeXorPoly(bDetail));
-    ::basegfx::B2DHomMatrix aMatrix;
+    basegfx::B2DPolyPolygon aRetval(rRefObj.TakeXorPoly());
+    basegfx::B2DHomMatrix aMatrix;
     aMatrix.translate(GetOffset().X(), GetOffset().Y());
     aRetval.transform(aMatrix);
 
     return aRetval;
 }
 
-::basegfx::B2DPolyPolygon SwDrawVirtObj::TakeContour() const
+basegfx::B2DPolyPolygon SwDrawVirtObj::TakeContour() const
 {
-    ::basegfx::B2DPolyPolygon aRetval(rRefObj.TakeContour());
-    ::basegfx::B2DHomMatrix aMatrix;
+    basegfx::B2DPolyPolygon aRetval(rRefObj.TakeContour());
+    basegfx::B2DHomMatrix aMatrix;
     aMatrix.translate(GetOffset().X(), GetOffset().Y());
     aRetval.transform(aMatrix);
 
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 2d1410f1aa..d0bcd526e1 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dflyobj.cxx,v $
- * $Revision: 1.27 $
+ * $Revision: 1.27.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -562,7 +562,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& )
 }
 
 
-::basegfx::B2DPolyPolygon SwVirtFlyDrawObj::TakeXorPoly(sal_Bool ) const
+::basegfx::B2DPolyPolygon SwVirtFlyDrawObj::TakeXorPoly() const
 {
     const Rectangle aSourceRectangle(GetFlyFrm()->Frm().SVRect());
     const ::basegfx::B2DRange aSourceRange(aSourceRectangle.Left(), aSourceRectangle.Top(), aSourceRectangle.Right(), aSourceRectangle.Bottom());
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 6b041fef8f..056518576a 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dflyobj.hxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -101,7 +101,7 @@ public:
     virtual const Rectangle& GetLogicRect() const;
     virtual		  void		 SetLogicRect(const Rectangle& rRect);
     virtual		  void		 NbcSetLogicRect(const Rectangle& rRect);
-    virtual ::basegfx::B2DPolyPolygon TakeXorPoly(sal_Bool bDetail) const;
+    virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
     virtual		  void		 NbcMove  (const Size& rSiz);
     virtual		  void		 NbcResize(const Point& rRef, const Fraction& xFact,
                                        const Fraction& yFact);
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 4d72972e75..0794f0aafa 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6622,6 +6622,19 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
         aDev.SetFillColor();
         aDev.SetFont( pOld->GetFont() );
 
+        //Rechteck ggf. ausdehnen, damit die Umrandunge mit aufgezeichnet werden.
+        SwRect aOut( pFly->Frm() );
+        SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFly );
+        const SwBorderAttrs &rAttrs = *aAccess.Get();
+        if ( rAttrs.CalcRightLine() )
+            aOut.SSize().Width() += 2*nPixelSzW;
+        if ( rAttrs.CalcBottomLine() )
+            aOut.SSize().Height()+= 2*nPixelSzH;
+
+        // #i92711# start Pre/PostPaint encapsulation before pOut is changed to the buffering VDev
+        const Region aRepaintRegion(aOut.SVRect());
+        pSh->DLPrePaint2(aRepaintRegion);
+
         Window *pWin = pSh->GetWin();
         USHORT nZoom = pSh->GetViewOptions()->GetZoom();
         ::SetOutDevAndWin( pSh, &aDev, 0, 100 );
@@ -6632,15 +6645,6 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
         pFlyOnlyDraw = pFly;
         pLines = new SwLineRects;
 
-        //Rechteck ggf. ausdehnen, damit die Umrandunge mit aufgezeichnet werden.
-        SwRect aOut( pFly->Frm() );
-        SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFly );
-        const SwBorderAttrs &rAttrs = *aAccess.Get();
-        if ( rAttrs.CalcRightLine() )
-            aOut.SSize().Width() += 2*nPixelSzW;
-        if ( rAttrs.CalcBottomLine() )
-            aOut.SSize().Height()+= 2*nPixelSzH;
-
         // OD 09.12.2002 #103045# - determine page, fly frame is on
         const SwPageFrm* pFlyPage = pFly->FindPageFrm();
         // OD 30.08.2002 #102450#
@@ -6667,6 +6671,9 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
         bFlyMetafile = FALSE;
         ::SetOutDevAndWin( pSh, pOld, pWin, nZoom );
 
+        // #i92711# end Pre/PostPaint encapsulation when pOut is back and content is painted
+           pSh->DLPostPaint2();
+
         aMet.Stop();
         aMet.Move( -pFly->Frm().Left(), -pFly->Frm().Top() );
         aRet = Graphic( aMet );
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 4b18e7f84b..f263deb90c 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: txtfly.cxx,v $
- * $Revision: 1.65 $
+ * $Revision: 1.65.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1797,7 +1797,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
         {
             if( !pObj->ISA( E3dObject ) )
             {
-                aPolyPolygon = pObj->TakeXorPoly( sal_True );
+                aPolyPolygon = pObj->TakeXorPoly();
             }
 
             ::basegfx::B2DPolyPolygon aContourPoly(pObj->TakeContour());