diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
| commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
| tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /vcl/source/outdev/clipping.cxx | |
| parent | 17d821af6bb9df93569836a92f6bed975587fc6c (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 'vcl/source/outdev/clipping.cxx')
| -rw-r--r-- | vcl/source/outdev/clipping.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx index 9396f262362b..5b6d71d4a3f1 100644 --- a/vcl/source/outdev/clipping.cxx +++ b/vcl/source/outdev/clipping.cxx @@ -103,13 +103,13 @@ void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove ) mpAlphaVDev->MoveClipRegion( nHorzMove, nVertMove ); } -void OutputDevice::IntersectClipRegion( const Rectangle& rRect ) +void OutputDevice::IntersectClipRegion( const tools::Rectangle& rRect ) { if ( mpMetaFile ) mpMetaFile->AddAction( new MetaISectRectClipRegionAction( rRect ) ); - Rectangle aRect = LogicToPixel( rRect ); + tools::Rectangle aRect = LogicToPixel( rRect ); maRegion.Intersect( aRect ); mbClipRegion = true; mbInitClipRegion = true; @@ -157,7 +157,7 @@ void OutputDevice::InitClipRegion() // Perform actual rect clip against outdev // dimensions, to generate empty clips whenever one of the // values is completely off the device. - Rectangle aDeviceBounds( mnOutOffX, mnOutOffY, + tools::Rectangle aDeviceBounds( mnOutOffX, mnOutOffY, mnOutOffX+GetOutputWidthPixel()-1, mnOutOffY+GetOutputHeightPixel()-1 ); aRegion.Intersect( aDeviceBounds ); @@ -195,7 +195,7 @@ vcl::Region OutputDevice::GetActiveClipRegion() const return GetClipRegion(); } -void OutputDevice::ClipToPaintRegion(Rectangle& /*rDstRect*/) +void OutputDevice::ClipToPaintRegion(tools::Rectangle& /*rDstRect*/) { // this is only used in Window, but we still need it as it's called // on in other clipping functions |