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 /extensions/source/propctrlr | |
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 'extensions/source/propctrlr')
4 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 0e8055b436a0..269b14d033dc 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -417,13 +417,13 @@ namespace pcr void OBrowserListBox::Resize() { - Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() ); + tools::Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() ); Size aHelpWindowDistance( LogicToPixel( Size( 0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT ), MapUnit::MapAppFont ) ); long nHelpWindowHeight = m_nCurrentPreferredHelpHeight = impl_getPrefererredHelpHeight(); bool bPositionHelpWindow = ( nHelpWindowHeight != 0 ); - Rectangle aLinesArea( aPlayground ); + tools::Rectangle aLinesArea( aPlayground ); if ( bPositionHelpWindow ) { aLinesArea.Bottom() -= nHelpWindowHeight; @@ -471,7 +471,7 @@ namespace pcr // position the help window if ( bPositionHelpWindow ) { - Rectangle aHelpArea( aPlayground ); + tools::Rectangle aHelpArea( aPlayground ); aHelpArea.Top() = aLinesArea.Bottom() + aHelpWindowDistance.Height(); m_pHelpWindow->SetPosSizePixel( aHelpArea.TopLeft(), aHelpArea.GetSize() ); } diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index 5641015f5461..bb4edca2a414 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -111,7 +111,7 @@ namespace pcr long nMinTextWindowHeight = impl_getMinimalTextWindowHeight(); long nMaxTextWindowHeight = impl_getMaximalTextWindowHeight(); - Rectangle aTextRect( Point( 0, 0 ), m_aHelpText->GetOutputSizePixel() ); + tools::Rectangle aTextRect( Point( 0, 0 ), m_aHelpText->GetOutputSizePixel() ); aTextRect = m_aHelpText->GetTextRect( aTextRect, m_aHelpText->GetText(), DrawTextFlags::Left | DrawTextFlags::Top | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak ); long nActTextWindowHeight = impl_getHelpTextBorderHeight() + aTextRect.GetHeight(); @@ -127,13 +127,13 @@ namespace pcr { Size a3AppFont( LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont ) ); - Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() ); + tools::Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() ); - Rectangle aSeparatorArea( aPlayground ); + tools::Rectangle aSeparatorArea( aPlayground ); aSeparatorArea.Bottom() = aSeparatorArea.Top() + LogicToPixel( Size( 0, 8 ), MapUnit::MapAppFont ).Height(); m_aSeparator->SetPosSizePixel( aSeparatorArea.TopLeft(), aSeparatorArea.GetSize() ); - Rectangle aTextArea( aPlayground ); + tools::Rectangle aTextArea( aPlayground ); aTextArea.Top() = aSeparatorArea.Bottom() + a3AppFont.Height(); m_aHelpText->SetPosSizePixel( aTextArea.TopLeft(), aTextArea.GetSize() ); } diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 2da1083025f0..714e640cc0ec 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -114,7 +114,7 @@ namespace pcr sal_uInt16 nFirstID = m_aTabControl->GetPageId( 0 ); // reserve space for the tabs themself - Rectangle aTabArea( m_aTabControl->GetTabBounds( nFirstID ) ); + tools::Rectangle aTabArea( m_aTabControl->GetTabBounds( nFirstID ) ); nMinHeight += aTabArea.GetHeight(); // ask the page how much it requires @@ -201,7 +201,7 @@ namespace pcr void OPropertyEditor::Resize() { - Rectangle aPlayground( + tools::Rectangle aPlayground( Point( LAYOUT_BORDER_LEFT, LAYOUT_BORDER_TOP ), Size( GetOutputSizePixel().Width() - LAYOUT_BORDER_LEFT - LAYOUT_BORDER_RIGHT, @@ -209,7 +209,7 @@ namespace pcr ) ); - Rectangle aTabArea( aPlayground ); + tools::Rectangle aTabArea( aPlayground ); m_aTabControl->SetPosSizePixel( aTabArea.TopLeft(), aTabArea.GetSize() ); } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 1b60b7f57a7c..556435ad829e 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -1120,7 +1120,7 @@ namespace pcr ::Point aMePos= GetPosPixel(); aMePos = GetParent()->OutputToScreenPixel( aMePos ); ::Size aSize=GetSizePixel(); - ::Rectangle aRect(aMePos,aSize); + ::tools::Rectangle aRect(aMePos,aSize); aSize.Height() = STD_HEIGHT; m_pFloatingEdit->SetOutputSizePixel(aSize); m_pFloatingEdit->StartPopupMode( aRect, FloatWinPopupFlags::Down ); |