summaryrefslogtreecommitdiff
path: root/include/filter/msfilter
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 /include/filter/msfilter
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/filter/msfilter')
-rw-r--r--include/filter/msfilter/escherex.hxx4
-rw-r--r--include/filter/msfilter/mscodec.hxx8
-rw-r--r--include/filter/msfilter/msdffimp.hxx2
-rw-r--r--include/filter/msfilter/mstoolbar.hxx8
4 files changed, 11 insertions, 11 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 4f390f5a73be..97e19871c708 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1338,8 +1338,8 @@ public:
sal_uInt16 GetHellLayerId() const { return mnHellLayerId; }
private:
- EscherEx( const EscherEx& ) SAL_DELETED_FUNCTION;
- EscherEx& operator=( const EscherEx& ) SAL_DELETED_FUNCTION;
+ EscherEx( const EscherEx& ) = delete;
+ EscherEx& operator=( const EscherEx& ) = delete;
// prevent C-style cast to former base class EscherGraphicProvider
operator EscherGraphicProvider&();
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index 3f8339910c28..f8f5b728365f 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -122,8 +122,8 @@ protected:
sal_Size mnOffset; /// Key offset.
private:
- MSCodec_Xor95( const MSCodec_Xor95& ) SAL_DELETED_FUNCTION;
- MSCodec_Xor95& operator=( const MSCodec_Xor95& ) SAL_DELETED_FUNCTION;
+ MSCodec_Xor95( const MSCodec_Xor95& ) = delete;
+ MSCodec_Xor95& operator=( const MSCodec_Xor95& ) = delete;
sal_uInt16 mnKey; /// Base key from password.
sal_uInt16 mnHash; /// Hash value from password.
@@ -346,8 +346,8 @@ public:
void GetDigestFromSalt( const sal_uInt8 pSaltData[16], sal_uInt8 pDigest[16] );
private:
- MSCodec_Std97( const MSCodec_Std97& ) SAL_DELETED_FUNCTION;
- MSCodec_Std97& operator=( const MSCodec_Std97& ) SAL_DELETED_FUNCTION;
+ MSCodec_Std97( const MSCodec_Std97& ) = delete;
+ MSCodec_Std97& operator=( const MSCodec_Std97& ) = delete;
rtlCipher m_hCipher;
rtlDigest m_hDigest;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 8e6d419318f4..6d2fe9056e84 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -264,7 +264,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
{ return nShapeId < rEntry.nShapeId; }
private:
- SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) SAL_DELETED_FUNCTION;
+ SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) = delete;
};
/** list of all SvxMSDffImportRec instances of/for a group */
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 8d3704e3a5d8..efe06121754d 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -118,8 +118,8 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase
sal_Int8 tbcu;
sal_Int8 tbmg;
- TBCExtraInfo(const TBCExtraInfo&) SAL_DELETED_FUNCTION;
- TBCExtraInfo& operator = ( const TBCExtraInfo&) SAL_DELETED_FUNCTION;
+ TBCExtraInfo(const TBCExtraInfo&) = delete;
+ TBCExtraInfo& operator = ( const TBCExtraInfo&) = delete;
public:
TBCExtraInfo();
virtual ~TBCExtraInfo(){}
@@ -283,8 +283,8 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase
TBCHeader rHeader;
TBCGeneralInfo controlGeneralInfo;
std::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct
- TBCData(const TBCData&) SAL_DELETED_FUNCTION;
- TBCData& operator = ( const TBCData&) SAL_DELETED_FUNCTION;
+ TBCData(const TBCData&) = delete;
+ TBCData& operator = ( const TBCData&) = delete;
public:
TBCData( const TBCHeader& Header );
virtual ~TBCData(){}