summaryrefslogtreecommitdiff
path: root/forms
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 /forms
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 'forms')
-rw-r--r--forms/source/richtext/richtextimplcontrol.cxx10
-rw-r--r--forms/source/richtext/richtextviewport.cxx2
-rw-r--r--forms/source/richtext/richtextviewport.hxx2
3 files changed, 7 insertions, 7 deletions
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 5a11fa9dd031..655ca5158fcd 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -78,7 +78,7 @@ namespace frm
}
// ensure that it's initially scrolled to the upper left
- m_pView->SetVisArea( Rectangle( Point( ), m_pViewport->GetOutputSize() ) );
+ m_pView->SetVisArea( tools::Rectangle( Point( ), m_pViewport->GetOutputSize() ) );
ensureScrollbars();
@@ -432,8 +432,8 @@ namespace frm
m_pEngine->SetPaperSize( Size( aViewportSizeLogic.Width(), m_pEngine->GetTextHeight() ) );
// output area of the view
- m_pView->SetOutputArea( Rectangle( Point( ), aViewportSizeLogic ) );
- m_pView->SetVisArea( Rectangle( Point( ), aViewportSizeLogic ) );
+ m_pView->SetOutputArea( tools::Rectangle( Point( ), aViewportSizeLogic ) );
+ m_pView->SetVisArea( tools::Rectangle( Point( ), aViewportSizeLogic ) );
if ( m_pVScroll )
{
@@ -543,7 +543,7 @@ namespace frm
namespace
{
- void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
+ void lcl_inflate( tools::Rectangle& _rRect, long _nInflateX, long _nInflateY )
{
_rRect.Left() -= _nInflateX;
_rRect.Right() += _nInflateX;
@@ -592,7 +592,7 @@ namespace frm
aSize = OutputDevice::LogicToLogic( _rSize, aOriginalMapMode, aNormalizedMapMode );
}
- Rectangle aPlayground( aPos, aSize );
+ tools::Rectangle aPlayground( aPos, aSize );
Size aOnePixel( _pDev->PixelToLogic( Size( 1, 1 ) ) );
aPlayground.Right() -= aOnePixel.Width();
aPlayground.Bottom() -= aOnePixel.Height();
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index 36aeef8101cf..32f12ebe681f 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -35,7 +35,7 @@ namespace frm
SetPointer( _rView.GetPointer() );
}
- void RichTextViewPort::Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect )
+ void RichTextViewPort::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect )
{
m_pView->Paint(_rRect, &rRenderContext);
}
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index 47520922b6cf..8e4636fe4932 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -43,7 +43,7 @@ namespace frm
bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; }
protected:
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
virtual void GetFocus() override;
virtual void LoseFocus() override;
virtual void KeyInput( const KeyEvent& _rKEvt ) override;