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

use boost::noncopyable

üst 2a22e664
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp> #include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/basegfxdllapi.h> #include <basegfx/basegfxdllapi.h>
#include <boost/utility.hpp>
namespace basegfx namespace basegfx
...@@ -48,8 +49,10 @@ namespace unotools ...@@ -48,8 +49,10 @@ namespace unotools
::com::sun::star::rendering::XBezierPolyPolygon2D, ::com::sun::star::rendering::XBezierPolyPolygon2D,
::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase;
class BASEGFX_DLLPUBLIC UnoPolyPolygon : private cppu::BaseMutex, class BASEGFX_DLLPUBLIC UnoPolyPolygon
public UnoPolyPolygonBase : private cppu::BaseMutex
, private boost::noncopyable
, public UnoPolyPolygonBase
{ {
public: public:
explicit UnoPolyPolygon( const B2DPolyPolygon& ); explicit UnoPolyPolygon( const B2DPolyPolygon& );
...@@ -96,15 +99,15 @@ namespace unotools ...@@ -96,15 +99,15 @@ namespace unotools
sal_Int32 nNumberOfPoints ) const; sal_Int32 nNumberOfPoints ) const;
/// Get cow copy of internal polygon. not thread-safe outside this object. /// Get cow copy of internal polygon. not thread-safe outside this object.
B2DPolyPolygon getPolyPolygonUnsafe() const; B2DPolyPolygon getPolyPolygonUnsafe() const
{
return maPolyPoly;
}
/// Called whenever internal polypolygon gets modified /// Called whenever internal polypolygon gets modified
virtual void modifying() const {} virtual void modifying() const {}
private: private:
UnoPolyPolygon( const UnoPolyPolygon& );
UnoPolyPolygon& operator=( const UnoPolyPolygon& );
B2DPolyPolygon maPolyPoly; B2DPolyPolygon maPolyPoly;
::com::sun::star::rendering::FillRule meFillRule; ::com::sun::star::rendering::FillRule meFillRule;
}; };
......
...@@ -445,11 +445,6 @@ namespace unotools ...@@ -445,11 +445,6 @@ namespace unotools
return aSubsetPoly; return aSubsetPoly;
} }
B2DPolyPolygon UnoPolyPolygon::getPolyPolygonUnsafe() const
{
return maPolyPoly;
}
#define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon" #define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
#define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D" #define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException ) ::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException )
......
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