summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basegfx/inc/basegfx/tools/unopolypolygon.hxx15
-rw-r--r--basegfx/source/tools/unopolypolygon.cxx5
2 files changed, 9 insertions, 11 deletions
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
index ca04b7a5f776..9f419837c02c 100644
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
@@ -37,6 +37,7 @@
#include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/basegfxdllapi.h>
+#include <boost/utility.hpp>
namespace basegfx
@@ -48,8 +49,10 @@ namespace unotools
::com::sun::star::rendering::XBezierPolyPolygon2D,
::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase;
- class BASEGFX_DLLPUBLIC UnoPolyPolygon : private cppu::BaseMutex,
- public UnoPolyPolygonBase
+ class BASEGFX_DLLPUBLIC UnoPolyPolygon
+ : private cppu::BaseMutex
+ , private boost::noncopyable
+ , public UnoPolyPolygonBase
{
public:
explicit UnoPolyPolygon( const B2DPolyPolygon& );
@@ -96,15 +99,15 @@ namespace unotools
sal_Int32 nNumberOfPoints ) const;
/// 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
virtual void modifying() const {}
private:
- UnoPolyPolygon( const UnoPolyPolygon& );
- UnoPolyPolygon& operator=( const UnoPolyPolygon& );
-
B2DPolyPolygon maPolyPoly;
::com::sun::star::rendering::FillRule meFillRule;
};
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 80203c2587bc..2ffaabd149c4 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -445,11 +445,6 @@ namespace unotools
return aSubsetPoly;
}
- B2DPolyPolygon UnoPolyPolygon::getPolyPolygonUnsafe() const
- {
- return maPolyPoly;
- }
-
#define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
#define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException )