1 files changed, 15 insertions, 15 deletions

diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 6294549bc917..1899000f7d90 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -104,16 +104,16 @@ void SpinButton::Resize()
 
     Size aSize(GetOutputSizePixel());
     Point aTmpPoint;
-    Rectangle aRect(aTmpPoint, aSize);
+    tools::Rectangle aRect(aTmpPoint, aSize);
     if (mbHorz)
     {
-        maLowerRect = Rectangle(0, 0, aSize.Width() / 2, aSize.Height() - 1);
-        maUpperRect = Rectangle(maLowerRect.TopRight(), aRect.BottomRight());
+        maLowerRect = tools::Rectangle(0, 0, aSize.Width() / 2, aSize.Height() - 1);
+        maUpperRect = tools::Rectangle(maLowerRect.TopRight(), aRect.BottomRight());
     }
     else
     {
-        maUpperRect = Rectangle(0, 0, aSize.Width() - 1, aSize.Height() / 2);
-        maLowerRect = Rectangle(maUpperRect.BottomLeft(), aRect.BottomRight());
+        maUpperRect = tools::Rectangle(0, 0, aSize.Width() - 1, aSize.Height() / 2);
+        maLowerRect = tools::Rectangle(maUpperRect.BottomLeft(), aRect.BottomRight());
     }
 
     ImplCalcFocusRect(ImplIsUpperEnabled() || !ImplIsLowerEnabled());
@@ -142,17 +142,17 @@ void SpinButton::Draw(OutputDevice* pDev, const Point& rPos, const Size& rSize,
         pDev->SetSettings( aSettings );
     }
 
-    Rectangle   aRect( Point( 0, 0 ), aSize );
-    Rectangle aLowerRect, aUpperRect;
+    tools::Rectangle   aRect( Point( 0, 0 ), aSize );
+    tools::Rectangle aLowerRect, aUpperRect;
     if ( mbHorz )
     {
-        aLowerRect = Rectangle( 0, 0, aSize.Width()/2, aSize.Height()-1 );
-        aUpperRect = Rectangle( aLowerRect.TopRight(), aRect.BottomRight() );
+        aLowerRect = tools::Rectangle( 0, 0, aSize.Width()/2, aSize.Height()-1 );
+        aUpperRect = tools::Rectangle( aLowerRect.TopRight(), aRect.BottomRight() );
     }
     else
     {
-        aUpperRect = Rectangle( 0, 0, aSize.Width()-1, aSize.Height()/2 );
-        aLowerRect = Rectangle( aUpperRect.BottomLeft(), aRect.BottomRight() );
+        aUpperRect = tools::Rectangle( 0, 0, aSize.Width()-1, aSize.Height()/2 );
+        aLowerRect = tools::Rectangle( aUpperRect.BottomLeft(), aRect.BottomRight() );
     }
 
     aUpperRect += aPos;
@@ -164,7 +164,7 @@ void SpinButton::Draw(OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-void SpinButton::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
+void SpinButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/)
 {
     HideFocus();
 
@@ -427,7 +427,7 @@ void SpinButton::ImplCalcFocusRect( bool _bUpper )
     mbUpperIsFocused = _bUpper;
 }
 
-Rectangle* SpinButton::ImplFindPartRect( const Point& rPt )
+tools::Rectangle* SpinButton::ImplFindPartRect( const Point& rPt )
 {
     if( maUpperRect.IsInside( rPt ) )
         return &maUpperRect;
@@ -449,8 +449,8 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt )
             if (IsNativeControlSupported(ControlType::Spinbox, ControlPart::Entire) ||
                 IsNativeControlSupported(ControlType::Spinbox, ControlPart::AllButtons) )
             {
-                Rectangle* pRect = ImplFindPartRect( GetPointerPosPixel() );
-                Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() );
+                tools::Rectangle* pRect = ImplFindPartRect( GetPointerPosPixel() );
+                tools::Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() );
                 if (pRect != pLastRect || (pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()))
                 {
                     vcl::Region aRgn(GetActiveClipRegion());