summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-08 14:58:51 +0200
committerDavid Tardon <dtardon@redhat.com>2016-04-08 17:42:57 +0000
commit922ee9a9da62febfe38a7780b11cf0d7ea0d5685 (patch)
treec9e59d34db8a32b17894991b6f377101990bc7fe /dbaccess
parent25934decf8bfd94506bccd48ac66be9d7eb4dce2 (diff)
tdf#94306 replace boost::noncopyable in d...
dbaccess, desktop and drawinglayer. Replace with C++11 delete copy-constructur and copy-assignment. Nothing special, only one unused include in dbaccess/source/filter/xml/xmlfilter.cxx. Change-Id: Iebabbc658215162450d4caf08d4fb2f116c456d9 Reviewed-on: https://gerrit.libreoffice.org/23918 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.cxx6
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.hxx7
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.cxx5
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.hxx5
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx1
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.cxx5
-rw-r--r--dbaccess/source/ui/app/AppController.cxx12
-rw-r--r--dbaccess/source/ui/inc/defaultobjectnamecheck.hxx13
8 files changed, 32 insertions, 22 deletions
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index b6f02305b83c..e86b957d141f 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -21,7 +21,6 @@
#include "apitools.hxx"
#include "dbastrings.hrc"
-#include <boost/noncopyable.hpp>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
@@ -41,14 +40,15 @@ namespace dbaccess
/// helper class for column property change events which holds the OComponentDefinition weak
class OColumnPropertyListener:
- public ::cppu::WeakImplHelper< XPropertyChangeListener >,
- private boost::noncopyable
+ public ::cppu::WeakImplHelper< XPropertyChangeListener >
{
OComponentDefinition* m_pComponent;
protected:
virtual ~OColumnPropertyListener(){}
public:
explicit OColumnPropertyListener(OComponentDefinition* _pComponent) : m_pComponent(_pComponent){}
+ OColumnPropertyListener(const OColumnPropertyListener&) = delete;
+ const OColumnPropertyListener& operator=(const OColumnPropertyListener&) = delete;
// XPropertyChangeListener
virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) override
{
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 06f2c6a232ba..61bdeed83e4f 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -59,8 +59,6 @@
#include <cppuhelper/implbase3.hxx>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
-
namespace comphelper {
class NamedValueCollection;
}
@@ -78,7 +76,7 @@ typedef ::std::vector< css::uno::Reference< css::frame::XController > > Contro
/** helper class monitoring the views of a document, and firing appropriate events
when views are attached / detached
*/
-class ViewMonitor : public boost::noncopyable
+class ViewMonitor
{
public:
explicit ViewMonitor( DocumentEventNotifier& _rEventNotifier )
@@ -90,6 +88,9 @@ public:
{
}
+ ViewMonitor(const ViewMonitor&) = delete;
+ const ViewMonitor& operator=(const ViewMonitor&) = delete;
+
void reset()
{
m_bEverHadController = false;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 08728a6b49dd..db67d23352b2 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -27,7 +27,6 @@
#include <algorithm>
#include <functional>
-#include <boost/noncopyable.hpp>
#include <o3tl/functional.hxx>
namespace dbaccess
@@ -46,7 +45,7 @@ namespace dbaccess
using ::com::sun::star::uno::Type;
// DocumentEvents_Data
- struct DocumentEvents_Data : public ::boost::noncopyable
+ struct DocumentEvents_Data
{
::cppu::OWeakObject& rParent;
::osl::Mutex& rMutex;
@@ -58,6 +57,8 @@ namespace dbaccess
,rEventsData( _rEventsData )
{
}
+ DocumentEvents_Data(const DocumentEvents_Data&) = delete;
+ const DocumentEvents_Data& operator=(const DocumentEvents_Data&) = delete;
};
// helper
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx
index 5c304b67e1e8..8279682f4a50 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -27,7 +27,6 @@
#include <memory>
#include <map>
-#include <boost/noncopyable.hpp>
namespace dbaccess
{
@@ -42,12 +41,14 @@ namespace dbaccess
> DocumentEvents_Base;
class DocumentEvents :public DocumentEvents_Base
- ,public ::boost::noncopyable
{
public:
DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData );
virtual ~DocumentEvents();
+ DocumentEvents(const DocumentEvents&) = delete;
+ const DocumentEvents& operator=(const DocumentEvents&) = delete;
+
static bool needsSynchronousNotification( const OUString& _rEventName );
// XInterface
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 340360e59b30..a9ebf6c5b2c8 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index f243ab4c8dd8..e6a5b4499df7 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -34,7 +34,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sdbtools
@@ -233,9 +232,11 @@ namespace sdbtools
};
// NameCheckFactory
- class NameCheckFactory: private boost::noncopyable
+ class NameCheckFactory
{
public:
+ NameCheckFactory(const NameCheckFactory&) = delete;
+ const NameCheckFactory& operator=(const NameCheckFactory&) = delete;
/** creates an INameValidation instance which can be used to check the existence of query or table names
@param _rContext
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 1f7bc25fe65f..f5800c84a832 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -123,8 +123,6 @@
#include <functional>
-#include <boost/noncopyable.hpp>
-
extern "C" void SAL_CALL createRegistryInfo_ODBApplication()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
@@ -184,7 +182,7 @@ Reference< XInterface > SAL_CALL OApplicationController::Create(const Reference<
}
// OApplicationController
-class SelectionNotifier : public ::boost::noncopyable
+class SelectionNotifier
{
private:
::comphelper::OInterfaceContainerHelper2 m_aSelectionListeners;
@@ -199,6 +197,9 @@ public:
{
}
+ SelectionNotifier(const SelectionNotifier&) = delete;
+ const SelectionNotifier& operator=(const SelectionNotifier&) = delete;
+
void addListener( const Reference< XSelectionChangeListener >& _Listener )
{
m_aSelectionListeners.addInterface( _Listener );
@@ -248,7 +249,7 @@ public:
}
};
-class SelectionGuard : public ::boost::noncopyable
+class SelectionGuard
{
public:
explicit SelectionGuard( SelectionNotifier& _rNotifier )
@@ -262,6 +263,9 @@ public:
m_rNotifier.leaveSelection( SelectionNotifier::SelectionGuardAccess() );
}
+ SelectionGuard(const SelectionGuard&) = delete;
+ const SelectionGuard& operator=(const SelectionGuard&) = delete;
+
private:
SelectionNotifier& m_rNotifier;
};
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index b0e2fdfd4007..7087d7f87deb 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <memory>
-#include <boost/noncopyable.hpp>
namespace dbaui
{
@@ -37,8 +36,7 @@ namespace dbaui
/** class implementing the IObjectNameCheck interface, and checking given object names
against a hierarchical name container
*/
- class HierarchicalNameCheck :public ::boost::noncopyable
- ,public IObjectNameCheck
+ class HierarchicalNameCheck :public IObjectNameCheck
{
private:
std::unique_ptr< HierarchicalNameCheck_Impl > m_pImpl;
@@ -60,6 +58,9 @@ namespace dbaui
virtual ~HierarchicalNameCheck();
+ HierarchicalNameCheck(const HierarchicalNameCheck&) = delete;
+ const HierarchicalNameCheck& operator=(const HierarchicalNameCheck&) = delete;
+
// IObjectNameCheck overridables
virtual bool isNameValid(
const OUString& _rObjectName,
@@ -85,8 +86,7 @@ namespace dbaui
@seealso dbtools::DatabaseMetaData::supportsSubqueriesInFrom
@seealso css::sdb::tools::XObjectNames::checkNameForCreate
*/
- class DynamicTableOrQueryNameCheck :public ::boost::noncopyable
- ,public IObjectNameCheck
+ class DynamicTableOrQueryNameCheck :public IObjectNameCheck
{
private:
std::unique_ptr< DynamicTableOrQueryNameCheck_Impl > m_pImpl;
@@ -110,6 +110,9 @@ namespace dbaui
virtual ~DynamicTableOrQueryNameCheck();
+ DynamicTableOrQueryNameCheck(const DynamicTableOrQueryNameCheck&) = delete;
+ const DynamicTableOrQueryNameCheck& operator=(const DynamicTableOrQueryNameCheck&) = delete;
+
// IObjectNameCheck overridables
virtual bool isNameValid(
const OUString& _rObjectName,