[Libreoffice-commits] core.git: vcl/inc vcl/ios

[jan Iversen]

 vcl/inc/ios/iosinst.hxx |    2 +-
 vcl/ios/iosinst.cxx     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 605d3a2858ea585be35eb159a0fa4ce410d64ae9
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Apr 3 14:18:46 2017 +0200

    iOS update for Rectangle
    
    Updated Rectangle to tools::Rectangle
    
    Change-Id: I1577dffe8d51ac3a33bbc2e0771b338d5fdd0220

diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index 0ad543c71ac2..262ef1063076 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -39,7 +39,7 @@ public:
 
     virtual SalSystem* CreateSalSystem() override;
 
-    void GetWorkArea( Rectangle& rRect );
+    void GetWorkArea( tools::Rectangle& rRect );
     SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
     SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
 };
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index f0f80f08f399..e71b71156035 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -42,9 +42,9 @@ public:
     virtual bool ErrorTrapPop( bool ) { return false; }
 };
 
-void IosSalInstance::GetWorkArea( Rectangle& rRect )
+void IosSalInstance::GetWorkArea( tools::Rectangle& rRect )
 {
-    rRect = Rectangle( Point( 0, 0 ),
+    rRect = tools::Rectangle( Point( 0, 0 ),
                        Size( viewWidth, viewHeight ) );
 }
 
@@ -96,7 +96,7 @@ public:
             SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT);
     }
 
-    virtual void GetWorkArea( Rectangle& rRect ) override
+    virtual void GetWorkArea( tools::Rectangle& rRect ) override
     {
         IosSalInstance::getInstance()->GetWorkArea( rRect );
     }