summaryrefslogtreecommitdiffstats
path: root/configmgr/source/configurationregistry.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-15 20:54:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-16 12:54:45 +0000
commit01a8bda416d1598f5486f95b6a57d61ff09873ed (patch)
treec37934d13308426d22599f63bf8666305a6b1f80 /configmgr/source/configurationregistry.cxx
parentboost::foo_ptr->std::foo_ptr (diff)
downloadcore-01a8bda416d1598f5486f95b6a57d61ff09873ed.tar.gz
core-01a8bda416d1598f5486f95b6a57d61ff09873ed.zip
boost::noncopyable->'= delete'
Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea
Diffstat (limited to 'configmgr/source/configurationregistry.cxx')
-rw-r--r--configmgr/source/configurationregistry.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 2df0b1552e95..9a9ad9d596ba 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -21,7 +21,6 @@
#include <cassert>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/XProperty.hpp>
@@ -71,13 +70,15 @@ namespace {
class Service:
public cppu::WeakImplHelper3<
css::lang::XServiceInfo, css::registry::XSimpleRegistry,
- css::util::XFlushable >,
- private boost::noncopyable
+ css::util::XFlushable >
{
public:
Service(css::uno::Reference< css::uno::XComponentContext > const & context);
private:
+ Service(const Service&) SAL_DELETED_FUNCTION;
+ Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
virtual ~Service() {}
virtual OUString SAL_CALL getImplementationName()
@@ -151,14 +152,16 @@ private:
};
class RegistryKey:
- public cppu::WeakImplHelper1< css::registry::XRegistryKey >,
- private boost::noncopyable
+ public cppu::WeakImplHelper1< css::registry::XRegistryKey >
{
public:
RegistryKey(Service & service, css::uno::Any const & value):
service_(service), value_(value) {}
private:
+ RegistryKey(const RegistryKey&) SAL_DELETED_FUNCTION;
+ RegistryKey& operator=(const RegistryKey&) SAL_DELETED_FUNCTION;
+
virtual ~RegistryKey() {}
virtual OUString SAL_CALL getKeyName()