diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8toolbar.hxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8toolbar.hxx | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index e52b92739ec1..7c4b7d7d96c0 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -55,8 +55,8 @@ class SwCTB : public TBBase sal_Int32 cCtls; std::vector< SwTBC > rTBC; - SwCTB(const SwCTB&) SAL_DELETED_FUNCTION; - SwCTB& operator = ( const SwCTB&) SAL_DELETED_FUNCTION; + SwCTB(const SwCTB&) = delete; + SwCTB& operator = ( const SwCTB&) = delete; public: SwCTB(); @@ -100,8 +100,8 @@ class Tcg255SubStruct : public TBBase friend class Tcg255; bool mbReadId; - Tcg255SubStruct(const Tcg255SubStruct&) SAL_DELETED_FUNCTION; - Tcg255SubStruct& operator = ( const Tcg255SubStruct&) SAL_DELETED_FUNCTION; + Tcg255SubStruct(const Tcg255SubStruct&) = delete; + Tcg255SubStruct& operator = ( const Tcg255SubStruct&) = delete; protected: sal_uInt8 ch; @@ -158,8 +158,8 @@ class SwCTBWrapper : public Tcg255SubStruct std::vector< SwTBC > rtbdc; std::vector< Customization > rCustomizations; // array of Customizations std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu - SwCTBWrapper(const SwCTBWrapper&) SAL_DELETED_FUNCTION; - SwCTBWrapper& operator = ( const SwCTBWrapper&) SAL_DELETED_FUNCTION; + SwCTBWrapper(const SwCTBWrapper&) = delete; + SwCTBWrapper& operator = ( const SwCTBWrapper&) = delete; public: explicit SwCTBWrapper( bool bReadId = true ); @@ -202,8 +202,8 @@ class PlfMcd : public Tcg255SubStruct { sal_Int32 iMac; std::vector<MCD> rgmcd; // array of MCD's - PlfMcd(const PlfMcd&) SAL_DELETED_FUNCTION; - PlfMcd& operator = ( const PlfMcd&) SAL_DELETED_FUNCTION; + PlfMcd(const PlfMcd&) = delete; + PlfMcd& operator = ( const PlfMcd&) = delete; public: explicit PlfMcd( bool bReadId = true ); @@ -217,8 +217,8 @@ class Acd : public TBBase { sal_Int16 ibst; sal_uInt16 fciBasedOnABC; // fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit) - Acd(const Acd&) SAL_DELETED_FUNCTION; - Acd& operator = ( const Acd&) SAL_DELETED_FUNCTION; + Acd(const Acd&) = delete; + Acd& operator = ( const Acd&) = delete; public: Acd(); @@ -233,8 +233,8 @@ class PlfAcd: public Tcg255SubStruct { sal_Int32 iMac; Acd* rgacd; - PlfAcd(const PlfAcd&) SAL_DELETED_FUNCTION; - PlfAcd& operator = ( const PlfAcd&) SAL_DELETED_FUNCTION; + PlfAcd(const PlfAcd&) = delete; + PlfAcd& operator = ( const PlfAcd&) = delete; public: explicit PlfAcd( bool bReadId = true ); @@ -254,8 +254,8 @@ class Kme : public TBBase sal_uInt16 kt; //A Kt that specifies the type of action to be taken when the key combination is pressed. sal_uInt32 param; //The meaning of this field depends on the value of kt - Kme(const Kme&) SAL_DELETED_FUNCTION; - Kme& operator = ( const Kme&) SAL_DELETED_FUNCTION; + Kme(const Kme&) = delete; + Kme& operator = ( const Kme&) = delete; public: Kme(); @@ -270,8 +270,8 @@ class PlfKme : public Tcg255SubStruct { sal_Int32 iMac; Kme* rgkme; - PlfKme(const PlfKme&) SAL_DELETED_FUNCTION; - PlfKme& operator = ( const PlfKme&) SAL_DELETED_FUNCTION; + PlfKme(const PlfKme&) = delete; + PlfKme& operator = ( const PlfKme&) = delete; public: explicit PlfKme( bool bReadId = true ); @@ -296,8 +296,8 @@ class TcgSttbfCore : public TBBase sal_uInt16 cData; sal_uInt16 cbExtra; SBBItem* dataItems; - TcgSttbfCore(const TcgSttbfCore&) SAL_DELETED_FUNCTION; - TcgSttbfCore& operator = ( const TcgSttbfCore&) SAL_DELETED_FUNCTION; + TcgSttbfCore(const TcgSttbfCore&) = delete; + TcgSttbfCore& operator = ( const TcgSttbfCore&) = delete; public: TcgSttbfCore(); @@ -311,8 +311,8 @@ public: class TcgSttbf : public Tcg255SubStruct { TcgSttbfCore sttbf; - TcgSttbf(const TcgSttbf&) SAL_DELETED_FUNCTION; - TcgSttbf& operator = ( const TcgSttbf&) SAL_DELETED_FUNCTION; + TcgSttbf(const TcgSttbf&) = delete; + TcgSttbf& operator = ( const TcgSttbf&) = delete; public: explicit TcgSttbf( bool bReadId = true ); @@ -328,8 +328,8 @@ class Xstz : public TBBase Xst xst; //An Xst specifying the string with its pre-pended length. sal_uInt16 chTerm; - Xstz(const Xstz&) SAL_DELETED_FUNCTION; - Xstz& operator = ( const Xstz&) SAL_DELETED_FUNCTION; + Xstz(const Xstz&) = delete; + Xstz& operator = ( const Xstz&) = delete; public: Xstz(); @@ -344,8 +344,8 @@ class MacroName : public TBBase { sal_uInt16 ibst; //An unsigned integer that specifies the index of the current entry in the macro name table. MUST NOT be the same as the index of any other entry. Xstz xstz; - MacroName(const MacroName&) SAL_DELETED_FUNCTION; - MacroName& operator = ( const MacroName&) SAL_DELETED_FUNCTION; + MacroName(const MacroName&) = delete; + MacroName& operator = ( const MacroName&) = delete; public: MacroName(); @@ -361,8 +361,8 @@ class MacroNames : public Tcg255SubStruct sal_uInt16 iMac; //An unsigned integer that specifies the number of MacroName structures in rgNames. MacroName* rgNames; - MacroNames(const MacroNames&) SAL_DELETED_FUNCTION; - MacroNames& operator = ( const MacroNames&) SAL_DELETED_FUNCTION; + MacroNames(const MacroNames&) = delete; + MacroNames& operator = ( const MacroNames&) = delete; public: explicit MacroNames( bool bReadId = true ); @@ -376,8 +376,8 @@ public: class Tcg255 : public TBBase { std::vector< Tcg255SubStruct* > rgtcgData; // array of sub structures - Tcg255(const Tcg255&) SAL_DELETED_FUNCTION; - Tcg255& operator = ( const Tcg255&) SAL_DELETED_FUNCTION; + Tcg255(const Tcg255&) = delete; + Tcg255& operator = ( const Tcg255&) = delete; bool processSubStruct( sal_uInt8 nId, SvStream& ); public: @@ -394,8 +394,8 @@ class Tcg: public TBBase { sal_Int8 nTcgVer; std::unique_ptr< Tcg255 > tcg; - Tcg(const Tcg&) SAL_DELETED_FUNCTION; - Tcg& operator = ( const Tcg&) SAL_DELETED_FUNCTION; + Tcg(const Tcg&) = delete; + Tcg& operator = ( const Tcg&) = delete; public: Tcg(); |