summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/Outliner.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 /sd/source/ui/view/Outliner.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 'sd/source/ui/view/Outliner.cxx')
-rw-r--r--sd/source/ui/view/Outliner.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 9b4fe138301c..cd38117db3da 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -800,11 +800,11 @@ bool SdOutliner::SearchAndReplaceOnce(std::vector<sd::SearchSelection>* pSelecti
if (pViewShell && comphelper::LibreOfficeKit::isActive() && mbStringFound)
{
- std::vector<Rectangle> aLogicRects;
+ std::vector<::tools::Rectangle> aLogicRects;
pOutlinerView->GetSelectionRectangles(aLogicRects);
std::vector<OString> aLogicRectStrings;
- std::transform(aLogicRects.begin(), aLogicRects.end(), std::back_inserter(aLogicRectStrings), [](const Rectangle& rRectangle) { return rRectangle.toString(); });
+ std::transform(aLogicRects.begin(), aLogicRects.end(), std::back_inserter(aLogicRectStrings), [](const ::tools::Rectangle& rRectangle) { return rRectangle.toString(); });
OString sRectangles = comphelper::string::join("; ", aLogicRectStrings);
if (!pSelections)
@@ -869,7 +869,7 @@ void SdOutliner::DetectChange()
SetUpdateMode(false);
OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
if (pOutlinerView != nullptr)
- pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
+ pOutlinerView->SetOutputArea( ::tools::Rectangle( Point(), Size(1, 1) ) );
if (meMode == SPELL)
SetPaperSize( Size(1, 1) );
SetText(OUString(), GetParagraph(0));
@@ -1061,7 +1061,7 @@ void SdOutliner::ProvideNextTextObject()
SetUpdateMode(false);
OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
if (pOutlinerView != nullptr)
- pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
+ pOutlinerView->SetOutputArea( ::tools::Rectangle( Point(), Size(1, 1) ) );
if (meMode == SPELL)
SetPaperSize( Size(1, 1) );
SetText(OUString(), GetParagraph(0));
@@ -1408,7 +1408,7 @@ void SdOutliner::EnterEditMode (bool bGrabFocus)
OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
if (pOutlinerView && mpTextObj)
{
- pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1)));
+ pOutlinerView->SetOutputArea( ::tools::Rectangle( Point(), Size(1, 1)));
SetPaperSize( mpTextObj->GetLogicRect().GetSize() );
SdrPageView* pPV = mpView->GetSdrPageView();
@@ -1785,7 +1785,7 @@ void SdOutliner::Implementation::ProvideOutlinerView (
rOutliner.InsertView( mpOutlineView );
rOutliner.SetUpdateMode(false);
- mpOutlineView->SetOutputArea (Rectangle (Point(), Size(1, 1)));
+ mpOutlineView->SetOutputArea (::tools::Rectangle (Point(), Size(1, 1)));
rOutliner.SetPaperSize( Size(1, 1) );
rOutliner.SetText(OUString(), rOutliner.GetParagraph(0));