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 /sw/source/uibase/sidebar | |
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 'sw/source/uibase/sidebar')
-rw-r--r-- | sw/source/uibase/sidebar/StylePresetsPanel.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/ThemePanel.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index 19be3ef44174..a82a478649e1 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -43,7 +43,7 @@ namespace sw { namespace sidebar { namespace { void renderPreview(sfx2::StyleManager* pStyleManager, OutputDevice& aOutputDevice, - OUString const & sName, sal_Int32 nHeight, Rectangle& aRect) + OUString const & sName, sal_Int32 nHeight, tools::Rectangle& aRect) { SfxStyleSheetBase* pStyleSheet = pStyleManager->Search(sName, SfxStyleFamily::Para); @@ -88,7 +88,7 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString& aName) long y = 0; { pVirtualDev->SetFillColor(COL_LIGHTGRAY); - Rectangle aNameRect(0, y, nPreviewWidth, nNameHeight); + tools::Rectangle aNameRect(0, y, nPreviewWidth, nNameHeight); pVirtualDev->DrawRect(aNameRect); vcl::Font aFont; @@ -107,18 +107,18 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString& aName) } { - Rectangle aRenderRect(Point(nMargin, y), aSize); + tools::Rectangle aRenderRect(Point(nMargin, y), aSize); renderPreview(pStyleManager, *pVirtualDev.get(), "Title", nTitleHeight, aRenderRect); y += nTitleHeight; } { - Rectangle aRenderRect(Point(nMargin, y), aSize); + tools::Rectangle aRenderRect(Point(nMargin, y), aSize); renderPreview(pStyleManager, *pVirtualDev.get(), "Heading 1", nHeadingHeight, aRenderRect); y += nHeadingHeight; } { - Rectangle aRenderRect(Point(nMargin, y), aSize); + tools::Rectangle aRenderRect(Point(nMargin, y), aSize); renderPreview(pStyleManager, *pVirtualDev.get(), "Text Body", nTextBodyHeight, aRenderRect); } diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 46e32a973fe6..bd91fef1db4e 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -405,10 +405,10 @@ BitmapEx GenerateColorPreview(const svx::ColorSet& rColorSet) for (sal_uInt32 i = 0; i < 12; i += 2) { pVirtualDev->SetFillColor(rColorSet.getColor(i)); - pVirtualDev->DrawRect(Rectangle(x, y1, x + SIZE, y1 + SIZE)); + pVirtualDev->DrawRect(tools::Rectangle(x, y1, x + SIZE, y1 + SIZE)); pVirtualDev->SetFillColor(rColorSet.getColor(i + 1)); - pVirtualDev->DrawRect(Rectangle(x, y2, x + SIZE, y2 + SIZE)); + pVirtualDev->DrawRect(tools::Rectangle(x, y2, x + SIZE, y2 + SIZE)); x += SIZE + BORDER; } |