From bff4c13475957863bfa7da5bc3bcf82a64a7503a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 15:25:41 +0200 Subject: Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3 --- sw/source/filter/inc/msfilter.hxx | 4 +- sw/source/filter/inc/wrtswtbl.hxx | 2 +- sw/source/filter/ww8/docxexport.hxx | 4 +- sw/source/filter/ww8/escher.hxx | 8 ++-- sw/source/filter/ww8/rtfexport.hxx | 4 +- sw/source/filter/ww8/sortedarray.hxx | 4 +- sw/source/filter/ww8/writerhelper.hxx | 4 +- sw/source/filter/ww8/wrtww8.hxx | 80 +++++++++++++++++------------------ sw/source/filter/ww8/ww8glsy.hxx | 4 +- sw/source/filter/ww8/ww8par.hxx | 46 ++++++++++---------- sw/source/filter/ww8/ww8par2.hxx | 10 ++--- sw/source/filter/ww8/ww8scan.hxx | 48 ++++++++++----------- sw/source/filter/ww8/ww8toolbar.hxx | 60 +++++++++++++------------- 13 files changed, 139 insertions(+), 139 deletions(-) (limited to 'sw/source/filter') diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 78d835381c9a..5855235764cf 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -362,7 +362,7 @@ namespace sw explicit SetInDocAndDelete(SwDoc &rDoc) : mrDoc(rDoc) {} void operator()(SwFltStackEntry *pEntry); private: - SetInDocAndDelete& operator=(const SetInDocAndDelete&) SAL_DELETED_FUNCTION; + SetInDocAndDelete& operator=(const SetInDocAndDelete&) = delete; }; /** @@ -381,7 +381,7 @@ namespace sw pEntry->SetEndPos(mrPos); } private: - SetEndIfOpen& operator=(const SetEndIfOpen&) SAL_DELETED_FUNCTION; + SetEndIfOpen& operator=(const SetEndIfOpen&) = delete; }; /** diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 8c7569197f24..144b19b81dda 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -102,7 +102,7 @@ class SW_DLLPUBLIC SwWriteTableRow // Forbidden and not implemented. SwWriteTableRow(); - SwWriteTableRow & operator= (const SwWriteTableRow &) SAL_DELETED_FUNCTION; + SwWriteTableRow & operator= (const SwWriteTableRow &) = delete; protected: // GCC >= 3.4 needs accessible T (const T&) to pass T as const T& argument. diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index b88ba27c2d50..24953b710743 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -277,9 +277,9 @@ public: void SetFS(::sax_fastparser::FSHelperPtr mpFS); private: - DocxExport( const DocxExport& ) SAL_DELETED_FUNCTION; + DocxExport( const DocxExport& ) = delete; - DocxExport& operator=( const DocxExport& ) SAL_DELETED_FUNCTION; + DocxExport& operator=( const DocxExport& ) = delete; }; #endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORT_HXX diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index 8acf8a68726d..e723b81e7f54 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -131,8 +131,8 @@ public: void PreWriteHyperlinkWithinFly(const SwFrameFormat& rFormat,EscherPropertyContainer& rPropOpt); private: - SwBasicEscherEx(const SwBasicEscherEx&) SAL_DELETED_FUNCTION; - SwBasicEscherEx& operator=(const SwBasicEscherEx&) SAL_DELETED_FUNCTION; + SwBasicEscherEx(const SwBasicEscherEx&) = delete; + SwBasicEscherEx& operator=(const SwBasicEscherEx&) = delete; }; class SwEscherEx : public SwBasicEscherEx @@ -172,8 +172,8 @@ public: EscherExHostAppData* StartShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;} private: - SwEscherEx(const SwEscherEx&) SAL_DELETED_FUNCTION; - SwEscherEx &operator=(const SwEscherEx&) SAL_DELETED_FUNCTION; + SwEscherEx(const SwEscherEx&) = delete; + SwEscherEx &operator=(const SwEscherEx&) = delete; }; #endif diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index b602d63a9e61..e3af02f88c87 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -192,9 +192,9 @@ public: OString* GetStyle(sal_uInt16 nId); private: - RtfExport(const RtfExport&) SAL_DELETED_FUNCTION; + RtfExport(const RtfExport&) = delete; - RtfExport& operator=(const RtfExport&) SAL_DELETED_FUNCTION; + RtfExport& operator=(const RtfExport&) = delete; void WriteFonts(); void WriteStyles(); diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index 15d48c3e9075..31943868e6e4 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.hxx @@ -41,8 +41,8 @@ namespace ww C *mpWwSprmTab; size_t mnNoElems; - SortedArray(const SortedArray&) SAL_DELETED_FUNCTION; - SortedArray& operator=(const SortedArray&) SAL_DELETED_FUNCTION; + SortedArray(const SortedArray&) = delete; + SortedArray& operator=(const SortedArray&) = delete; public: //Find an entry, return its address if found and 0 if not const C *search(C aSrch) const diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index d10f8e3c0c75..29f231ab1b5b 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -879,8 +879,8 @@ namespace sw */ bool TransferToDoc(OUString &rName); private: - DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&) SAL_DELETED_FUNCTION; - DrawingOLEAdaptor(const DrawingOLEAdaptor &rDoc) SAL_DELETED_FUNCTION; + DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&) = delete; + DrawingOLEAdaptor(const DrawingOLEAdaptor &rDoc) = delete; }; } } diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 7684aa3a8f9b..005138bf00b1 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -242,8 +242,8 @@ class WW8_WrPlcSepx : public MSWordSections bool m_bHeaderFooterWritten; WW8_WrPlc0* pTextPos; // Position of the headers/footers - WW8_WrPlcSepx( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION; - WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION; + WW8_WrPlcSepx( const WW8_WrPlcSepx& ) = delete; + WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) = delete; public: explicit WW8_WrPlcSepx( MSWordExportBase& rExport ); @@ -376,8 +376,8 @@ public: DrawObjVector &GetObjArr() { return maDrawObjs; } virtual ~PlcDrawObj(); private: - PlcDrawObj(const PlcDrawObj&) SAL_DELETED_FUNCTION; - PlcDrawObj& operator=(const PlcDrawObj&) SAL_DELETED_FUNCTION; + PlcDrawObj(const PlcDrawObj&) = delete; + PlcDrawObj& operator=(const PlcDrawObj&) = delete; }; class MainTextPlcDrawObj : public PlcDrawObj @@ -389,8 +389,8 @@ private: sal_uInt32 nLen) const SAL_OVERRIDE; virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE; private: - MainTextPlcDrawObj(const MainTextPlcDrawObj&) SAL_DELETED_FUNCTION; - MainTextPlcDrawObj& operator=(const MainTextPlcDrawObj&) SAL_DELETED_FUNCTION; + MainTextPlcDrawObj(const MainTextPlcDrawObj&) = delete; + MainTextPlcDrawObj& operator=(const MainTextPlcDrawObj&) = delete; }; class HdFtPlcDrawObj : public PlcDrawObj @@ -402,8 +402,8 @@ private: sal_uInt32 nLen) const SAL_OVERRIDE; virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const SAL_OVERRIDE; private: - HdFtPlcDrawObj(const HdFtPlcDrawObj&) SAL_DELETED_FUNCTION; - HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) SAL_DELETED_FUNCTION; + HdFtPlcDrawObj(const HdFtPlcDrawObj&) = delete; + HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) = delete; }; typedef ::std::pair aBookmarkPair; @@ -878,8 +878,8 @@ public: static void CorrectTabStopInSet( SfxItemSet& rSet, sal_uInt16 nAbsLeft ); private: - MSWordExportBase( const MSWordExportBase& ) SAL_DELETED_FUNCTION; - MSWordExportBase& operator=( const MSWordExportBase& ) SAL_DELETED_FUNCTION; + MSWordExportBase( const MSWordExportBase& ) = delete; + MSWordExportBase& operator=( const MSWordExportBase& ) = delete; }; /// The writer class that gets called for the WW8 filter. @@ -935,8 +935,8 @@ public: SfxMedium* GetMedia() { return mpMedium; } private: - SwWW8Writer(const SwWW8Writer&) SAL_DELETED_FUNCTION; - SwWW8Writer& operator=(const SwWW8Writer&) SAL_DELETED_FUNCTION; + SwWW8Writer(const SwWW8Writer&) = delete; + SwWW8Writer& operator=(const SwWW8Writer&) = delete; }; /// Exporter of the binary Word file formats. @@ -1153,15 +1153,15 @@ protected: virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE; private: - WW8Export(const WW8Export&) SAL_DELETED_FUNCTION; - WW8Export& operator=(const WW8Export&) SAL_DELETED_FUNCTION; + WW8Export(const WW8Export&) = delete; + WW8Export& operator=(const WW8Export&) = delete; }; class WW8_WrPlcSubDoc // double Plc for Footnotes/Endnotes and Postits { private: - WW8_WrPlcSubDoc(const WW8_WrPlcSubDoc&) SAL_DELETED_FUNCTION; - WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&) SAL_DELETED_FUNCTION; + WW8_WrPlcSubDoc(const WW8_WrPlcSubDoc&) = delete; + WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&) = delete; protected: std::vector aCps; std::vector aContent; // PTRARR of SwFormatFootnote/PostIts/.. @@ -1184,8 +1184,8 @@ class WW8_WrPlcFootnoteEdn : public WW8_WrPlcSubDoc private: sal_uInt8 nTyp; - WW8_WrPlcFootnoteEdn(const WW8_WrPlcFootnoteEdn&) SAL_DELETED_FUNCTION; - WW8_WrPlcFootnoteEdn& operator=(WW8_WrPlcFootnoteEdn &) SAL_DELETED_FUNCTION; + WW8_WrPlcFootnoteEdn(const WW8_WrPlcFootnoteEdn&) = delete; + WW8_WrPlcFootnoteEdn& operator=(WW8_WrPlcFootnoteEdn &) = delete; public: explicit WW8_WrPlcFootnoteEdn( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {} @@ -1210,8 +1210,8 @@ struct WW8_Annotation class WW8_WrPlcAnnotations : public WW8_WrPlcSubDoc // double Plc for Postits { private: - WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&) SAL_DELETED_FUNCTION; - WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations&) SAL_DELETED_FUNCTION; + WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&) = delete; + WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations&) = delete; std::set maProcessedRedlines; std::map m_aRangeStartPositions; @@ -1234,8 +1234,8 @@ private: std::vector aShapeIds; // VARARR of ShapeIds for the SwFrameFormats virtual const std::vector* GetShapeIdArr() const SAL_OVERRIDE; - WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION; - WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION; + WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) = delete; + WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) = delete; public: explicit WW8_WrPlcTextBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {} @@ -1263,8 +1263,8 @@ private: sal_uInt16 nFkpStartPage; ePLCFT ePlc; - WW8_WrPlcPn(const WW8_WrPlcPn&) SAL_DELETED_FUNCTION; - WW8_WrPlcPn& operator=(const WW8_WrPlcPn&) SAL_DELETED_FUNCTION; + WW8_WrPlcPn(const WW8_WrPlcPn&) = delete; + WW8_WrPlcPn& operator=(const WW8_WrPlcPn&) = delete; public: WW8_WrPlcPn( WW8Export& rWrt, ePLCFT ePl, WW8_FC nStartFc ); ~WW8_WrPlcPn(); @@ -1283,8 +1283,8 @@ private: sal_uLong nDataLen; sal_uInt16 nStructSiz; - WW8_WrPlc1(const WW8_WrPlc1&) SAL_DELETED_FUNCTION; - WW8_WrPlc1& operator=(const WW8_WrPlc1&) SAL_DELETED_FUNCTION; + WW8_WrPlc1(const WW8_WrPlc1&) = delete; + WW8_WrPlc1& operator=(const WW8_WrPlc1&) = delete; protected: sal_uInt16 Count() const { return aPos.size(); } void Write( SvStream& rStrm ); @@ -1303,8 +1303,8 @@ private: sal_uInt8 nTextTyp; sal_uInt16 nResults; - WW8_WrPlcField(const WW8_WrPlcField&) SAL_DELETED_FUNCTION; - WW8_WrPlcField& operator=(const WW8_WrPlcField&) SAL_DELETED_FUNCTION; + WW8_WrPlcField(const WW8_WrPlcField&) = delete; + WW8_WrPlcField& operator=(const WW8_WrPlcField&) = delete; public: WW8_WrPlcField( sal_uInt16 nStructSz, sal_uInt8 nTTyp ) : WW8_WrPlc1( nStructSz ), nTextTyp( nTTyp ), nResults(0) @@ -1317,8 +1317,8 @@ public: class WW8_WrMagicTable : public WW8_WrPlc1 { private: - WW8_WrMagicTable(const WW8_WrMagicTable&) SAL_DELETED_FUNCTION; - WW8_WrMagicTable& operator=(const WW8_WrMagicTable&) SAL_DELETED_FUNCTION; + WW8_WrMagicTable(const WW8_WrMagicTable&) = delete; + WW8_WrMagicTable& operator=(const WW8_WrMagicTable&) = delete; public: WW8_WrMagicTable() : WW8_WrPlc1( 4 ) {Append(0,0);} void Append( WW8_CP nCp, sal_uLong nData ); @@ -1368,8 +1368,8 @@ private: static void WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 mm, sal_uInt16 nWidth, sal_uInt16 nHeight); void WriteGrfForBullet(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight); - SwWW8WrGrf(const SwWW8WrGrf&) SAL_DELETED_FUNCTION; - SwWW8WrGrf& operator=(const SwWW8WrGrf&) SAL_DELETED_FUNCTION; + SwWW8WrGrf(const SwWW8WrGrf&) = delete; + SwWW8WrGrf& operator=(const SwWW8WrGrf&) = delete; public: explicit SwWW8WrGrf( WW8Export& rW ) : rWrt( rW ), mnIdx( 0 ) {} void Insert(const sw::Frame &rFly); @@ -1385,8 +1385,8 @@ class MSWordAttrIter { private: MSWordAttrIter* pOld; - MSWordAttrIter(const MSWordAttrIter&) SAL_DELETED_FUNCTION; - MSWordAttrIter& operator=(const MSWordAttrIter&) SAL_DELETED_FUNCTION; + MSWordAttrIter(const MSWordAttrIter&) = delete; + MSWordAttrIter& operator=(const MSWordAttrIter&) = delete; protected: MSWordExportBase& m_rExport; public: @@ -1418,8 +1418,8 @@ private: void SetItemsThatDifferFromStandard(bool bCharAttr, SfxItemSet& rSet); - MSWord_SdrAttrIter(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION; - MSWord_SdrAttrIter& operator=(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION; + MSWord_SdrAttrIter(const MSWord_SdrAttrIter&) = delete; + MSWord_SdrAttrIter& operator=(const MSWord_SdrAttrIter&) = delete; public: MSWord_SdrAttrIter( MSWordExportBase& rWr, const EditTextObject& rEditObj, sal_uInt8 nType ); @@ -1475,8 +1475,8 @@ private: void IterToCurrent(); - SwWW8AttrIter(const SwWW8AttrIter&) SAL_DELETED_FUNCTION; - SwWW8AttrIter& operator=(const SwWW8AttrIter&) SAL_DELETED_FUNCTION; + SwWW8AttrIter(const SwWW8AttrIter&) = delete; + SwWW8AttrIter& operator=(const SwWW8AttrIter&) = delete; public: SwWW8AttrIter( MSWordExportBase& rWr, const SwTextNode& rNd ); @@ -1544,8 +1544,8 @@ class MSWordStyles void OutputStyle( SwFormat* pFormat, sal_uInt16 nPos ); void OutputStyle( const SwNumRule* pNumRule, sal_uInt16 nPos ); - MSWordStyles( const MSWordStyles& ) SAL_DELETED_FUNCTION; - MSWordStyles& operator=( const MSWordStyles& ) SAL_DELETED_FUNCTION; + MSWordStyles( const MSWordStyles& ) = delete; + MSWordStyles& operator=( const MSWordStyles& ) = delete; public: MSWordStyles( MSWordExportBase& rExport, bool bListStyles = false ); diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index b14f1268afd8..a375f1dd06c0 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -75,8 +75,8 @@ private: const ::std::vector& rExtra); static bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx); - WW8Glossary(const WW8Glossary&) SAL_DELETED_FUNCTION; - WW8Glossary& operator=(const WW8Glossary&) SAL_DELETED_FUNCTION; + WW8Glossary(const WW8Glossary&) = delete; + WW8Glossary& operator=(const WW8Glossary&) = delete; }; #endif diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 197d161af9c5..d520c1204eab 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -182,8 +182,8 @@ private: WW8aCFormat& aCharFormat, bool& bNewCharFormatCreated, const OUString& aPrefix = OUString()); - WW8ListManager(const WW8ListManager&) SAL_DELETED_FUNCTION; - WW8ListManager& operator=(const WW8ListManager&) SAL_DELETED_FUNCTION; + WW8ListManager(const WW8ListManager&) = delete; + WW8ListManager& operator=(const WW8ListManager&) = delete; sal_uInt16 nLastLFOPosition; }; @@ -365,8 +365,8 @@ private: SwWW8ImplReader& rReader; sal_uInt16 nToggleAttrFlags; sal_uInt16 nToggleBiDiAttrFlags; - SwWW8FltControlStack(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION; - SwWW8FltControlStack& operator=(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION; + SwWW8FltControlStack(const SwWW8FltControlStack&) = delete; + SwWW8FltControlStack& operator=(const SwWW8FltControlStack&) = delete; const SwNumFormat* GetNumFormatFromStack(const SwPosition &rPos, const SwTextNode &rTextNode); protected: @@ -426,8 +426,8 @@ public: void AddAnchor(const SwPosition& rPos,SwFrameFormat *pFormat); void Flush(); private: - SwWW8FltAnchorStack(const SwWW8FltAnchorStack&) SAL_DELETED_FUNCTION; - SwWW8FltAnchorStack& operator=(const SwWW8FltAnchorStack&) SAL_DELETED_FUNCTION; + SwWW8FltAnchorStack(const SwWW8FltAnchorStack&) = delete; + SwWW8FltAnchorStack& operator=(const SwWW8FltAnchorStack&) = delete; }; //For fields whose handling cannot be fully resolved until we hit the end of @@ -442,7 +442,7 @@ public: explicit Position(const SwPaM &rPaM); Position(const Position &rEntry); private: - Position& operator=(const Position&) SAL_DELETED_FUNCTION; + Position& operator=(const Position&) = delete; }; namespace SwWW8 @@ -498,8 +498,8 @@ protected: virtual void SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry& rEntry) SAL_OVERRIDE; private: - SwWW8FltRefStack(const SwWW8FltRefStack&) SAL_DELETED_FUNCTION; - SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) SAL_DELETED_FUNCTION; + SwWW8FltRefStack(const SwWW8FltRefStack&) = delete; + SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) = delete; }; template< typename Type > @@ -697,8 +697,8 @@ public: class WW8FormulaCheckBox : public WW8FormulaControl { private: - WW8FormulaCheckBox(const WW8FormulaCheckBox&) SAL_DELETED_FUNCTION; - WW8FormulaCheckBox& operator=(const WW8FormulaCheckBox&) SAL_DELETED_FUNCTION; + WW8FormulaCheckBox(const WW8FormulaCheckBox&) = delete; + WW8FormulaCheckBox& operator=(const WW8FormulaCheckBox&) = delete; public: explicit WW8FormulaCheckBox(SwWW8ImplReader &rR); @@ -713,8 +713,8 @@ public: class WW8FormulaListBox : public WW8FormulaControl { private: - WW8FormulaListBox(const WW8FormulaListBox&) SAL_DELETED_FUNCTION; - WW8FormulaListBox& operator=(const WW8FormulaListBox&) SAL_DELETED_FUNCTION; + WW8FormulaListBox(const WW8FormulaListBox&) = delete; + WW8FormulaListBox& operator=(const WW8FormulaListBox&) = delete; public: explicit WW8FormulaListBox(SwWW8ImplReader &rR); @@ -729,8 +729,8 @@ public: class WW8FormulaEditBox : public WW8FormulaControl { private: - WW8FormulaEditBox(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION; - WW8FormulaEditBox& operator=(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION; + WW8FormulaEditBox(const WW8FormulaEditBox&) = delete; + WW8FormulaEditBox& operator=(const WW8FormulaEditBox&) = delete; public: explicit WW8FormulaEditBox(SwWW8ImplReader &rR); //no real implementation, return false @@ -781,8 +781,8 @@ private: const int _nCalledByGroup, sal_Int64 nAspect ) const SAL_OVERRIDE; - SwMSDffManager(const SwMSDffManager&) SAL_DELETED_FUNCTION; - SwMSDffManager& operator=(const SwMSDffManager&) SAL_DELETED_FUNCTION; + SwMSDffManager(const SwMSDffManager&) = delete; + SwMSDffManager& operator=(const SwMSDffManager&) = delete; public: static sal_uInt32 GetFilterFlags(); static sal_Int32 GetEscherLineMatch(MSO_LineStyle eStyle, MSO_SPT eShapeType, @@ -890,8 +890,8 @@ private: SwFormatPageDesc SetSwFormatPageDesc(mySegIter &rIter, mySegIter &rStart, bool bIgnoreCols); - wwSectionManager(const wwSectionManager&) SAL_DELETED_FUNCTION; - wwSectionManager& operator=(const wwSectionManager&) SAL_DELETED_FUNCTION; + wwSectionManager(const wwSectionManager&) = delete; + wwSectionManager& operator=(const wwSectionManager&) = delete; public: explicit wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader), mnDesc(0) {} @@ -958,8 +958,8 @@ private: const SwDoc &mrDoc; OUString msFileLinkSeed; int mnFileSectionNo; - wwSectionNamer(const wwSectionNamer&) SAL_DELETED_FUNCTION; - wwSectionNamer& operator=(const wwSectionNamer&) SAL_DELETED_FUNCTION; + wwSectionNamer(const wwSectionNamer&) = delete; + wwSectionNamer& operator=(const wwSectionNamer&) = delete; public: OUString UniqueName(); wwSectionNamer(const SwDoc &rDoc, const OUString &rSeed) @@ -1690,8 +1690,8 @@ private: // determine object attribute "Layout in Table Cell" bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const; bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap ); - SwWW8ImplReader(const SwWW8ImplReader &) SAL_DELETED_FUNCTION; - SwWW8ImplReader& operator=(const SwWW8ImplReader&) SAL_DELETED_FUNCTION; + SwWW8ImplReader(const SwWW8ImplReader &) = delete; + SwWW8ImplReader& operator=(const SwWW8ImplReader&) = delete; public: // really private, but can only be done public sal_uInt16 GetToggleAttrFlags() const; sal_uInt16 GetToggleBiDiAttrFlags() const; diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index c5c3c9050b43..4b508e5f995e 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -37,8 +37,8 @@ public: WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStk); void Insert(const SwPosition &rPos); private: - WW8DupProperties(const WW8DupProperties&) SAL_DELETED_FUNCTION; - WW8DupProperties& operator=(const WW8DupProperties&) SAL_DELETED_FUNCTION; + WW8DupProperties(const WW8DupProperties&) = delete; + WW8DupProperties& operator=(const WW8DupProperties&) = delete; SwWW8FltControlStack* pCtrlStck; SfxItemSet aChrSet,aParSet; }; @@ -125,8 +125,8 @@ friend class SwWW8ImplReader; bool PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisStyle, sal_uInt16 nNextStyle); void PostStyle(SwWW8StyInf &rSI, bool bOldNoImp); - WW8RStyle(const WW8RStyle&) SAL_DELETED_FUNCTION; - WW8RStyle& operator=(const WW8RStyle&) SAL_DELETED_FUNCTION; + WW8RStyle(const WW8RStyle&) = delete; + WW8RStyle& operator=(const WW8RStyle&) = delete; public: WW8RStyle( WW8Fib& rFib, SwWW8ImplReader* pI ); void Import(); @@ -137,7 +137,7 @@ public: class WW8FlySet: public SfxItemSet { private: - const WW8FlySet& operator=(const WW8FlySet&) SAL_DELETED_FUNCTION; + const WW8FlySet& operator=(const WW8FlySet&) = delete; void Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM); public: WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW, diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 6426b0ba0797..4712bca7228e 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -267,8 +267,8 @@ public: sal_uInt16 GetAktId() const { return nAktId; } private: - WW8SprmIter(const WW8SprmIter&) SAL_DELETED_FUNCTION; - WW8SprmIter& operator=(const WW8SprmIter&) SAL_DELETED_FUNCTION; + WW8SprmIter(const WW8SprmIter&) = delete; + WW8SprmIter& operator=(const WW8SprmIter&) = delete; }; /* among others for FKPs to normal attr., i.e. one less attr than positions */ @@ -341,8 +341,8 @@ private: WW8PLCFpcd& rPLCF; long nIdx; - WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&) SAL_DELETED_FUNCTION; - WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&) SAL_DELETED_FUNCTION; + WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&) = delete; + WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&) = delete; public: WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 ); @@ -376,8 +376,8 @@ private: WW8_FC nStartFc; bool bDirty; - WW8PLCFx(const WW8PLCFx&) SAL_DELETED_FUNCTION; - WW8PLCFx& operator=(const WW8PLCFx&) SAL_DELETED_FUNCTION; + WW8PLCFx(const WW8PLCFx&) = delete; + WW8PLCFx& operator=(const WW8PLCFx&) = delete; public: WW8PLCFx(ww::WordVersion eVersion, bool bSprm) @@ -418,8 +418,8 @@ private: // 1 byte param sal_uInt16 nGrpprls; // attribute count of this - WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&) SAL_DELETED_FUNCTION; - WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&) SAL_DELETED_FUNCTION; + WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&) = delete; + WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&) = delete; public: WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, @@ -441,8 +441,8 @@ private: bool bVer67; WW8_CP nClipStart; - WW8PLCFx_PCD(const WW8PLCFx_PCD&) SAL_DELETED_FUNCTION; - WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&) SAL_DELETED_FUNCTION; + WW8PLCFx_PCD(const WW8PLCFx_PCD&) = delete; + WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&) = delete; public: WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, @@ -574,8 +574,8 @@ private: bool NewFkp(); - WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&) SAL_DELETED_FUNCTION; - WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&) SAL_DELETED_FUNCTION; + WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&) = delete; + WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&) = delete; protected: ePLCFT ePLCF; @@ -609,8 +609,8 @@ private: bool bLineEnd : 1; bool bComplex : 1; - WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&) SAL_DELETED_FUNCTION; - WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&) SAL_DELETED_FUNCTION; + WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&) = delete; + WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&) = delete; public: WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt, @@ -641,8 +641,8 @@ private: sal_uInt16 nArrMax; sal_uInt16 nSprmSiz; - WW8PLCFx_SEPX(const WW8PLCFx_SEPX&) SAL_DELETED_FUNCTION; - WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&) SAL_DELETED_FUNCTION; + WW8PLCFx_SEPX(const WW8PLCFx_SEPX&) = delete; + WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&) = delete; public: WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTablexySt, const WW8Fib& rFib, @@ -669,8 +669,8 @@ private: WW8PLCF* pRef; WW8PLCF* pText; - WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION; - WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION; + WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&) = delete; + WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&) = delete; public: WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, @@ -698,8 +698,8 @@ class WW8PLCFx_FLD : public WW8PLCFx private: WW8PLCFspecial* pPLCF; const WW8Fib& rFib; - WW8PLCFx_FLD(const WW8PLCFx_FLD&) SAL_DELETED_FUNCTION; - WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &) SAL_DELETED_FUNCTION; + WW8PLCFx_FLD(const WW8PLCFx_FLD&) = delete; + WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &) = delete; public: WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType); @@ -728,8 +728,8 @@ private: sal_uInt16 nIsEnd; sal_Int32 nBookmarkId; // counter incremented by GetUniqueBookmarkName. - WW8PLCFx_Book(const WW8PLCFx_Book&) SAL_DELETED_FUNCTION; - WW8PLCFx_Book& operator=(const WW8PLCFx_Book&) SAL_DELETED_FUNCTION; + WW8PLCFx_Book(const WW8PLCFx_Book&) = delete; + WW8PLCFx_Book& operator=(const WW8PLCFx_Book&) = delete; public: WW8PLCFx_Book(SvStream* pTableSt,const WW8Fib& rFib); @@ -766,8 +766,8 @@ private: sal_Int32 nIMax; bool m_bIsEnd; - WW8PLCFx_AtnBook(const WW8PLCFx_AtnBook&) SAL_DELETED_FUNCTION; - WW8PLCFx_AtnBook& operator=(const WW8PLCFx_AtnBook&) SAL_DELETED_FUNCTION; + WW8PLCFx_AtnBook(const WW8PLCFx_AtnBook&) = delete; + WW8PLCFx_AtnBook& operator=(const WW8PLCFx_AtnBook&) = delete; public: WW8PLCFx_AtnBook(SvStream* pTableSt,const WW8Fib& rFib); 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 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(); -- cgit v1.2.3