summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-07 12:28:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-07 12:36:02 +0100
commitfe5644984ac145169eaaa91c8ed4450481edfc1c (patch)
tree3bc8d4cff16bd84382065e6b7321eae0d7c1caeb
parent68adf20e1e89d6e19e8122b600c0fb675eaebdbd (diff)
loplugin:deletedspecial
Change-Id: I2a3d9deb9c71bb4dfe3ad9076d7202636001e0bb
-rw-r--r--shell/inc/internal/xml_parser.hxx6
-rw-r--r--shell/source/sessioninstall/SyncDbusSessionHelper.hxx5
-rw-r--r--shell/source/tools/lngconvex/cmdline.hxx8
3 files changed, 11 insertions, 8 deletions
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 7dc51c79a355..44094e5d9383 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -23,6 +23,7 @@
#include <expat.h>
#include <stdexcept>
+#include <sal/types.h>
class xml_parser_exception : public std::runtime_error
{
@@ -111,10 +112,9 @@ private:
i_xml_parser_event_handler* document_handler_;
XML_Parser xml_parser_;
-// prevent copy and assignment
private:
- xml_parser(const xml_parser&);
- xml_parser& operator=(const xml_parser&);
+ xml_parser(const xml_parser&) SAL_DELETED_FUNCTION;
+ xml_parser& operator=(const xml_parser&) SAL_DELETED_FUNCTION;
};
#endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index b10d7a9e77c0..20116522a056 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -50,9 +50,8 @@ namespace shell { namespace sessioninstall
{ throw ::com::sun::star::uno::RuntimeException(); } // not implemented
private:
- SyncDbusSessionHelper(); // never implemented
- SyncDbusSessionHelper( const SyncDbusSessionHelper& ); // never implemented
- SyncDbusSessionHelper& operator=( const SyncDbusSessionHelper& ); // never implemented
+ SyncDbusSessionHelper( const SyncDbusSessionHelper& ) SAL_DELETED_FUNCTION;
+ SyncDbusSessionHelper& operator=( const SyncDbusSessionHelper& ) SAL_DELETED_FUNCTION;
};
}}
diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx
index 9de7ef307b77..99fc7b2d7e03 100644
--- a/shell/source/tools/lngconvex/cmdline.hxx
+++ b/shell/source/tools/lngconvex/cmdline.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX
#define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX
+#include <sal/config.h>
+
+#include <sal/types.h>
+
#include "defs.hxx"
@@ -70,8 +74,8 @@ private:
// prevent copy and assignment
private:
- CommandLine(const CommandLine&);
- CommandLine& operator=(const CommandLine&);
+ CommandLine(const CommandLine&) SAL_DELETED_FUNCTION;
+ CommandLine& operator=(const CommandLine&) SAL_DELETED_FUNCTION;
};
#endif