summaryrefslogtreecommitdiff
path: root/drawinglayer/source/primitive2d
diff options
context:
space:
mode:
Diffstat (limited to 'drawinglayer/source/primitive2d')
-rw-r--r--drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx16
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx4
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx24
-rw-r--r--drawinglayer/source/primitive2d/textlayoutdevice.cxx4
4 files changed, 24 insertions, 24 deletions
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index 95acd391f4cf..64dd146ec77a 100644
--- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -56,7 +56,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopLeft.Crop(
- Rectangle(Point(0, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
+ tools::Rectangle(Point(0, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopLeft;
@@ -69,7 +69,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTop = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTop.Crop(
- Rectangle(Point((nQuarter * 2) + 1, 0), Size(1, nQuarter)));
+ tools::Rectangle(Point((nQuarter * 2) + 1, 0), Size(1, nQuarter)));
}
return maTop;
@@ -82,7 +82,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopRight.Crop(
- Rectangle(Point((nQuarter * 2) + 2, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
+ tools::Rectangle(Point((nQuarter * 2) + 2, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopRight;
@@ -95,7 +95,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maRight.Crop(
- Rectangle(Point((nQuarter * 3) + 3, (nQuarter * 2) + 1), Size(nQuarter, 1)));
+ tools::Rectangle(Point((nQuarter * 3) + 3, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maRight;
@@ -108,7 +108,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomRight.Crop(
- Rectangle(Point((nQuarter * 2) + 2, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
+ tools::Rectangle(Point((nQuarter * 2) + 2, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomRight;
@@ -121,7 +121,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottom = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottom.Crop(
- Rectangle(Point((nQuarter * 2) + 1, (nQuarter * 3) + 3), Size(1, nQuarter)));
+ tools::Rectangle(Point((nQuarter * 2) + 1, (nQuarter * 3) + 3), Size(1, nQuarter)));
}
return maBottom;
@@ -134,7 +134,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomLeft.Crop(
- Rectangle(Point(0, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
+ tools::Rectangle(Point(0, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomLeft;
@@ -147,7 +147,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maLeft.Crop(
- Rectangle(Point(0, (nQuarter * 2) + 1), Size(nQuarter, 1)));
+ tools::Rectangle(Point(0, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maLeft;
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index c2e574aef8b1..98192700264d 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -237,7 +237,7 @@ namespace drawinglayer
if (aMask.IsEmpty())
{
const Point aEmpty;
- const Rectangle aRect(aEmpty, maVirtualDeviceMask->GetOutputSizePixel());
+ const tools::Rectangle aRect(aEmpty, maVirtualDeviceMask->GetOutputSizePixel());
const Wallpaper aWallpaper(COL_BLACK);
maVirtualDeviceMask->DrawWallpaper(aRect, aWallpaper);
}
@@ -260,7 +260,7 @@ namespace drawinglayer
if (aMask.IsEmpty())
{
- const Rectangle aRect(rAnimBitmap.aPosPix, aContent.GetSizePixel());
+ const tools::Rectangle aRect(rAnimBitmap.aPosPix, aContent.GetSizePixel());
maVirtualDeviceMask->SetFillColor(COL_BLACK);
maVirtualDeviceMask->SetLineColor();
maVirtualDeviceMask->DrawRect(aRect);
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index e22d9a04348a..e07033aa50d5 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -1751,7 +1751,7 @@ namespace
if(rPropertyHolders.Current().getLineOrFillActive())
{
const MetaRectAction* pA = static_cast<const MetaRectAction*>(pAction);
- const Rectangle& rRectangle = pA->GetRect();
+ const tools::Rectangle& rRectangle = pA->GetRect();
if(!rRectangle.IsEmpty())
{
@@ -1778,7 +1778,7 @@ namespace
if(rPropertyHolders.Current().getLineOrFillActive())
{
const MetaRoundRectAction* pA = static_cast<const MetaRoundRectAction*>(pAction);
- const Rectangle& rRectangle = pA->GetRect();
+ const tools::Rectangle& rRectangle = pA->GetRect();
if(!rRectangle.IsEmpty())
{
@@ -1817,7 +1817,7 @@ namespace
if(rPropertyHolders.Current().getLineOrFillActive())
{
const MetaEllipseAction* pA = static_cast<const MetaEllipseAction*>(pAction);
- const Rectangle& rRectangle = pA->GetRect();
+ const tools::Rectangle& rRectangle = pA->GetRect();
if(!rRectangle.IsEmpty())
{
@@ -2073,7 +2073,7 @@ namespace
/** CHECKED, WORKS WELL */
// OSL_FAIL("MetaActionType::TEXTRECT requested (!)");
const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction);
- const Rectangle& rRectangle = pA->GetRect();
+ const tools::Rectangle& rRectangle = pA->GetRect();
const sal_uInt32 nStringLength(pA->GetText().getLength());
if(!rRectangle.IsEmpty() && 0 != nStringLength)
@@ -2157,7 +2157,7 @@ namespace
if(!rBitmap.IsEmpty())
{
Bitmap aCroppedBitmap(rBitmap);
- const Rectangle aCropRectangle(pA->GetSrcPoint(), pA->GetSrcSize());
+ const tools::Rectangle aCropRectangle(pA->GetSrcPoint(), pA->GetSrcSize());
if(!aCropRectangle.IsEmpty())
{
@@ -2199,7 +2199,7 @@ namespace
if(!rBitmapEx.IsEmpty())
{
BitmapEx aCroppedBitmapEx(rBitmapEx);
- const Rectangle aCropRectangle(pA->GetSrcPoint(), pA->GetSrcSize());
+ const tools::Rectangle aCropRectangle(pA->GetSrcPoint(), pA->GetSrcSize());
if(!aCropRectangle.IsEmpty())
{
@@ -2241,7 +2241,7 @@ namespace
if(!rBitmap.IsEmpty())
{
Bitmap aCroppedBitmap(rBitmap);
- const Rectangle aCropRectangle(pA->GetSrcPoint(), pA->GetSrcSize());
+ const tools::Rectangle aCropRectangle(pA->GetSrcPoint(), pA->GetSrcSize());
if(!aCropRectangle.IsEmpty())
{
@@ -2258,7 +2258,7 @@ namespace
{
/** CHECKED, WORKS WELL */
const MetaGradientAction* pA = static_cast<const MetaGradientAction*>(pAction);
- const Rectangle& rRectangle = pA->GetRect();
+ const tools::Rectangle& rRectangle = pA->GetRect();
if(!rRectangle.IsEmpty())
{
@@ -2348,7 +2348,7 @@ namespace
{
/** CHECKED, WORKS WELL */
const MetaWallpaperAction* pA = static_cast<const MetaWallpaperAction*>(pAction);
- Rectangle aWallpaperRectangle(pA->GetRect());
+ tools::Rectangle aWallpaperRectangle(pA->GetRect());
if(!aWallpaperRectangle.IsEmpty())
{
@@ -2421,7 +2421,7 @@ namespace
{
/** CHECKED, WORKS WELL */
const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction);
- const Rectangle& rRectangle = pA->GetRect();
+ const tools::Rectangle& rRectangle = pA->GetRect();
if(rRectangle.IsEmpty())
{
@@ -2868,7 +2868,7 @@ namespace
// this EPS on screen, the renderer visualizing this has to support
// that primitive and visualize the Eps file (e.g. printing)
const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pAction);
- const Rectangle aRectangle(pA->GetPoint(), pA->GetSize());
+ const tools::Rectangle aRectangle(pA->GetPoint(), pA->GetSize());
if(!aRectangle.IsEmpty())
{
@@ -3187,7 +3187,7 @@ namespace drawinglayer
if(!xRetval.empty())
{
// get target size
- const Rectangle aMtfTarget(getMetaFile().GetPrefMapMode().GetOrigin(), getMetaFile().GetPrefSize());
+ const tools::Rectangle aMtfTarget(getMetaFile().GetPrefMapMode().GetOrigin(), getMetaFile().GetPrefSize());
// create transformation
basegfx::B2DHomMatrix aAdaptedTransform;
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index e58aacfa0113..ffad187e7217 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -290,7 +290,7 @@ namespace drawinglayer
if(nTextLength)
{
- Rectangle aRect;
+ tools::Rectangle aRect;
mrDevice.GetTextBoundRect(
aRect,
@@ -324,7 +324,7 @@ namespace drawinglayer
}
void TextLayouterDevice::addTextRectActions(
- const Rectangle& rRectangle,
+ const tools::Rectangle& rRectangle,
const OUString& rText,
DrawTextFlags nStyle,
GDIMetaFile& rGDIMetaFile) const