diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-17 08:45:20 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-17 11:33:17 -0500 |
| commit | ce8010b482020145b8a8c8e15a61e1a6b5574d7c (patch) | |
| tree | aff39f243aaaedcebadde8f9510eac578edc13e3 | |
| parent | 9d2424a67ccce9a22c2f3cb7e915654131e2132a (diff) | |
Remove warning and build error with MSVC.
Change-Id: I8eac2f5ff08968a885a8e413bf4db38092036957
| -rw-r--r-- | include/svx/framelinkarray.hxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev6.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 93837482c78a..caf0623efac8 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 ef1def54baf5..1b194d5076dc 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)); |