5 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index f399699081be..8db9a70127b5 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2486,7 +2486,7 @@ void SwContentTree::ShowTree()
 }
 
 void SwContentTree::Paint( vcl::RenderContext& rRenderContext,
-                           const Rectangle& rRect )
+                           const tools::Rectangle& rRect )
 {
     // Start the update timer on the first paint; avoids
     // flicker on the first reveal.
@@ -2947,7 +2947,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
                         aSize.Width() = GetSizePixel().Width() - aPos.X();
 
                     aPos = OutputToScreenPixel(aPos);
-                    Rectangle aItemRect( aPos, aSize );
+                    tools::Rectangle aItemRect( aPos, aSize );
                     if(bBalloon)
                     {
                         aPos.X() += aSize.Width();
@@ -2961,7 +2961,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
             }
             else
             {
-                Help::ShowQuickHelp( this, Rectangle(), OUString() );
+                Help::ShowQuickHelp( this, tools::Rectangle(), OUString() );
                 bCallBase = false;
             }
         }
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index f18bb5b26e3c..74402e468e7f 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -479,7 +479,7 @@ void     SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
                     aSize.Width() = GetSizePixel().Width() - aEntryPos.X();
 
                 aEntryPos = OutputToScreenPixel(aEntryPos);
-                Rectangle aItemRect( aEntryPos, aSize );
+                tools::Rectangle aItemRect( aEntryPos, aSize );
                 if(Help::IsBalloonHelpEnabled())
                 {
                     aEntryPos.X() += aSize.Width();
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index fe05f73da6a9..9904dd5083db 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -416,12 +416,12 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt)
     ToolBox::MouseButtonDown(rEvt);
 }
 
-void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent)
+void SwNavigationPI::CreateNavigationTool(const tools::Rectangle& rRect, bool bSetFocus, vcl::Window *pParent)
 {
     Reference< XFrame > xFrame = GetCreateView()->GetViewFrame()->GetFrame().GetFrameInterface();
     VclPtrInstance<SwScrollNaviPopup> pPopup(FN_SCROLL_NAVIGATION, xFrame, pParent);
 
-    Rectangle aRect(rRect);
+    tools::Rectangle aRect(rRect);
     Point aT1 = aRect.TopLeft();
     aT1 = pPopup->GetParent()->OutputToScreenPixel(pPopup->GetParent()->AbsoluteScreenToOutputPixel(m_aContentToolBox->OutputToAbsoluteScreenPixel(aT1)));
     aRect.SetPos(aT1);
@@ -636,8 +636,8 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
 
     // Double separators are not allowed, so you have to
     // determine the suitable size differently.
-    Rectangle aFirstRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("anchor"));
-    Rectangle aSecondRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("header"));
+    tools::Rectangle aFirstRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("anchor"));
+    tools::Rectangle aSecondRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("header"));
     Size aItemWinSize( aFirstRect.Left() - aSecondRect.Left(),
                        aFirstRect.Bottom() - aFirstRect.Top() );
     Size aOptimalSize(m_xEdit->get_preferred_size());
diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx
index 0fcfa7f3543f..78a4e44a5b74 100644
--- a/sw/source/uibase/utlui/shdwcrsr.cxx
+++ b/sw/source/uibase/utlui/shdwcrsr.cxx
@@ -97,7 +97,7 @@ void SwShadowCursor::Paint()
         DrawCursor( aOldPt, nOldHeight, nOldMode );
 }
 
-Rectangle SwShadowCursor::GetRect() const
+tools::Rectangle SwShadowCursor::GetRect() const
 {
     long nH = nOldHeight;
     Point aPt( aOldPt );
@@ -115,7 +115,7 @@ Rectangle SwShadowCursor::GetRect() const
         aSz.Width() *= 2;
     }
 
-    return pWin->PixelToLogic( Rectangle( aPt, aSz ) );
+    return pWin->PixelToLogic( tools::Rectangle( aPt, aSz ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index 89be94c86e40..0c7db9333786 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -87,9 +87,9 @@ void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState
 void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
 {
     vcl::RenderContext* pDev = rUsrEvt.GetRenderContext();
-    Rectangle aRect(rUsrEvt.GetRect());
+    tools::Rectangle aRect(rUsrEvt.GetRect());
 
-    const Rectangle aControlRect = getControlRect();
+    const tools::Rectangle aControlRect = getControlRect();
 
     const bool bSingleColumn    = 0 == mpImpl->mnState;
     const bool bAutomatic       = 1 == mpImpl->mnState;
@@ -119,7 +119,7 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
 
 bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
 {
-    const Rectangle aRect = getControlRect();
+    const tools::Rectangle aRect = getControlRect();
     const Point aPoint = rEvt.GetPosPixel();
     const long nXDiff = aPoint.X() - aRect.Left();
 
@@ -167,7 +167,7 @@ bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
 
 bool SwViewLayoutControl::MouseMove( const MouseEvent & rEvt )
 {
-    const Rectangle aRect = getControlRect();
+    const tools::Rectangle aRect = getControlRect();
     const Point aPoint = rEvt.GetPosPixel();
     const long nXDiff = aPoint.X() - aRect.Left();