[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - include/svx vcl/source

[Kohei Yoshida]

 include/svx/framelinkarray.hxx |    6 +++---
 vcl/source/gdi/outdev6.cxx     |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 341ec4a0ae1104a0fde20043bb43acd9a415fcdc
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Jan 17 08:45:20 2014 -0500

    Remove warning and build error with MSVC.
    
    Change-Id: I8eac2f5ff08968a885a8e413bf4db38092036957

diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 9383748..caf0623 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -23,11 +23,11 @@
 #include <svx/framelink.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 
-#include <memory>
-
 #include <vector>
 #include <svx/svxdllapi.h>
 
+#include <boost/scoped_ptr.hpp>
+
 namespace svx {
 namespace frame {
 
@@ -380,7 +380,7 @@ public:
     // ------------------------------------------------------------------------
 
 private:
-    typedef std::auto_ptr< ArrayImpl > ArrayImplPtr;
+    typedef boost::scoped_ptr<ArrayImpl> ArrayImplPtr;
 
     ArrayImplPtr        mxImpl;
 };
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index ef1def5..1b194d5 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -58,8 +58,8 @@ Polygon toPolygon( const basegfx::B2DPolygon& rPoly )
         // This polygon not empty but is too small to display.  Approximate it
         // with a rectangle large enough to be displayed.
         double nX = aRange.getMinX(), nY = aRange.getMinY();
-        double nW = std::max<double>(1.0, round(fW));
-        double nH = std::max<double>(1.0, round(fH));
+        double nW = std::max<double>(1.0, rtl::math::round(fW));
+        double nH = std::max<double>(1.0, rtl::math::round(fH));
 
         Polygon aTarget;
         aTarget.Insert(0, Point(nX, nY));