summaryrefslogtreecommitdiff
path: root/jvmfwk/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /jvmfwk/source
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'jvmfwk/source')
-rw-r--r--jvmfwk/source/elements.hxx4
-rw-r--r--jvmfwk/source/libxmlutil.hxx14
2 files changed, 9 insertions, 9 deletions
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 2fc9a3f3066e..d1a741945fa6 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -263,8 +263,8 @@ public:
class MergedSettings
{
private:
- const MergedSettings& operator = (MergedSettings&) SAL_DELETED_FUNCTION;
- MergedSettings(MergedSettings&) SAL_DELETED_FUNCTION;
+ const MergedSettings& operator = (MergedSettings&) = delete;
+ MergedSettings(MergedSettings&) = delete;
void merge(const NodeJava & share, const NodeJava & user);
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index c83a72240f0d..c9a8f66c59b7 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -28,8 +28,8 @@ namespace jfw
class CXPathObjectPtr
{
xmlXPathObject* _object;
- CXPathObjectPtr & operator = (const CXPathObjectPtr&) SAL_DELETED_FUNCTION;
- CXPathObjectPtr(const CXPathObjectPtr&) SAL_DELETED_FUNCTION;
+ CXPathObjectPtr & operator = (const CXPathObjectPtr&) = delete;
+ CXPathObjectPtr(const CXPathObjectPtr&) = delete;
public:
CXPathObjectPtr();
~CXPathObjectPtr();
@@ -45,8 +45,8 @@ class CXPathContextPtr
{
xmlXPathContext* _object;
- CXPathContextPtr(const jfw::CXPathContextPtr&) SAL_DELETED_FUNCTION;
- CXPathContextPtr & operator = (const CXPathContextPtr&) SAL_DELETED_FUNCTION;
+ CXPathContextPtr(const jfw::CXPathContextPtr&) = delete;
+ CXPathContextPtr & operator = (const CXPathContextPtr&) = delete;
public:
CXPathContextPtr();
CXPathContextPtr(xmlXPathContextPtr aContext);
@@ -61,7 +61,7 @@ class CXmlDocPtr
{
xmlDoc* _object;
- CXmlDocPtr(const CXmlDocPtr&) SAL_DELETED_FUNCTION;
+ CXmlDocPtr(const CXmlDocPtr&) = delete;
public:
CXmlDocPtr & operator = (const CXmlDocPtr&);
@@ -80,8 +80,8 @@ class CXmlCharPtr
{
xmlChar* _object;
- CXmlCharPtr(const CXmlCharPtr&) SAL_DELETED_FUNCTION;
- CXmlCharPtr & operator = (const CXmlCharPtr&) SAL_DELETED_FUNCTION;
+ CXmlCharPtr(const CXmlCharPtr&) = delete;
+ CXmlCharPtr & operator = (const CXmlCharPtr&) = delete;
public:
CXmlCharPtr();
CXmlCharPtr(xmlChar* aDoc);