diff options
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/elements.hxx | 4 | ||||
| -rw-r--r-- | jvmfwk/source/libxmlutil.hxx | 14 |
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); |