autorecovery: commit resolved merge (after rebase to m71)

2 files changed, 9 insertions, 8 deletions

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 5469010f2745..7a5e81a5512a 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -990,7 +990,8 @@ namespace cairocanvas
                         aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(a));
                         aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex));
 
-                        doPolyPolygonImplementation( aEdge, aOperation,
+                        doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge),
+                                                     aOperation,
                                                      pCairo, pTextures,
                                                      mpSurfaceProvider,
                                                      xPolyPolygon->getFillRule() );
@@ -1187,7 +1188,7 @@ namespace cairocanvas
         cairo_save( mpCairo.get() );
 
         useStates( viewState, renderState, true );
-        doPolyPolygonPath( xPolyPolygon, Fill, &textures );
+        doPolyPolygonPath( xPolyPolygon, Fill, false, &textures );
 
         cairo_restore( mpCairo.get() );
     }
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 1c64506c0f21..47658991e74b 100755
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -89,7 +89,7 @@
 
     #include <d3d9.h>
     #include <d3dx9.h>
-    #include <dxerr9.h>
+//  #include <dxerr9.h>     #i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h
 
     typedef IDirect3DSurface9 surface_type;
 
@@ -97,11 +97,11 @@
 
 #undef DrawText
 
-#ifdef __MINGW32__

-using ::std::max;

-using ::std::min;

-#endif

-

+#ifdef __MINGW32__
+using ::std::max;
+using ::std::min;
+#endif
+
 #include <gdiplus.h>
 
 #ifdef min