summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-07 12:35:09 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-07 12:36:05 +0100
commiteaa9a73185e7bf9d222a3efab4eff9af05714250 (patch)
tree93b7f2ecd3ffb20d6316f17f95a068a6ab612418
parentloplugin:deletedspecial (diff)
downloadcore-eaa9a73185e7bf9d222a3efab4eff9af05714250.tar.gz
core-eaa9a73185e7bf9d222a3efab4eff9af05714250.zip
loplugin:deletedspecial
Change-Id: I806c9799f6eac357e5f200b53df3a9c1e6ecd841
-rw-r--r--include/xmloff/DocumentSettingsContext.hxx5
-rw-r--r--include/xmloff/SchXMLExportHelper.hxx5
-rw-r--r--include/xmloff/XMLCharContext.hxx4
-rw-r--r--include/xmloff/prhdlfac.hxx4
-rw-r--r--include/xmloff/prstylei.hxx4
-rw-r--r--include/xmloff/txtparae.hxx2
-rw-r--r--include/xmloff/xmlimppr.hxx5
-rw-r--r--include/xmloff/xmlprmap.hxx4
-rw-r--r--include/xmloff/xmlstyle.hxx4
9 files changed, 17 insertions, 20 deletions
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index 24296f36e4da..f39cc200a6ca 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -47,9 +47,8 @@ public:
virtual void EndElement() SAL_OVERRIDE;
private:
- XMLDocumentSettingsContext(); // never implemented
- XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ); // never implemented
- XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ); // never implemented
+ XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION;
+ XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION;
};
#endif
diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index 5149c7a89c19..3585d64d1a03 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -56,9 +56,8 @@ public:
void SetDestinationShellID( const OUString& rShellID );
private:
- SchXMLExportHelper(); // not defined
- SchXMLExportHelper(SchXMLExportHelper &); // not defined
- void operator =(SchXMLExportHelper &); // not defined
+ SchXMLExportHelper(SchXMLExportHelper &) SAL_DELETED_FUNCTION;
+ void operator =(SchXMLExportHelper &) SAL_DELETED_FUNCTION;
private:
SchXMLExportHelper_Impl* m_pImpl;
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index d92193c028d1..a07c8136b183 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -25,8 +25,8 @@
class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
{
- XMLCharContext(const XMLCharContext&);
- void operator =(const XMLCharContext&);
+ XMLCharContext(const XMLCharContext&) SAL_DELETED_FUNCTION;
+ void operator =(const XMLCharContext&) SAL_DELETED_FUNCTION;
protected:
sal_Int16 m_nControl;
sal_uInt16 m_nCount;
diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx
index 1b1822b3404b..89517c358d3b 100644
--- a/include/xmloff/prhdlfac.hxx
+++ b/include/xmloff/prhdlfac.hxx
@@ -41,8 +41,8 @@ class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleRefer
struct Impl;
Impl* mpImpl;
- XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ); // disabled
- XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ); // disabled
+ XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION;
+ XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION;
public:
XMLPropertyHandlerFactory();
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 185e6bff21ad..583f3557843e 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -54,8 +54,8 @@ private:
static OldFillStyleDefinitionSet maFooterSet;
static OldFillStyleDefinitionSet maParaSet;
- SAL_DLLPRIVATE XMLPropStyleContext(XMLPropStyleContext &); // not defined
- SAL_DLLPRIVATE void operator =(XMLPropStyleContext &); // not defined
+ XMLPropStyleContext(XMLPropStyleContext &) SAL_DELETED_FUNCTION;
+ void operator =(XMLPropStyleContext &) SAL_DELETED_FUNCTION;
protected:
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 75be14a19562..376fe42e9487 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -672,7 +672,7 @@ public:
void PopTextListsHelper();
private:
- XMLTextParagraphExport(XMLTextParagraphExport &); // private copy-ctor because of explicit copy-ctor of unique_ptr
+ XMLTextParagraphExport(XMLTextParagraphExport &) SAL_DELETED_FUNCTION;
};
inline const XMLTextListAutoStylePool&
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 33679a1607da..f4b271f3f289 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -57,9 +57,8 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public salhelper::SimpleRefer
SvXMLImport& rImport; // access to error handling
- SAL_DLLPRIVATE SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &);
- // not defined
- SAL_DLLPRIVATE void operator =(SvXMLImportPropertyMapper &); // not defined
+ SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION;
+ void operator =(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION;
protected:
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index dda84bde7eec..569adfa6552b 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -39,8 +39,8 @@ class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public salhelper::SimpleReferenceO
Impl* mpImpl;
- XMLPropertySetMapper( const XMLPropertySetMapper& ); // disabled.
- XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ); // disabled.
+ XMLPropertySetMapper( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION;
+ XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION;
public:
/** The last element of the XMLPropertyMapEntry-array must contain NULL-values.
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 73bcfc6ecba1..bc8d4b692baf 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -186,8 +186,8 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap();
- SAL_DLLPRIVATE SvXMLStylesContext(SvXMLStylesContext &); // not defined
- SAL_DLLPRIVATE void operator =(SvXMLStylesContext &); // not defined
+ SvXMLStylesContext(SvXMLStylesContext &) SAL_DELETED_FUNCTION;
+ void operator =(SvXMLStylesContext &) SAL_DELETED_FUNCTION;
protected: