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 /sfx2/source/doc/objembed.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 'sfx2/source/doc/objembed.cxx')
-rw-r--r-- | sfx2/source/doc/objembed.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index ab90ef7fc015..9ebe0078bd16 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -92,29 +92,29 @@ void SfxObjectShell::OnDocumentPrinterChanged( Printer* /*pNewPrinter*/ ) } -Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const +tools::Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const { if( nAspect == ASPECT_CONTENT ) return pImpl->m_aVisArea; else if( nAspect == ASPECT_THUMBNAIL ) { - Rectangle aRect; + tools::Rectangle aRect; aRect.SetSize( OutputDevice::LogicToLogic( Size( 5000, 5000 ), MapUnit::Map100thMM, GetMapUnit() ) ); return aRect; } - return Rectangle(); + return tools::Rectangle(); } -const Rectangle& SfxObjectShell::GetVisArea() const +const tools::Rectangle& SfxObjectShell::GetVisArea() const { pImpl->m_aVisArea = GetVisArea( ASPECT_CONTENT ); return pImpl->m_aVisArea; } -void SfxObjectShell::SetVisArea( const Rectangle & rVisArea ) +void SfxObjectShell::SetVisArea( const tools::Rectangle & rVisArea ) { if( pImpl->m_aVisArea != rVisArea ) { @@ -132,7 +132,7 @@ void SfxObjectShell::SetVisArea( const Rectangle & rVisArea ) void SfxObjectShell::SetVisAreaSize( const Size & rVisSize ) { - SetVisArea( Rectangle( GetVisArea().TopLeft(), rVisSize ) ); + SetVisArea( tools::Rectangle( GetVisArea().TopLeft(), rVisSize ) ); } @@ -195,7 +195,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev, const JobSetup & rSetup, sal_uInt16 nAspect ) { - Rectangle aVisArea = GetVisArea( nAspect ); + tools::Rectangle aVisArea = GetVisArea( nAspect ); // MapUnit des Ziels MapMode aMapMode( GetMapUnit() ); aMapMode.SetScaleX( rScaleX ); |