summaryrefslogtreecommitdiff
path: root/desktop/source/splash/splash.cxx
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 /desktop/source/splash/splash.cxx
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 'desktop/source/splash/splash.cxx')
-rw-r--r--desktop/source/splash/splash.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 7b3bb7930ac6..74d1d56fe42a 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -58,7 +58,7 @@ public:
virtual ~SplashScreenWindow() override { disposeOnce(); }
virtual void dispose() override;
// workwindow
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
void Redraw();
};
@@ -142,7 +142,7 @@ void SplashScreenWindow::Redraw()
Invalidate();
// Trigger direct painting too - otherwise the splash screen won't be
// shown in some cases (when the idle timer won't be hit).
- Paint(*this, Rectangle());
+ Paint(*this, tools::Rectangle());
Flush();
}
@@ -473,7 +473,7 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap)
if ( nCount > 0 )
{
// retrieve size from first screen
- Rectangle aScreenArea = Application::GetScreenPosSizePixel((unsigned int)0);
+ tools::Rectangle aScreenArea = Application::GetScreenPosSizePixel((unsigned int)0);
nWidth = aScreenArea.GetWidth();
nHeight = aScreenArea.GetHeight();
}
@@ -516,7 +516,7 @@ void SplashScreen::determineProgressRatioValues(
if ( nCount > 0 )
{
// retrieve size from first screen
- Rectangle aScreenArea = Application::GetScreenPosSizePixel((unsigned int)0);
+ tools::Rectangle aScreenArea = Application::GetScreenPosSizePixel((unsigned int)0);
nWidth = aScreenArea.GetWidth();
nHeight = aScreenArea.GetHeight();
nScreenRatio = nHeight ? sal_Int32( rtl::math::round( double( nWidth ) / double( nHeight ), 2 ) * 100 ) : 0;
@@ -574,7 +574,7 @@ void SplashScreen::determineProgressRatioValues(
}
}
-void SplashScreenWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void SplashScreenWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{
if (!pSpl || !pSpl->_bVisible)
return;
@@ -586,8 +586,8 @@ void SplashScreenWindow::Paint(vcl::RenderContext& rRenderContext, const Rectang
rRenderContext.DrawBitmapEx(Point(), pSpl->_aIntroBmp);
ImplControlValue aValue( pSpl->_iProgress * pSpl->_barwidth / pSpl->_iMax);
- Rectangle aDrawRect( Point(pSpl->_tlx, pSpl->_tly), Size( pSpl->_barwidth, pSpl->_barheight));
- Rectangle aNativeControlRegion, aNativeContentRegion;
+ tools::Rectangle aDrawRect( Point(pSpl->_tlx, pSpl->_tly), Size( pSpl->_barwidth, pSpl->_barheight));
+ tools::Rectangle aNativeControlRegion, aNativeContentRegion;
if (rRenderContext.GetNativeControlRegion(ControlType::IntroProgress, ControlPart::Entire, aDrawRect,
ControlState::ENABLED, aValue, OUString(),
@@ -617,10 +617,10 @@ void SplashScreenWindow::Paint(vcl::RenderContext& rRenderContext, const Rectang
// border
_vdev->SetFillColor();
_vdev->SetLineColor( pSpl->_cProgressFrameColor );
- _vdev->DrawRect(Rectangle(pSpl->_tlx, pSpl->_tly, pSpl->_tlx+pSpl->_barwidth, pSpl->_tly+pSpl->_barheight));
+ _vdev->DrawRect(tools::Rectangle(pSpl->_tlx, pSpl->_tly, pSpl->_tlx+pSpl->_barwidth, pSpl->_tly+pSpl->_barheight));
_vdev->SetFillColor( pSpl->_cProgressBarColor );
_vdev->SetLineColor();
- _vdev->DrawRect(Rectangle(pSpl->_tlx+pSpl->_barspace, pSpl->_tly+pSpl->_barspace, pSpl->_tlx+pSpl->_barspace+length, pSpl->_tly+pSpl->_barheight-pSpl->_barspace));
+ _vdev->DrawRect(tools::Rectangle(pSpl->_tlx+pSpl->_barspace, pSpl->_tly+pSpl->_barspace, pSpl->_tlx+pSpl->_barspace+length, pSpl->_tly+pSpl->_barheight-pSpl->_barspace));
vcl::Font aFont;
aFont.SetFontSize(Size(0, 12));
aFont.SetAlignment(ALIGN_BASELINE);