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 /sc/source/ui/view/olinewin.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 'sc/source/ui/view/olinewin.cxx')
| -rw-r--r-- | sc/source/ui/view/olinewin.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 614fa6cfb895..daa983f18e11 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -136,7 +136,7 @@ void ScOutlineWindow::ScrollPixel( long nDiff ) void ScOutlineWindow::ScrollRel( long nEntryDiff, long nEntryStart, long nEntryEnd ) { - Rectangle aRect( GetRectangle( 0, nEntryStart, GetOutputSizeLevel() - 1, nEntryEnd ) ); + tools::Rectangle aRect( GetRectangle( 0, nEntryStart, GetOutputSizeLevel() - 1, nEntryEnd ) ); if ( mbHoriz ) Scroll( nEntryDiff, 0, aRect ); else @@ -210,10 +210,10 @@ Point ScOutlineWindow::GetPoint( long nLevelPos, long nEntryPos ) const return mbHoriz ? Point( nEntryPos, nLevelPos ) : Point( nLevelPos, nEntryPos ); } -Rectangle ScOutlineWindow::GetRectangle( +tools::Rectangle ScOutlineWindow::GetRectangle( long nLevelStart, long nEntryStart, long nLevelEnd, long nEntryEnd ) const { - return Rectangle( GetPoint( nLevelStart, nEntryStart ), GetPoint( nLevelEnd, nEntryEnd ) ); + return tools::Rectangle( GetPoint( nLevelStart, nEntryStart ), GetPoint( nLevelEnd, nEntryEnd ) ); } long ScOutlineWindow::GetOutputSizeLevel() const @@ -510,7 +510,7 @@ void ScOutlineWindow::DataChanged( const DataChangedEvent& rDCEvt ) void ScOutlineWindow::SetEntryAreaClipRegion() { - SetClipRegion( vcl::Region(Rectangle( + SetClipRegion( vcl::Region(tools::Rectangle( GetPoint( 0, mnMainFirstPos ), GetPoint( GetOutputSizeLevel() - 1, mnMainLastPos )))); } @@ -541,7 +541,7 @@ void ScOutlineWindow::DrawImageRel(long nLevelPos, long nEntryPos, sal_uInt16 nI SetLineColor(); SetFillColor( GetBackground().GetColor() ); Point aPos( GetPoint( nLevelPos, nEntryPos ) ); - DrawRect( Rectangle( aPos, rImage.GetSizePixel() ) ); + DrawRect( tools::Rectangle( aPos, rImage.GetSizePixel() ) ); DrawImage( aPos, rImage ); } @@ -574,7 +574,7 @@ void ScOutlineWindow::ShowFocus() if ( GetImagePos( mnFocusLevel, mnFocusEntry, aPos ) ) { aPos += Point( 1, 1 ); - maFocusRect = Rectangle( aPos, Size( SC_OL_BITMAPSIZE - 2, SC_OL_BITMAPSIZE - 2 ) ); + maFocusRect = tools::Rectangle( aPos, Size( SC_OL_BITMAPSIZE - 2, SC_OL_BITMAPSIZE - 2 ) ); bool bClip = (mnFocusEntry != SC_OL_HEADERENTRY); if ( bClip ) SetEntryAreaClipRegion(); @@ -600,7 +600,7 @@ void ScOutlineWindow::HideFocus() } } -void ScOutlineWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /* rRect */ ) +void ScOutlineWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& /* rRect */ ) { long nEntriesSign = mbMirrorEntries ? -1 : 1; long nLevelsSign = mbMirrorLevels ? -1 : 1; |