diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-02-04 11:17:10 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2016-02-04 10:58:43 +0000 |
| commit | 40da8f2ae60ceb41ab4dd1052fcfc011f6b8f54b (patch) | |
| tree | 8f107c625f02302701f363990853804a34475a29 /connectivity | |
| parent | d33c002c474a034db9ad7390aec7ced113dcfb3e (diff) | |
mork: boost::noncopyable->'= delete'
Change-Id: Ibe5e44af2348150fef0fa3d3e579ca2893fc6b1c
Reviewed-on: https://gerrit.libreoffice.org/22095
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mork/MDriver.hxx | 7 | ||||
| -rw-r--r-- | connectivity/source/drivers/mork/MQueryHelper.hxx | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index 7f3e75e6d225..205ffeb12f80 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -14,7 +14,6 @@ #include <cassert> -#include <boost/noncopyable.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/DriverPropertyInfo.hpp> @@ -47,8 +46,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(css::uno::Reference< css::uno::XComponentContext > const &); class MorkDriver: - public cppu::WeakImplHelper< css::lang::XServiceInfo, css::sdbc::XDriver >, - private boost::noncopyable + public cppu::WeakImplHelper< css::lang::XServiceInfo, css::sdbc::XDriver > { public: explicit MorkDriver(css::uno::Reference< css::uno::XComponentContext > const context); @@ -61,6 +59,9 @@ public: OUString getProfilePath() {return m_sProfilePath;} private: + MorkDriver(const MorkDriver&) SAL_DELETED_FUNCTION; + MorkDriver& operator=(const MorkDriver&) SAL_DELETED_FUNCTION; + virtual ~MorkDriver() {} virtual OUString SAL_CALL getImplementationName() diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 904026dfe423..278c6d8d4838 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -26,7 +26,6 @@ #include <osl/conditn.hxx> #include <osl/thread.hxx> #include <connectivity/FValue.hxx> -#include <boost/noncopyable.hpp> #include "MErrorResource.hxx" #include <unordered_map> @@ -105,7 +104,7 @@ namespace connectivity const OUString& getValue() const { return m_aValue; } }; - class MQueryExpression : public MQueryExpressionBase, private boost::noncopyable + class MQueryExpression : public MQueryExpressionBase { friend class MQueryHelper; @@ -147,6 +146,9 @@ namespace connectivity ExprVector m_aExprVector; bool_cond m_aExprCondType; + private: + MQueryExpression(const MQueryExpression&) SAL_DELETED_FUNCTION; + MQueryExpression& operator=(const MQueryExpression&) SAL_DELETED_FUNCTION; }; class MQueryHelperResultEntry |