From e717d1dcce7f8906311c5ccdbb2326b61a702630 Mon Sep 17 00:00:00 2001
From: Armin Le Grand <alg@apache.org>
Date: Tue, 23 Oct 2012 12:46:28 +0000
Subject: Resolves: #i121237# Rework/Cleanup of Region code...

due to missing complete support for B2DPolygon class

(cherry picked from commit cab10eeb7878edf224a004fd7640bd4adf8d3c51)

Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	svx/source/sdr/overlay/overlaymanagerbuffered.cxx
	svx/source/svdraw/svdpntv.cxx
	vcl/aqua/source/gdi/salgdi.cxx
	vcl/inc/region.h
	vcl/inc/unx/gtk/gtkgdi.hxx
	vcl/inc/vcl/regband.hxx
	vcl/inc/vcl/region.hxx
	vcl/os2/source/gdi/salgdi.cxx
	vcl/source/gdi/bmpacc3.cxx
	vcl/source/gdi/outdev2.cxx
	vcl/source/gdi/outmap.cxx
	vcl/source/gdi/regband.cxx
	vcl/source/gdi/region.cxx
	vcl/source/window/window.cxx
	vcl/unx/generic/gdi/pspgraphics.cxx
	vcl/unx/headless/svpgdi.cxx
	vcl/unx/headless/svppspgraphics.cxx
	vcl/win/source/gdi/salgdi.cxx

Change-Id: Iee9a66ff431c3cecb7603e445147b67715de0f7d

Remove unused variable to prevent compiler warning

(cherry picked from commit 0ac65ccf079e3e22ac23cbe7ae546504c863c31f)

Change-Id: Icbcaa9d576a7e560d96debc7360bdbe9090b3fd3

Wrong comparison with bool corrected

(cherry picked from commit 612cefdcf6176b6bb847ce899d89af40ef313a90)

Change-Id: I1cf5de6734b588f78d8e870ba7b7860634b461ce
---
 vcl/aqua/source/gdi/salgdicommon.cxx | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'vcl/aqua/source')

diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index afedd3b9a339..ad484e28d84f 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -27,7 +27,6 @@
 #include "aqua/salgdi.h"
 
 #include "fontsubset.hxx"
-#include "region.h"
 #include "sft.hxx"
 
 using namespace vcl;
@@ -1444,24 +1443,31 @@ bool AquaSalGraphics::setClipRegion( const Region& i_rClip )
     mxClipPath = CGPathCreateMutable();
 
     // set current path, either as polypolgon or sequence of rectangles
-    if( i_rClip.HasPolyPolygon() )
+    if(i_rClip.HasPolyPolygonOrB2DPolyPolygon())
     {
-        basegfx::B2DPolyPolygon aClip( const_cast<Region&>(i_rClip).ConvertToB2DPolyPolygon() );
+        const basegfx::B2DPolyPolygon aClip(i_rClip.GetAsB2DPolyPolygon());
+
         AddPolyPolygonToPath( mxClipPath, aClip, !getAntiAliasB2DDraw(), false );
     }
     else
     {
-        long nX, nY, nW, nH;
-        ImplRegionInfo aInfo;
-        bool bRegionRect = i_rClip.ImplGetFirstRect(aInfo, nX, nY, nW, nH );
-        while( bRegionRect )
+        RectangleVector aRectangles;
+        i_rClip.GetRegionRectangles(aRectangles);
+
+        for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); aRectIter++)
         {
-            if( nW && nH )
+            const long nW(aRectIter->Right() - aRectIter->Left() + 1); // uses +1 logic in original
+
+            if(nW)
             {
-                CGRect aRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, { static_cast<CGFloat>(nW), static_cast<CGFloat>(nH) } };
-                CGPathAddRect( mxClipPath, NULL, aRect );
+                const long nH(aRectIter->Bottom() - aRectIter->Top() + 1); // uses +1 logic in original
+
+                if(nH)
+                {
+                    CGRect aRect = {{ aRectIter->Left(), aRectIter->Top() }, { nW, nH }};
+                    CGPathAddRect( mxClipPath, NULL, aRect );
+                }
             }
-            bRegionRect = i_rClip.ImplGetNextRect( aInfo, nX, nY, nW, nH );
         }
     }
     // set the current path as clip region
-- 
cgit