Kaydet (Commit) 0ae82ba5 authored tarafından Caolán McNamara's avatar Caolán McNamara

cut down some more unnecessary boost inclusion

Change-Id: Ia997e243d28a54d2e3cc9714fe3e7e86d198797c
üst 8d997133
......@@ -25,12 +25,9 @@
#include <osl/diagnose.h>
#include <boost/shared_ptr.hpp>
#include <boost/utility.hpp>
#include <memory>
#include <vector>
namespace basegfx
{
/** base class to define color modifications
......@@ -55,13 +52,15 @@ namespace basegfx
operator); local values cannot be changed after construction. The
instances are cheap and the idea is to create them on demand. To
be able to reuse these as much as possible, a define for a
::boost::shared_ptr named BColorModifierSharedPtr exists below.
std::shared_ptr named BColorModifierSharedPtr exists below.
All usages should handle instances of BColorModifier encapsulated
into these shared pointers.
*/
class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier : private boost::noncopyable
class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier
{
private:
BColorModifier(const BColorModifier&) SAL_DELETED_FUNCTION;
BColorModifier& operator=(const BColorModifier&) SAL_DELETED_FUNCTION;
protected:
// no one is allowed to incarnate the abstract base class
// except derivations
......@@ -69,7 +68,7 @@ namespace basegfx
public:
// no one should directly destroy it; all incarnations should be
// handled in a boost::shared_ptr of type BColorModifierSharedPtr
// handled in a std::shared_ptr of type BColorModifierSharedPtr
virtual ~BColorModifier();
// compare operator
......@@ -374,7 +373,7 @@ namespace basegfx
{
/// typedef to allow working with shared instances of BColorModifier
/// for the whole mechanism
typedef ::boost::shared_ptr< BColorModifier > BColorModifierSharedPtr;
typedef std::shared_ptr< BColorModifier > BColorModifierSharedPtr;
/** Class to hold a stack of BColorModifierSharedPtrs and to get the modified color with
applying all existing entry changes as defined in the stack. Instances of BColorModifier
......
......@@ -28,8 +28,6 @@
#include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/basegfxdllapi.h>
#include <boost/utility.hpp>
namespace basegfx
{
......@@ -42,7 +40,6 @@ namespace unotools
class BASEGFX_DLLPUBLIC UnoPolyPolygon
: private cppu::BaseMutex
, private boost::noncopyable
, public UnoPolyPolygonBase
{
public:
......@@ -99,6 +96,9 @@ namespace unotools
virtual void modifying() const {}
private:
UnoPolyPolygon(const UnoPolyPolygon&) SAL_DELETED_FUNCTION;
UnoPolyPolygon& operator=(const UnoPolyPolygon&) SAL_DELETED_FUNCTION;
B2DPolyPolygon maPolyPoly;
::com::sun::star::rendering::FillRule meFillRule;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment