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 /svx/source/dialog/charmap.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 'svx/source/dialog/charmap.cxx')
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index f4f2a7f92a6c..21d2dcd50cce 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -163,7 +163,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) if ( bDrag && rMEvt.IsLeft() ) { // released mouse over character map - if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel())) + if ( tools::Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel())) aSelectHdl.Call( this ); ReleaseMouse(); bDrag = false; @@ -317,7 +317,7 @@ void SvxShowCharSet::KeyInput(const KeyEvent& rKEvt) } -void SvxShowCharSet::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) +void SvxShowCharSet::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) { InitSettings(rRenderContext); RecalculateFont(rRenderContext); @@ -337,7 +337,7 @@ void SvxShowCharSet::DeSelect() } // stretch a grid rectangle if its at the edge to fill unused space -Rectangle SvxShowCharSet::getGridRectangle(const Point &rPointUL, const Size &rOutputSize) +tools::Rectangle SvxShowCharSet::getGridRectangle(const Point &rPointUL, const Size &rOutputSize) { long x = rPointUL.X() - 1; long y = rPointUL.Y() - 1; @@ -364,7 +364,7 @@ Rectangle SvxShowCharSet::getGridRectangle(const Point &rPointUL, const Size &rO if (nXDistFromBottom <= 1) aGridSize.Height() += m_nYGap + nXDistFromBottom; - return Rectangle(aPointUL, aGridSize); + return tools::Rectangle(aPointUL, aGridSize); } void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, int n2) @@ -396,7 +396,7 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, Color aShadowColor(rStyleSettings.GetShadowColor()); int nTextHeight = rRenderContext.GetTextHeight(); - Rectangle aBoundRect; + tools::Rectangle aBoundRect; for (i = n1; i <= n2; ++i) { Point pix = MapIndexToPixel(i); @@ -736,7 +736,7 @@ svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos ) buf.appendUtf32( mxFontCharMap->GetCharFromIndex( _nPos ) ); aFind->second->maText = buf.makeStringAndClear(); Point pix = MapIndexToPixel( _nPos ); - aFind->second->maRect = Rectangle( Point( pix.X() + 1, pix.Y() + 1 ), Size(nX-1,nY-1) ); + aFind->second->maRect = tools::Rectangle( Point( pix.X() + 1, pix.Y() + 1 ), Size(nX-1,nY-1) ); } return aFind->second.get(); |