diff options
Diffstat (limited to 'drawinglayer/source/processor2d')
6 files changed, 23 insertions, 23 deletions
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index 7d58734363ae..125b154f90b0 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -176,7 +176,7 @@ namespace { if (bClear) { - pRetval->Erase(Rectangle(0, 0, rSizePixel.getWidth(), rSizePixel.getHeight())); + pRetval->Erase(tools::Rectangle(0, 0, rSizePixel.getWidth(), rSizePixel.getHeight())); } } else @@ -258,11 +258,11 @@ namespace drawinglayer { basegfx::B2DRange aRangePixel(rRange); aRangePixel.transform(mrOutDev.GetViewTransformation()); - const Rectangle aRectPixel( + const tools::Rectangle aRectPixel( (sal_Int32)floor(aRangePixel.getMinX()), (sal_Int32)floor(aRangePixel.getMinY()), (sal_Int32)ceil(aRangePixel.getMaxX()), (sal_Int32)ceil(aRangePixel.getMaxY())); const Point aEmptyPoint; - maDestPixel = Rectangle(aEmptyPoint, mrOutDev.GetOutputSizePixel()); + maDestPixel = tools::Rectangle(aEmptyPoint, mrOutDev.GetOutputSizePixel()); maDestPixel.Intersection(aRectPixel); if(isVisible()) diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx index d20eab478d9d..3cc9e887b62e 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx @@ -38,7 +38,7 @@ namespace drawinglayer VclPtr<VirtualDevice> mpContent; VclPtr<VirtualDevice> mpMask; VclPtr<VirtualDevice> mpAlpha; - Rectangle maDestPixel; + tools::Rectangle maDestPixel; public: impBufferDevice( diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index b4d425d8a89b..22e33a74828a 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -236,7 +236,7 @@ namespace drawinglayer { namespace processor2d { - Rectangle VclMetafileProcessor2D::impDumpToMetaFile( + tools::Rectangle VclMetafileProcessor2D::impDumpToMetaFile( const primitive2d::Primitive2DContainer& rContent, GDIMetaFile& o_rContentMetafile) { @@ -248,7 +248,7 @@ namespace drawinglayer // transform primitive range with current transformation (e.g shadow offset) aPrimitiveRange.transform(maCurrentTransformation); - const Rectangle aPrimitiveRectangle( + const tools::Rectangle aPrimitiveRectangle( basegfx::fround(aPrimitiveRange.getMinX()), basegfx::fround(aPrimitiveRange.getMinY()), basegfx::fround(aPrimitiveRange.getMaxX()), basegfx::fround(aPrimitiveRange.getMaxY())); ScopedVclPtrInstance< VirtualDevice > aContentVDev; @@ -803,12 +803,12 @@ namespace drawinglayer const basegfx::B2DRange aCurrentRange( aTranslate.getX(), aTranslate.getY(), aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY()); - const Rectangle aCurrentRect( + const tools::Rectangle aCurrentRect( sal_Int32(floor(aCurrentRange.getMinX())), sal_Int32(floor(aCurrentRange.getMinY())), sal_Int32(ceil(aCurrentRange.getMaxX())), sal_Int32(ceil(aCurrentRange.getMaxY()))); const GraphicAttr& rAttr = rGraphicPrimitive.getGraphicAttr(); // fdo#72530 don't pass empty Rectangle to EndGroup - Rectangle aCropRect(aCurrentRect); + tools::Rectangle aCropRect(aCurrentRect); if(rAttr.IsCropped()) { @@ -841,7 +841,7 @@ namespace drawinglayer aCropRange.expand(aCurrentRange.getMinimum() - basegfx::B2DPoint(rAttr.GetLeftCrop() * fFactorX, rAttr.GetTopCrop() * fFactorY)); aCropRange.expand(aCurrentRange.getMaximum() + basegfx::B2DPoint(rAttr.GetRightCrop() * fFactorX, rAttr.GetBottomCrop() * fFactorY)); - aCropRect = Rectangle( + aCropRect = tools::Rectangle( sal_Int32(floor(aCropRange.getMinX())), sal_Int32(floor(aCropRange.getMinY())), sal_Int32(ceil(aCropRange.getMaxX())), sal_Int32(ceil(aCropRange.getMaxY()))); } @@ -903,7 +903,7 @@ namespace drawinglayer { // still need to fill in the location (is a class Rectangle) const basegfx::B2DRange aRangeLogic(rControlPrimitive.getB2DRange(getViewInformation2D())); - const Rectangle aRectLogic( + const tools::Rectangle aRectLogic( (sal_Int32)floor(aRangeLogic.getMinX()), (sal_Int32)floor(aRangeLogic.getMinY()), (sal_Int32)ceil(aRangeLogic.getMaxX()), (sal_Int32)ceil(aRangeLogic.getMaxY())); pPDFControl->Location = aRectLogic; @@ -1012,7 +1012,7 @@ namespace drawinglayer { // emulate data handling from ImpEditEngine::Paint const basegfx::B2DRange aViewRange(rContent.getB2DRange(getViewInformation2D())); - const Rectangle aRectLogic( + const tools::Rectangle aRectLogic( (sal_Int32)floor(aViewRange.getMinX()), (sal_Int32)floor(aViewRange.getMinY()), (sal_Int32)ceil(aViewRange.getMaxX()), (sal_Int32)ceil(aViewRange.getMaxY())); vcl::PDFExtOutDevBookmarkEntry aBookmark; @@ -1915,7 +1915,7 @@ namespace drawinglayer // various content, create content-metafile GDIMetaFile aContentMetafile; - const Rectangle aPrimitiveRectangle(impDumpToMetaFile(rContent, aContentMetafile)); + const tools::Rectangle aPrimitiveRectangle(impDumpToMetaFile(rContent, aContentMetafile)); // restore mfCurrentUnifiedTransparence; it may have been used // while processing the sub-content in impDumpToMetaFile @@ -1977,7 +1977,7 @@ namespace drawinglayer { // various content, create content-metafile GDIMetaFile aContentMetafile; - const Rectangle aPrimitiveRectangle(impDumpToMetaFile(rContent, aContentMetafile)); + const tools::Rectangle aPrimitiveRectangle(impDumpToMetaFile(rContent, aContentMetafile)); // re-create a VCL-gradient from FillGradientPrimitive2D Gradient aVCLGradient; @@ -2005,10 +2005,10 @@ namespace drawinglayer basegfx::B2DRange aViewRange(rContent.getB2DRange(getViewInformation2D())); aViewRange.transform(maCurrentTransformation); - const Rectangle aRectLogic( + const tools::Rectangle aRectLogic( (sal_Int32)floor(aViewRange.getMinX()), (sal_Int32)floor(aViewRange.getMinY()), (sal_Int32)ceil(aViewRange.getMaxX()), (sal_Int32)ceil(aViewRange.getMaxY())); - const Rectangle aRectPixel(mpOutputDevice->LogicToPixel(aRectLogic)); + const tools::Rectangle aRectPixel(mpOutputDevice->LogicToPixel(aRectLogic)); Size aSizePixel(aRectPixel.GetSize()); const Point aEmptyPoint; ScopedVclPtrInstance< VirtualDevice > aBufferDevice; diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx index 360c0433518e..bbd032dfd94e 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx @@ -35,7 +35,7 @@ // predefines class GDIMetaFile; -class Rectangle; +namespace tools { class Rectangle; } class Gradient; class SvtGraphicFill; class SvtGraphicStroke; @@ -72,7 +72,7 @@ namespace drawinglayer { private: /// local helper(s) - Rectangle impDumpToMetaFile( + tools::Rectangle impDumpToMetaFile( const primitive2d::Primitive2DContainer& rContent, GDIMetaFile& o_rContentMetafile); void impConvertFillGradientAttributeToVCLGradient( diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index a212fb8b4460..a11326e1e76b 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -1203,7 +1203,7 @@ namespace drawinglayer // create rectangle for fill const basegfx::B2DRange& aViewport(getViewInformation2D().getDiscreteViewport()); - const Rectangle aRectangle( + const tools::Rectangle aRectangle( (sal_Int32)floor(aViewport.getMinX()), (sal_Int32)floor(aViewport.getMinY()), (sal_Int32)ceil(aViewport.getMaxX()), (sal_Int32)ceil(aViewport.getMaxY())); mpOutputDevice->DrawRect(aRectangle); diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index f3c6c88ad61c..8bd8e8857e7f 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -530,7 +530,7 @@ namespace drawinglayer // prepare OutDev const Point aEmptyPoint(0, 0); - const Rectangle aVisiblePixel(aEmptyPoint, mpOutputDevice->GetOutputSizePixel()); + const tools::Rectangle aVisiblePixel(aEmptyPoint, mpOutputDevice->GetOutputSizePixel()); const bool bWasEnabled(mpOutputDevice->IsMapModeEnabled()); mpOutputDevice->EnableMapMode(false); @@ -545,7 +545,7 @@ namespace drawinglayer for(sal_Int32 nXPos((nPosY % 2) ? nBLeft - nBWidth + nOffsetX : nBLeft); nXPos < nOLeft + nOWidth; nXPos += nBWidth) { - const Rectangle aOutRectPixel(Point(nXPos, nYPos), aNeededBitmapSizePixel); + const tools::Rectangle aOutRectPixel(Point(nXPos, nYPos), aNeededBitmapSizePixel); if(aOutRectPixel.IsOver(aVisiblePixel)) { @@ -572,7 +572,7 @@ namespace drawinglayer for(sal_Int32 nYPos((nPosX % 2) ? nBTop - nBHeight + nOffsetY : nBTop); nYPos < nOTop + nOHeight; nYPos += nBHeight) { - const Rectangle aOutRectPixel(Point(nXPos, nYPos), aNeededBitmapSizePixel); + const tools::Rectangle aOutRectPixel(Point(nXPos, nYPos), aNeededBitmapSizePixel); if(aOutRectPixel.IsOver(aVisiblePixel)) { @@ -741,7 +741,7 @@ namespace drawinglayer // the inner pixel bounds accordingly (ceil resp. floor). This will also be done for logic // units e.g. when creating a new MetaFile, but since much huger value ranges are used // there typically will be okay for this compromise. - Rectangle aDestRectView( + tools::Rectangle aDestRectView( // !!CAUTION!! Here, ceil and floor are exchanged BY PURPOSE, do NOT copy when // looking for a standard conversion to rectangle (!) (sal_Int32)ceil(aOutlineRange.getMinX()), (sal_Int32)ceil(aOutlineRange.getMinY()), @@ -1269,7 +1269,7 @@ namespace drawinglayer if(!aRange.isEmpty()) { - const Rectangle aRectangle( + const tools::Rectangle aRectangle( (sal_Int32)floor(aRange.getMinX()), (sal_Int32)floor(aRange.getMinY()), (sal_Int32)ceil(aRange.getMaxX()), (sal_Int32)ceil(aRange.getMaxY())); |