mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove warning and build error with MSVC.

Browse Source 
Change-Id: I8eac2f5ff08968a885a8e413bf4db38092036957
This commit is contained in:
Kohei Yoshida
2014-01-17 08:45:20 -05:00
parent 9d2424a67c
commit ce8010b482
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/svx/framelinkarray.hxx
View File

@@ -23,11 +23,11 @@
#include <svx/framelink.hxx> #include <svx/framelink.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <memory>
#include <vector> #include <vector>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <boost/scoped_ptr.hpp>
namespace svx { namespace svx {
namespace frame { namespace frame {
@@ -380,7 +380,7 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
private: private:
typedef std::auto_ptr< ArrayImpl > ArrayImplPtr; typedef boost::scoped_ptr<ArrayImpl> ArrayImplPtr;
ArrayImplPtr mxImpl; ArrayImplPtr mxImpl;
}; };

4
vcl/source/gdi/outdev6.cxx
View File

@@ -58,8 +58,8 @@ Polygon toPolygon( const basegfx::B2DPolygon& rPoly )
// This polygon not empty but is too small to display. Approximate it // This polygon not empty but is too small to display. Approximate it
// with a rectangle large enough to be displayed. // with a rectangle large enough to be displayed.
double nX = aRange.getMinX(), nY = aRange.getMinY(); double nX = aRange.getMinX(), nY = aRange.getMinY();
double nW = std::max<double>(1.0, round(fW)); double nW = std::max<double>(1.0, rtl::math::round(fW));
double nH = std::max<double>(1.0, round(fH)); double nH = std::max<double>(1.0, rtl::math::round(fH));
Polygon aTarget; Polygon aTarget;
aTarget.Insert(0, Point(nX, nY)); aTarget.Insert(0, Point(nX, nY));