[Libreoffice-commits] core.git: vcl/source

Miklos Vajna vmiklos at collabora.co.uk
Fri Mar 6 01:14:34 PST 2015


 vcl/source/window/decoview.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 9a93277b869caca4db054385db59fc7b7d541570
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Mar 6 10:13:20 2015 +0100

    vcl: fix Android build
    
    Change-Id: Ib71d74d4b66b02a6a680b5ab0c905b987d59cf7f

diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 8545e87..c04c430 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -28,6 +28,8 @@
                                  BUTTON_DRAW_CHECKED |          \
                                  BUTTON_DRAW_HIGHLIGHT)
 
+using namespace std;
+
 namespace {
 
 long AdjustRectToSquare( Rectangle &rRect )
@@ -1111,15 +1113,15 @@ void DecorationView::DrawHandle(const Rectangle& rRect, bool bVertical)
         if (bVertical)
         {
             aLocation = Rectangle(nHalfWidth - nRadius,
-                                  std::round(fDistance * i) - nRadius,
+                                  round(fDistance * i) - nRadius,
                                   nHalfWidth + nRadius,
-                                  std::round(fDistance * i) + nRadius);
+                                  round(fDistance * i) + nRadius);
         }
         else
         {
-            aLocation = Rectangle(std::round(fDistance * i) - nRadius,
+            aLocation = Rectangle(round(fDistance * i) - nRadius,
                                   nHalfHeight - nRadius,
-                                  std::round(fDistance * i) + nRadius,
+                                  round(fDistance * i) + nRadius,
                                   nHalfHeight + nRadius);
         }
         mpOutDev->DrawEllipse(aLocation);


More information about the Libreoffice-commits mailing list