Kaydet (Commit) d36b69ef authored tarafından Oliver Bolte's avatar Oliver Bolte

CWS-TOOLING: integrate CWS aw057

üst c9f7608a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* $RCSfile: tests.cxx,v $ * $RCSfile: tests.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.2.6.1 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -346,8 +346,8 @@ namespace ...@@ -346,8 +346,8 @@ namespace
basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
if( aCurClip.count() ) if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false ); aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip; getCurrentContext().Clip = aNewClip;
} }
...@@ -357,8 +357,8 @@ namespace ...@@ -357,8 +357,8 @@ namespace
basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
if( aCurClip.count() ) if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false ); aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip; getCurrentContext().Clip = aNewClip;
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* $RCSfile: pdfiprocessor.cxx,v $ * $RCSfile: pdfiprocessor.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.3.4.1 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -667,8 +667,8 @@ void PDFIProcessor::intersectClip(const uno::Reference< rendering::XPolyPolygon2 ...@@ -667,8 +667,8 @@ void PDFIProcessor::intersectClip(const uno::Reference< rendering::XPolyPolygon2
aNewClip.transform(getCurrentContext().Transformation); aNewClip.transform(getCurrentContext().Transformation);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
if( aCurClip.count() ) if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false, false ); aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip; getCurrentContext().Clip = aNewClip;
} }
...@@ -680,8 +680,8 @@ void PDFIProcessor::intersectEoClip(const uno::Reference< rendering::XPolyPolygo ...@@ -680,8 +680,8 @@ void PDFIProcessor::intersectEoClip(const uno::Reference< rendering::XPolyPolygo
aNewClip.transform(getCurrentContext().Transformation); aNewClip.transform(getCurrentContext().Transformation);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
if( aCurClip.count() ) if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false, false ); aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip; getCurrentContext().Clip = aNewClip;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment