summaryrefslogtreecommitdiff
path: root/linguistic
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-09 17:07:54 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-11 07:22:50 +0000
commitd84ef731d8f5d8c1e896ecda3d03d4bb9129578d (patch)
tree582bdc8fc22114031c5564e2abb1691ef56acfe0 /linguistic
parent2553c5b95d4596fc1ef679a42073d5bc62737914 (diff)
tdf#94306 replace boost::noncopyable ...
... in modules editeng to oox. Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes and one unused boost/checked_delete.hpp include in linguistic. Change-Id: I5a38d8e5ac1b4286bdeb3858d56490a53d13fe80 Reviewed-on: https://gerrit.libreoffice.org/23928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'linguistic')
-rw-r--r--linguistic/source/convdiclist.cxx6
-rw-r--r--linguistic/source/lngsvcmgr.cxx8
-rw-r--r--linguistic/source/spelldsp.cxx5
3 files changed, 10 insertions, 9 deletions
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index de7160f10a41..17487591ad31 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
@@ -77,8 +76,7 @@ OUString GetConvDicMainURL( const OUString &rDicName, const OUString &rDirectory
}
class ConvDicNameContainer :
- public cppu::WeakImplHelper< css::container::XNameContainer >,
- private boost::noncopyable
+ public cppu::WeakImplHelper< css::container::XNameContainer >
{
std::vector< uno::Reference< XConversionDictionary > > aConvDics;
@@ -87,6 +85,8 @@ class ConvDicNameContainer :
public:
ConvDicNameContainer();
virtual ~ConvDicNameContainer();
+ ConvDicNameContainer(const ConvDicNameContainer&) = delete;
+ ConvDicNameContainer& operator=(const ConvDicNameContainer&) = delete;
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index d45b4095107e..bb83b7a7b730 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -35,8 +35,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <boost/checked_delete.hpp>
-#include <boost/noncopyable.hpp>
#include <o3tl/make_unique.hxx>
#include "lngsvcmgr.hxx"
@@ -178,8 +176,7 @@ class LngSvcMgrListenerHelper :
<
linguistic2::XLinguServiceEventListener,
linguistic2::XDictionaryListEventListener
- >,
- private boost::noncopyable
+ >
{
LngSvcMgr &rMyManager;
@@ -197,6 +194,9 @@ public:
LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr,
const uno::Reference< linguistic2::XSearchableDictionaryList > &rxDicList );
+ LngSvcMgrListenerHelper(const LngSvcMgrListenerHelper&) = delete;
+ LngSvcMgrListenerHelper& operator=(const LngSvcMgrListenerHelper&) = delete;
+
// lang::XEventListener
virtual void SAL_CALL
disposing( const lang::EventObject& rSource )
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index e1d86ba74ac9..4c8b2300279b 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
#include <com/sun/star/linguistic2/SpellFailure.hpp>
@@ -56,7 +55,7 @@ using namespace linguistic;
// Removing entries is done by assigning the empty string.
// The sequence is constructed from all non empty strings in the original
// while maintaining the order.
-class ProposalList: private boost::noncopyable
+class ProposalList
{
std::vector< OUString > aVec;
@@ -64,6 +63,8 @@ class ProposalList: private boost::noncopyable
public:
ProposalList() {}
+ ProposalList(const ProposalList&) = delete;
+ ProposalList& operator=(const ProposalList&) = delete;
size_t Count() const;
void Prepend( const OUString &rText );