diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 13:43:17 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:24:05 +0000 |
commit | 3744d8506ef231d642785faf6da4926cea64c6a0 (patch) | |
tree | 2d57ca5be9eda54aafb5065d7010bb50a37053ac /include/svx/shapepropertynotifier.hxx | |
parent | 7a17c038a6f4c433a69c6c1ed04aca2e5c929027 (diff) |
boost->std
Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853
Diffstat (limited to 'include/svx/shapepropertynotifier.hxx')
-rw-r--r-- | include/svx/shapepropertynotifier.hxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 5d9f90b56b50..1d2147a93d56 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -26,8 +26,6 @@ #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <memory> namespace cppu @@ -58,7 +56,7 @@ namespace svx virtual ~IPropertyValueProvider(); }; - typedef ::boost::shared_ptr< IPropertyValueProvider > PPropertyValueProvider; + typedef std::shared_ptr< IPropertyValueProvider > PPropertyValueProvider; //= PropertyValueProvider @@ -69,7 +67,6 @@ namespace svx and calls the getPropertyValue method. */ class SVX_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider - ,public ::boost::noncopyable { public: PropertyValueProvider( ::cppu::OWeakObject& _rContext, const sal_Char* _pAsciiPropertyName ) @@ -83,6 +80,9 @@ namespace svx protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } + PropertyValueProvider(const PropertyValueProvider&) SAL_DELETED_FUNCTION; + PropertyValueProvider& operator=(const PropertyValueProvider&) SAL_DELETED_FUNCTION; + private: ::cppu::OWeakObject& m_rContext; const OUString m_sPropertyName; @@ -97,7 +97,7 @@ namespace svx The class is intended to be held as member of the class which does the property change broadcasting. */ - class SVX_DLLPUBLIC PropertyChangeNotifier : public ::boost::noncopyable + class SVX_DLLPUBLIC PropertyChangeNotifier { public: /** constructs a notifier instance @@ -129,7 +129,10 @@ namespace svx void disposing(); private: - ::std::unique_ptr< PropertyChangeNotifier_Data > m_pData; + PropertyChangeNotifier(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; + PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; + + std::unique_ptr< PropertyChangeNotifier_Data > m_xData; }; |