summaryrefslogtreecommitdiff
path: root/sdext/source/pdfimport/misc
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-10 21:41:44 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-11 07:15:35 +0000
commitc210bf4510585b554e0e9a371f27fa27e2874762 (patch)
tree62f8c45ab415da97af398508e3ea64329268e7a3 /sdext/source/pdfimport/misc
parentcf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e (diff)
tdf#94306 replace boost::noncopyable r.. to sdext
... in modules reportdesign to sdext Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes. Make some overloaded ctors explicit (most in sd slidesorter). Add deleted copy-assignment in sc/inc/chart2uno.hxx. Change-Id: I21d4209f0ddb00063ca827474516a05ab4bb2f9a Reviewed-on: https://gerrit.libreoffice.org/23970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sdext/source/pdfimport/misc')
-rw-r--r--sdext/source/pdfimport/misc/pwdinteract.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 48c9a7570ddf..ee189ade5bc0 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -23,7 +23,6 @@
#include "pdfihelper.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
@@ -44,8 +43,7 @@ namespace
class PDFPasswordRequest:
public cppu::WeakImplHelper<
- task::XInteractionRequest, task::XInteractionPassword >,
- private boost::noncopyable
+ task::XInteractionRequest, task::XInteractionPassword >
{
private:
mutable osl::Mutex m_aMutex;
@@ -55,6 +53,8 @@ private:
public:
explicit PDFPasswordRequest(bool bFirstTry, const OUString& rName);
+ PDFPasswordRequest(const PDFPasswordRequest&) = delete;
+ PDFPasswordRequest& operator=(const PDFPasswordRequest&) = delete;
// XInteractionRequest
virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException, std::exception) override;
@@ -120,11 +120,12 @@ void PDFPasswordRequest::select() throw (uno::RuntimeException, std::exception)
}
class UnsupportedEncryptionFormatRequest:
- public cppu::WeakImplHelper< task::XInteractionRequest >,
- private boost::noncopyable
+ public cppu::WeakImplHelper< task::XInteractionRequest >
{
public:
UnsupportedEncryptionFormatRequest() {}
+ UnsupportedEncryptionFormatRequest(const UnsupportedEncryptionFormatRequest&) = delete;
+ UnsupportedEncryptionFormatRequest& operator=(const UnsupportedEncryptionFormatRequest&) = delete;
private:
virtual ~UnsupportedEncryptionFormatRequest() {}