summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-10-17 08:40:10 +0000
committerOliver Bolte <obo@openoffice.org>2008-10-17 08:40:10 +0000
commitefe43f410923315b95621631c1deee884df75f14 (patch)
treebf2f83ccef977988e007cd1270bf023825594699
parentb53de6317f9149fac0d4420929adb8c9d36cbb74 (diff)
CWS-TOOLING: integrate CWS aw057
-rwxr-xr-xsdext/source/pdfimport/test/tests.cxx10
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx10
2 files changed, 10 insertions, 10 deletions
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 845d08f..27dd9e7 100755
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -8,7 +8,7 @@
*
* $RCSfile: tests.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.2.6.1 $
*
* This file is part of OpenOffice.org.
*
@@ -346,8 +346,8 @@ namespace
basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
- if( aCurClip.count() )
- aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false );
+ if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
+ aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip;
}
@@ -357,8 +357,8 @@ namespace
basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
- if( aCurClip.count() )
- aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false );
+ if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
+ aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip;
}
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index b2306e9..ba64378 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -8,7 +8,7 @@
*
* $RCSfile: pdfiprocessor.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.3.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -667,8 +667,8 @@ void PDFIProcessor::intersectClip(const uno::Reference< rendering::XPolyPolygon2
aNewClip.transform(getCurrentContext().Transformation);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
- if( aCurClip.count() )
- aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false, false );
+ if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
+ aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip;
}
@@ -680,8 +680,8 @@ void PDFIProcessor::intersectEoClip(const uno::Reference< rendering::XPolyPolygo
aNewClip.transform(getCurrentContext().Transformation);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
- if( aCurClip.count() )
- aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, false, false );
+ if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false)
+ aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false );
getCurrentContext().Clip = aNewClip;
}