summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /slideshow
parent17d821af6bb9df93569836a92f6bed975587fc6c (diff)
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle" Except some modules have their own foo::tools namespace, so there have to use ::tools::Rectangle. This commit just moves the class from the global namespace, it does not update pre/postwin.h yet. Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2 Reviewed-on: https://gerrit.libreoffice.org/35923 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx4
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx8
3 files changed, 8 insertions, 8 deletions
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 788f0434597f..d7f6291d9121 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -162,7 +162,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
blackHole->EnableOutput(false);
blackHole->SetFont( maFont );
blackHole->SetMapMode( MapUnit::MapPixel );
- Rectangle rect;
+ tools::Rectangle rect;
const FontMetric metric( blackHole->GetFontMetric() );
blackHole->GetTextBoundRect( rect, "XX:XX:XX" );
maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 );
@@ -439,7 +439,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas )
blackHole->EnableOutput(false);
blackHole->SetMapMode( MapUnit::MapPixel );
blackHole->SetFont( maFont );
- Rectangle rect = Rectangle( 0,0,
+ tools::Rectangle rect = tools::Rectangle( 0,0,
maSpriteSizePixel.getX(),
maSpriteSizePixel.getY());
if (mbDrawPressed)
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 9eadac3237e7..d4941f8300cf 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -226,10 +226,10 @@ private:
std::vector< ScrollTextAnimNode > maVector;
// the scroll rectangle
- Rectangle maScrollRectangleLogic;
+ tools::Rectangle maScrollRectangleLogic;
// the paint rectangle
- Rectangle maPaintRectangleLogic;
+ tools::Rectangle maPaintRectangleLogic;
};
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index fdd383f47f8f..5cdd8d0095ed 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -304,7 +304,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
if( aMask.IsEmpty() )
{
- const Rectangle aRect(aEmptyPoint,
+ const tools::Rectangle aRect(aEmptyPoint,
pVDevMask->GetOutputSizePixel());
const Wallpaper aWallpaper(COL_BLACK);
pVDevMask->DrawWallpaper(aRect,
@@ -331,7 +331,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
if(aMask.IsEmpty())
{
- const Rectangle aRect(rAnimBmp.aPosPix, aContent.GetSizePixel());
+ const tools::Rectangle aRect(rAnimBmp.aPosPix, aContent.GetSizePixel());
pVDevMask->SetFillColor(COL_BLACK);
pVDevMask->SetLineColor();
pVDevMask->DrawRect(aRect);
@@ -415,7 +415,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
if (pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_SCROLLRECT"))
{
o_rScrollRect = vcl::unotools::b2DRectangleFromRectangle(
- *reinterpret_cast<Rectangle const *>(
+ *reinterpret_cast<tools::Rectangle const *>(
pAct->GetData() ) );
bScrollRectSet = true;
@@ -423,7 +423,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
else if (pAct->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTRECT") )
{
o_rPaintRect = vcl::unotools::b2DRectangleFromRectangle(
- *reinterpret_cast<Rectangle const *>(
+ *reinterpret_cast<tools::Rectangle const *>(
pAct->GetData() ) );
bPaintRectSet = true;