diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 17:10:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 07:59:14 +0000 |
| commit | 3a00aaef2a51d7a1a87475a316dc9ae232fac60c (patch) | |
| tree | 4cc4516528c0dcb0bb6871e5b517efb74550a521 /basegfx | |
| parent | c8ee3be0e08c435b106f0ac4b76618b33333b040 (diff) | |
boost->std
Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0
Reviewed-on: https://gerrit.libreoffice.org/18670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/inc/pch/precompiled_basegfx.hxx | 1 | ||||
| -rw-r--r-- | basegfx/source/polygon/b2dpolygon.cxx | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/basegfx/inc/pch/precompiled_basegfx.hxx b/basegfx/inc/pch/precompiled_basegfx.hxx index a65b3ff43fcd..c393169294b0 100644 --- a/basegfx/inc/pch/precompiled_basegfx.hxx +++ b/basegfx/inc/pch/precompiled_basegfx.hxx @@ -16,7 +16,6 @@ #include <algorithm> #include <boost/bind.hpp> -#include <boost/scoped_ptr.hpp> #include <boost/tuple/tuple.hpp> #include <boost/noncopyable.hpp> #include <com/sun/star/awt/Point.hpp> diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index 46b8b452e90f..d2c0a67824fd 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -25,9 +25,9 @@ #include <basegfx/curve/b2dcubicbezier.hxx> #include <rtl/instance.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <boost/scoped_ptr.hpp> -#include <vector> #include <algorithm> +#include <memory> +#include <vector> struct CoordinateData2D : public basegfx::B2DPoint { @@ -468,10 +468,10 @@ class ImplBufferedData { private: // Possibility to hold the last subdivision - boost::scoped_ptr< basegfx::B2DPolygon > mpDefaultSubdivision; + std::unique_ptr< basegfx::B2DPolygon > mpDefaultSubdivision; // Possibility to hold the last B2DRange calculation - boost::scoped_ptr< basegfx::B2DRange > mpB2DRange; + std::unique_ptr< basegfx::B2DRange > mpB2DRange; public: ImplBufferedData() @@ -567,10 +567,10 @@ private: // The control point vectors. This vectors are created on demand // and may be zero. - boost::scoped_ptr< ControlVectorArray2D > mpControlVector; + std::unique_ptr< ControlVectorArray2D > mpControlVector; // buffered data for e.g. default subdivision and range - boost::scoped_ptr< ImplBufferedData > mpBufferedData; + std::unique_ptr< ImplBufferedData > mpBufferedData; // flag which decides if this polygon is opened or closed bool mbIsClosed; |