summaryrefslogtreecommitdiff
path: root/sd/source/ui/docshell/sdclient.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/docshell/sdclient.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/docshell/sdclient.cxx')
-rw-r--r--sd/source/ui/docshell/sdclient.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index dfe544d35671..68c7dbacb428 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -55,7 +55,7 @@ Client::~Client()
* If IP active, then we get this request to increase the visible section of the
* object.
*/
-void Client::RequestNewObjectArea( Rectangle& aObjRect )
+void Client::RequestNewObjectArea( ::tools::Rectangle& aObjRect )
{
::sd::View* pView = mpViewShell->GetView();
@@ -73,14 +73,14 @@ void Client::RequestNewObjectArea( Rectangle& aObjRect )
bPosProtect = pObj->IsMoveProtect();
}
- Rectangle aOldRect = GetObjArea();
+ ::tools::Rectangle aOldRect = GetObjArea();
if ( bPosProtect )
aObjRect.SetPos( aOldRect.TopLeft() );
if ( bSizeProtect )
aObjRect.SetSize( aOldRect.GetSize() );
- Rectangle aWorkArea( pView->GetWorkArea() );
+ ::tools::Rectangle aWorkArea( pView->GetWorkArea() );
if ( !aWorkArea.IsInside(aObjRect) && !bPosProtect && aObjRect != aOldRect )
{
// correct position
@@ -110,7 +110,7 @@ void Client::ObjectAreaChanged()
if(pObj)
{
// no need to check for changes, this method is called only if the area really changed
- Rectangle aNewRectangle(GetScaledObjArea());
+ ::tools::Rectangle aNewRectangle(GetScaledObjArea());
// #i118524# if sheared/rotated, center to non-rotated LogicRect
pObj->setSuppressSetVisAreaSize(true);
@@ -119,7 +119,7 @@ void Client::ObjectAreaChanged()
{
pObj->SetLogicRect( aNewRectangle );
- const Rectangle& rBoundRect = pObj->GetCurrentBoundRect();
+ const ::tools::Rectangle& rBoundRect = pObj->GetCurrentBoundRect();
const Point aDelta(aNewRectangle.Center() - rBoundRect.Center());
aNewRectangle.Move(aDelta.X(), aDelta.Y());
@@ -150,13 +150,13 @@ void Client::ViewChanged()
::sd::View* pView = mpViewShell->GetView();
if (pView)
{
- Rectangle aLogicRect( pSdrOle2Obj->GetLogicRect() );
+ ::tools::Rectangle aLogicRect( pSdrOle2Obj->GetLogicRect() );
Size aLogicSize( aLogicRect.GetWidth(), aLogicRect.GetHeight() );
if( pSdrOle2Obj->IsChart() )
{
//charts never should be stretched see #i84323# for example
- pSdrOle2Obj->SetLogicRect( Rectangle( aLogicRect.TopLeft(), aLogicSize ) );
+ pSdrOle2Obj->SetLogicRect( ::tools::Rectangle( aLogicRect.TopLeft(), aLogicSize ) );
pSdrOle2Obj->BroadcastObjectChange();
return;
}
@@ -164,7 +164,7 @@ void Client::ViewChanged()
// TODO/LEAN: maybe we can do this without requesting the VisualArea?
// working with the visual area might need running state, so the object may switch itself to this state
MapMode aMap100( MapUnit::Map100thMM );
- Rectangle aVisArea;
+ ::tools::Rectangle aVisArea;
Size aSize = pSdrOle2Obj->GetOrigObjSize( &aMap100 );
aVisArea.SetSize( aSize );
@@ -179,7 +179,7 @@ void Client::ViewChanged()
aMap100 );
if( aPixelDiff.Width() || aPixelDiff.Height() )
{
- pSdrOle2Obj->SetLogicRect( Rectangle( aLogicRect.TopLeft(), aScaledSize ) );
+ pSdrOle2Obj->SetLogicRect( ::tools::Rectangle( aLogicRect.TopLeft(), aScaledSize ) );
pSdrOle2Obj->BroadcastObjectChange();
}
else