diff options
Diffstat (limited to 'sw')
57 files changed, 238 insertions, 238 deletions
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx index 17eb50cb0142..d8331acb9cf9 100644 --- a/sw/inc/HandleAnchorNodeChg.hxx +++ b/sw/inc/HandleAnchorNodeChg.hxx @@ -64,8 +64,8 @@ private: // and that re-creation of fly frames is necessary. bool mbAnchorNodeChanged; - SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& ) SAL_DELETED_FUNCTION; - void operator=( const SwHandleAnchorNodeChg ) SAL_DELETED_FUNCTION; + SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& ) = delete; + void operator=( const SwHandleAnchorNodeChg ) = delete; }; #endif diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index 64cf8cea492e..7741771a4153 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -87,8 +87,8 @@ private: static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ); - SwNodeNum( const SwNodeNum& ) SAL_DELETED_FUNCTION; - SwNodeNum& operator=( const SwNodeNum& ) SAL_DELETED_FUNCTION; + SwNodeNum( const SwNodeNum& ) = delete; + SwNodeNum& operator=( const SwNodeNum& ) = delete; virtual bool IsCountPhantoms() const SAL_OVERRIDE; diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index c98638a03a50..436649eb5eb8 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -178,8 +178,8 @@ class SwCalc static OUString GetColumnName( const OUString& rName ); OUString GetDBName( const OUString& rName ); - SwCalc( const SwCalc& ) SAL_DELETED_FUNCTION; - SwCalc& operator=( const SwCalc& ) SAL_DELETED_FUNCTION; + SwCalc( const SwCalc& ) = delete; + SwCalc& operator=( const SwCalc& ) = delete; public: SwCalc( SwDoc& rD ); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 07b5cca5e5ca..a08ca490cc23 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -380,8 +380,8 @@ class SwDrawContact : public SwContact void _InvalidateObjs( const bool _bUpdateSortedObjsList = false ); - SwDrawContact( const SwDrawContact& ) SAL_DELETED_FUNCTION; - SwDrawContact& operator=( const SwDrawContact& ) SAL_DELETED_FUNCTION; + SwDrawContact( const SwDrawContact& ) = delete; + SwDrawContact& operator=( const SwDrawContact& ) = delete; protected: /// virtuelle Methoden von SwClient diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index 3eabac864276..261a70a9433f 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -57,8 +57,8 @@ class SwLinguServiceEventListener : com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > xGCIterator; - SwLinguServiceEventListener(const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION; - SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION; + SwLinguServiceEventListener(const SwLinguServiceEventListener &) = delete; + SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &) = delete; public: SwLinguServiceEventListener(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 0b25e5f33a84..bf5ced4daeff 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -410,7 +410,7 @@ private: const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat ); static SwFormat* FindFormatByName( const SwFormatsBase& rFormatArr, const OUString& rName ); - SwDoc( const SwDoc &) SAL_DELETED_FUNCTION; + SwDoc( const SwDoc &) = delete; // Database fields: void AddUsedDBToList( std::vector<OUString>& rDBNameList, diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index e50c3c01b5c2..e1d29247f2e1 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -229,7 +229,7 @@ protected: virtual ~SwDocStyleSheetPool(); private: - SwDocStyleSheetPool( const SwDocStyleSheetPool& ) SAL_DELETED_FUNCTION; + SwDocStyleSheetPool( const SwDocStyleSheetPool& ) = delete; }; #endif diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index c7488161744c..e04b06329783 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -28,7 +28,7 @@ class SwDoc; class SwDPage : public FmFormPage, public SdrObjUserCall { - SwDPage &operator=(const SwDPage&) SAL_DELETED_FUNCTION; + SwDPage &operator=(const SwDPage&) = delete; SdrPageGridFrameList* pGridLst; SwDoc* pDoc; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 1a1536b60f97..8010898fef90 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -946,8 +946,8 @@ public: virtual ~SwEditShell(); private: - SwEditShell(const SwEditShell &) SAL_DELETED_FUNCTION; - const SwEditShell &operator=(const SwEditShell &) SAL_DELETED_FUNCTION; + SwEditShell(const SwEditShell &) = delete; + const SwEditShell &operator=(const SwEditShell &) = delete; }; inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 7e1f9ab54db8..b8f9931c5fb9 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -46,7 +46,7 @@ protected: private: /// @@@ public copy ctor, but no copy assignment? - SwFormatCharFormat & operator= (const SwFormatCharFormat &) SAL_DELETED_FUNCTION; + SwFormatCharFormat & operator= (const SwFormatCharFormat &) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx index 770434e6155a..11856738d459 100644 --- a/sw/inc/finalthreadmanager.hxx +++ b/sw/inc/finalthreadmanager.hxx @@ -62,8 +62,8 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - FinalThreadManager(FinalThreadManager &) SAL_DELETED_FUNCTION; - void operator =(FinalThreadManager &) SAL_DELETED_FUNCTION; + FinalThreadManager(FinalThreadManager &) = delete; + void operator =(FinalThreadManager &) = delete; virtual ~FinalThreadManager(); diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 092d6b099158..00b64d83db89 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -37,7 +37,7 @@ public: SwFormatAutoFormat( const SwFormatAutoFormat& rAttr ); private: /// @@@ public copy ctor, but no copy assignment? - SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) SAL_DELETED_FUNCTION; + SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 77c33f9eaeaa..31406601b350 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -31,7 +31,7 @@ class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem { SwNodeIndex *pStartNode; - SwFormatContent &operator=( const SwFormatContent & ) SAL_DELETED_FUNCTION; + SwFormatContent &operator=( const SwFormatContent & ) = delete; public: SwFormatContent( const SwStartNode* pStartNode = 0 ); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 5ab04ac1ebba..788b2d678196 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -46,8 +46,8 @@ protected: { SetAuto(false); } private: - SwFormatColl(const SwFormatColl & ) SAL_DELETED_FUNCTION; - const SwFormatColl &operator=(const SwFormatColl &) SAL_DELETED_FUNCTION; + SwFormatColl(const SwFormatColl & ) = delete; + const SwFormatColl &operator=(const SwFormatColl &) = delete; }; /// Represents the style of a paragraph. @@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl friend class SwDoc; friend class ::sw::DocumentStylePoolManager; - SwTextFormatColl(const SwTextFormatColl & rRef) SAL_DELETED_FUNCTION; + SwTextFormatColl(const SwTextFormatColl & rRef) = delete; bool mbStayAssignedToListLevelOfOutlineStyle; @@ -196,7 +196,7 @@ public: SwCollCondition( const SwCollCondition& rCpy ); private: /// @@@ public copy ctor, but no copy assignment? - SwCollCondition & operator= (const SwCollCondition &) SAL_DELETED_FUNCTION; + SwCollCondition & operator= (const SwCollCondition &) = delete; public: bool operator==( const SwCollCondition& rCmp ) const; diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index bcf3c47b52df..72a61013e44b 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -34,7 +34,7 @@ class SwFormatFlyCnt : public SfxPoolItem friend class SwTextFlyCnt; SwTextFlyCnt* pTextAttr; SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format. - SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION; + SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) = delete; public: SwFormatFlyCnt( SwFrameFormat *pFrameFormat ); diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 0d4f86bf58f1..4934f479fa59 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -51,7 +51,7 @@ class SW_DLLPUBLIC SwFormatField SwTextField* mpTextField; // the TextAttribute // @@@ copy construction allowed, but copy assignment is not? @@@ - SwFormatField& operator=(const SwFormatField& rField) SAL_DELETED_FUNCTION; + SwFormatField& operator=(const SwFormatField& rField) = delete; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 6212381221bf..04eb026f5617 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -47,8 +47,8 @@ class SW_DLLPUBLIC SwFormatFootnote css::uno::WeakReference<css::text::XFootnote> m_wXFootnote; - SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) SAL_DELETED_FUNCTION; - SwFormatFootnote( const SwFormatFootnote& ) SAL_DELETED_FUNCTION; + SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) = delete; + SwFormatFootnote( const SwFormatFootnote& ) = delete; public: SwFormatFootnote( bool bEndNote = false ); diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 3723d745b5df..e9907b425841 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -40,7 +40,7 @@ class SwFormatRefMark friend class SwTextRefMark; SwTextRefMark* pTextAttr; - SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) SAL_DELETED_FUNCTION; + SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) = delete; OUString aRefName; css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index c1534fc9dd6a..561a047ba1d2 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem bool bIsServerMap; ///< A ServerSideImageMap with the URL. - SwFormatURL& operator=( const SwFormatURL& ) SAL_DELETED_FUNCTION; + SwFormatURL& operator=( const SwFormatURL& ) = delete; public: SwFormatURL(); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 4e0da75bbf40..88e0c3747ec1 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -158,8 +158,8 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat when they get borders (this is done in SwWrtShell::CalcAndGetScale) */ Point m_aLastFlyFrmPrtRectPos; - SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION; - SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION; + SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) = delete; + SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete; protected: SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, @@ -234,8 +234,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat mutable const SdrObject * pSdrObjCached; mutable OUString sSdrObjCachedComment; - SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION; - SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION; + SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) = delete; + SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) = delete; SwFrameFormat::tLayoutDir meLayoutDir; diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx index bf4089a959a4..0cb1ba5c9536 100644 --- a/sw/inc/list.hxx +++ b/sw/inc/list.hxx @@ -53,8 +53,8 @@ class SwList bool IsListLevelMarked( const int nListLevel ) const; private: - SwList( const SwList& ) SAL_DELETED_FUNCTION; - SwList& operator=( const SwList& ) SAL_DELETED_FUNCTION; + SwList( const SwList& ) = delete; + SwList& operator=( const SwList& ) = delete; SwListImpl* mpListImpl; }; diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 0267e16dbff8..167a5af81751 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -37,8 +37,8 @@ class SW_DLLPUBLIC SwNodeIndex SAL_FINAL : public sw::Ring<SwNodeIndex> SwNode * m_pNode; // These are not allowed! - SwNodeIndex( SwNodes& rNds, sal_uInt16 nIdx ) SAL_DELETED_FUNCTION; - SwNodeIndex( SwNodes& rNds, int nIdx ) SAL_DELETED_FUNCTION; + SwNodeIndex( SwNodes& rNds, sal_uInt16 nIdx ) = delete; + SwNodeIndex( SwNodes& rNds, int nIdx ) = delete; void RegisterIndex( SwNodes& rNodes ) { if(!rNodes.vIndices) diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index ec0f494f6112..02a3adb2fd2f 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -41,8 +41,8 @@ class SW_DLLPUBLIC SwNoTextNode : public SwContentNode // graphics-attributes (only called by SwContentNode). virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE; - SwNoTextNode( const SwNoTextNode& ) SAL_DELETED_FUNCTION; - SwNoTextNode &operator=( const SwNoTextNode& ) SAL_DELETED_FUNCTION; + SwNoTextNode( const SwNoTextNode& ) = delete; + SwNoTextNode &operator=( const SwNoTextNode& ) = delete; protected: SwNoTextNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index b2787a393f78..ac3e1699f506 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwOLEObj svt::EmbeddedObjectRef xOLERef; OUString aName; - SwOLEObj( const SwOLEObj& rObj ) SAL_DELETED_FUNCTION; + SwOLEObj( const SwOLEObj& rObj ) = delete; void SetNode( SwOLENode* pNode ); @@ -88,7 +88,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTextNode SwGrfFormatColl *pGrfColl, SwAttrSet* pAutoAttr = 0 ); - SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION; + SwOLENode( const SwOLENode & ) = delete; using SwNoTextNode::GetGraphic; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 0f1d84420faa..a892d7659866 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -292,8 +292,8 @@ public: virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: - SwNode( const SwNode & rNodes ) SAL_DELETED_FUNCTION; - SwNode & operator= ( const SwNode & rNodes ) SAL_DELETED_FUNCTION; + SwNode( const SwNode & rNodes ) = delete; + SwNode & operator= ( const SwNode & rNodes ) = delete; }; /// Starts a section of nodes in the document model. @@ -324,8 +324,8 @@ public: virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; private: - SwStartNode( const SwStartNode & rNode ) SAL_DELETED_FUNCTION; - SwStartNode & operator= ( const SwStartNode & rNode ) SAL_DELETED_FUNCTION; + SwStartNode( const SwStartNode & rNode ) = delete; + SwStartNode & operator= ( const SwStartNode & rNode ) = delete; }; /// Ends a section of nodes in the document model. @@ -344,8 +344,8 @@ protected: DECL_FIXEDMEMPOOL_NEWDEL(SwEndNode) private: - SwEndNode( const SwEndNode & rNode ) SAL_DELETED_FUNCTION; - SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION; + SwEndNode( const SwEndNode & rNode ) = delete; + SwEndNode & operator= ( const SwEndNode & rNode ) = delete; }; // SwContentNode @@ -485,8 +485,8 @@ public: virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const; private: - SwContentNode( const SwContentNode & rNode ) SAL_DELETED_FUNCTION; - SwContentNode & operator= ( const SwContentNode & rNode ) SAL_DELETED_FUNCTION; + SwContentNode( const SwContentNode & rNode ) = delete; + SwContentNode & operator= ( const SwContentNode & rNode ) = delete; }; // SwTableNode @@ -523,8 +523,8 @@ public: void RemoveRedlines(); private: - SwTableNode( const SwTableNode & rNode ) SAL_DELETED_FUNCTION; - SwTableNode & operator= ( const SwTableNode & rNode ) SAL_DELETED_FUNCTION; + SwTableNode( const SwTableNode & rNode ) = delete; + SwTableNode & operator= ( const SwTableNode & rNode ) = delete; }; class SwSectionNode @@ -533,8 +533,8 @@ class SwSectionNode friend class SwNodes; private: - SwSectionNode(const SwSectionNode&) SAL_DELETED_FUNCTION; - SwSectionNode& operator=(const SwSectionNode&) SAL_DELETED_FUNCTION; + SwSectionNode(const SwSectionNode&) = delete; + SwSectionNode& operator=(const SwSectionNode&) = delete; std::unique_ptr<SwSection> const m_pSection; diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 5c9077e2f736..8c32cebc90a1 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -166,7 +166,7 @@ class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM> SwPaM* MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg = 0 ); - SwPaM(SwPaM const& rPaM) SAL_DELETED_FUNCTION; + SwPaM(SwPaM const& rPaM) = delete; public: explicit SwPaM( const SwPosition& rPos, SwPaM* pRing = 0 ); diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 6744274e7795..67da97977320 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -68,7 +68,7 @@ public: SwFormatDrop( const SwFormatDrop & ); private: // @@@ public copy ctor, but no copy assignment? - SwFormatDrop & operator= (const SwFormatDrop &) SAL_DELETED_FUNCTION; + SwFormatDrop & operator= (const SwFormatDrop &) = delete; protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 9ed11fcb3371..69a26db466b0 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -36,8 +36,8 @@ class SwView; class SW_DLLPUBLIC SwRedlineExtraData { - SwRedlineExtraData( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION; - SwRedlineExtraData& operator=( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION; + SwRedlineExtraData( const SwRedlineExtraData& ) = delete; + SwRedlineExtraData& operator=( const SwRedlineExtraData& ) = delete; protected: SwRedlineExtraData() {} diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index c648324fb5f8..58aa03d360f6 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwCursor : public SwPaM using SwPaM::Find; - SwCursor(SwCursor const& rPaM) SAL_DELETED_FUNCTION; + SwCursor(SwCursor const& rPaM) = delete; protected: _SwCursor_SavePos* CreateNewSavePos() const; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 821d7a74920b..e37b95232c35 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -145,7 +145,7 @@ public: SwTable( const SwTable& rTable ); // no copy of the lines !! private: // @@@ public copy ctor, but no copy assignment? - SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION; + SwTable & operator= (const SwTable &) = delete; // no default ctor. SwTable(); bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* ); @@ -388,8 +388,8 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrameFormat. friend void DelBoxNode(SwTableSortBoxes&); // Delete StartNode* ! friend class SwXMLTableContext; - SwTableBox( const SwTableBox & ) SAL_DELETED_FUNCTION; - SwTableBox &operator=( const SwTableBox &) SAL_DELETED_FUNCTION; + SwTableBox( const SwTableBox & ) = delete; + SwTableBox &operator=( const SwTableBox &) = delete; SwTableLines aLines; const SwStartNode * pSttNd; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index ee50c7ae10bf..8e1dfcfc2bed 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -167,7 +167,7 @@ private: TOXTypes eType; // @@@ public copy ctor, but no copy assignment? - SwTOXType & operator= (const SwTOXType &) SAL_DELETED_FUNCTION; + SwTOXType & operator= (const SwTOXType &) = delete; }; // Structure of the index lines diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 678d29456359..72ce273cde97 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -77,8 +77,8 @@ class SwChartLockController_Helper Timer aUnlockTimer; // timer to unlock chart controllers bool bIsLocked; - SwChartLockController_Helper( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION; - SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION; + SwChartLockController_Helper( const SwChartLockController_Helper & ) = delete; + SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ) = delete; void LockUnlockAllCharts( bool bLock ); void LockAllCharts() { LockUnlockAllCharts( true ); }; @@ -139,8 +139,8 @@ class SwChartDataProvider : const SwDoc * pDoc; bool bDisposed; - SwChartDataProvider( const SwChartDataProvider & ) SAL_DELETED_FUNCTION; - SwChartDataProvider & operator = ( const SwChartDataProvider & ) SAL_DELETED_FUNCTION; + SwChartDataProvider( const SwChartDataProvider & ) = delete; + SwChartDataProvider & operator = ( const SwChartDataProvider & ) = delete; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, bool bTestOnly = false ) throw (::com::sun::star::lang::IllegalArgumentException, @@ -217,8 +217,8 @@ class SwChartDataSource : com::sun::star::uno::Reference< com::sun::star::chart2::data::XLabeledDataSequence > > aLDS; - SwChartDataSource( const SwChartDataSource & ) SAL_DELETED_FUNCTION; - SwChartDataSource & operator = ( const SwChartDataSource & ) SAL_DELETED_FUNCTION; + SwChartDataSource( const SwChartDataSource & ) = delete; + SwChartDataSource & operator = ( const SwChartDataSource & ) = delete; public: SwChartDataSource( const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::data::XLabeledDataSequence > > &rLDS ); @@ -271,7 +271,7 @@ class SwChartDataSequence : bool bDisposed; SwChartDataSequence( const SwChartDataSequence &rObj ); - SwChartDataSequence & operator = ( const SwChartDataSequence & ) SAL_DELETED_FUNCTION; + SwChartDataSequence & operator = ( const SwChartDataSequence & ) = delete; protected: //SwClient @@ -373,8 +373,8 @@ class SwChartLabeledDataSequence : bool bDisposed; - SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION; - SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION; + SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) = delete; + SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) = delete; void SetDataSequence( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxDest, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxSource ); diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 552ac6b14806..6c5ec9d48909 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -44,7 +44,7 @@ class SW_DLLPUBLIC SwUnoInternalPaM { private: - SwUnoInternalPaM(const SwUnoInternalPaM&) SAL_DELETED_FUNCTION; + SwUnoInternalPaM(const SwUnoInternalPaM&) = delete; public: SwUnoInternalPaM(SwDoc& rDoc); diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx index a8592529f1f0..d25a50ca0726 100644 --- a/sw/source/core/access/parachangetrackinginfo.hxx +++ b/sw/source/core/access/parachangetrackinginfo.hxx @@ -36,8 +36,8 @@ class SwParaChangeTrackingInfo const SwWrongList* getChangeTrackingTextMarkupList( const sal_Int32 nTextMarkupType ); private: - SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION; - SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION; + SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) = delete; + SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) = delete; const SwTextFrm& mrTextFrm; diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx index 37dd9f073a47..c0ae39448bc2 100644 --- a/sw/source/core/access/textmarkuphelper.hxx +++ b/sw/source/core/access/textmarkuphelper.hxx @@ -60,8 +60,8 @@ class SwTextMarkupHelper ::com::sun::star::uno::RuntimeException); private: - SwTextMarkupHelper( const SwTextMarkupHelper& ) SAL_DELETED_FUNCTION; - SwTextMarkupHelper& operator=( const SwTextMarkupHelper& ) SAL_DELETED_FUNCTION; + SwTextMarkupHelper( const SwTextMarkupHelper& ) = delete; + SwTextMarkupHelper& operator=( const SwTextMarkupHelper& ) = delete; const SwAccessiblePortionData& mrPortionData; diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index 4d11272217e6..9058c60c263b 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -38,8 +38,8 @@ public: virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - CancellableJob( CancellableJob& ) SAL_DELETED_FUNCTION; - void operator =( CancellableJob& ) SAL_DELETED_FUNCTION; + CancellableJob( CancellableJob& ) = delete; + void operator =( CancellableJob& ) = delete; ::rtl::Reference< ObservableThread > mrThread; }; diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index 71182ecb4685..a9cd27892fe6 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -133,8 +133,8 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - SwXFlatParagraph( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION; - SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION; + SwXFlatParagraph( const SwXFlatParagraph & ) = delete; + SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) = delete; OUString maExpandText; }; @@ -162,8 +162,8 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; private: - SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) SAL_DELETED_FUNCTION; - SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ) SAL_DELETED_FUNCTION; + SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) = delete; + SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ) = delete; // container to hold the 'hard' references as long as necessary and valid std::set< css::uno::Reference< css::text::XFlatParagraph > > m_aFlatParaList; diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index 652e1f535123..f24fc9731a9b 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -67,8 +67,8 @@ public: virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - SwXTextMarkup( const SwXTextMarkup & ) SAL_DELETED_FUNCTION; - SwXTextMarkup & operator =( const SwXTextMarkup & ) SAL_DELETED_FUNCTION; + SwXTextMarkup( const SwXTextMarkup & ) = delete; + SwXTextMarkup & operator =( const SwXTextMarkup & ) = delete; struct Impl; ::sw::UnoImplPtr<Impl> m_pImpl; @@ -97,8 +97,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; private: - SwXStringKeyMap(SwXStringKeyMap &) SAL_DELETED_FUNCTION; - void operator =(SwXStringKeyMap &) SAL_DELETED_FUNCTION; + SwXStringKeyMap(SwXStringKeyMap &) = delete; + void operator =(SwXStringKeyMap &) = delete; virtual ~SwXStringKeyMap() {} diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 840ca664b291..bd33e0f9850c 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -192,8 +192,8 @@ class SwWrongList void Insert(sal_uInt16 nWhere, std::vector<SwWrongArea>::iterator startPos, std::vector<SwWrongArea>::iterator endPos); void Remove( sal_uInt16 nIdx, sal_uInt16 nLen ); - SwWrongList& operator= (const SwWrongList &) SAL_DELETED_FUNCTION; - SwWrongList( const SwWrongList& rCpy ) SAL_DELETED_FUNCTION; + SwWrongList& operator= (const SwWrongList &) = delete; + SwWrongList( const SwWrongList& rCpy ) = delete; public: SwWrongList( WrongListType eType ); diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index d10cc0de8a33..0d5a592aa414 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -371,7 +371,7 @@ class SwTextPaintInfo : public SwTextSizeInfo const bool bSmartTag = false, const bool bGrammarCheck = false ); - SwTextPaintInfo &operator=(const SwTextPaintInfo&) SAL_DELETED_FUNCTION; + SwTextPaintInfo &operator=(const SwTextPaintInfo&) = delete; void _NotifyURL( const SwLinePortion &rPor ) const; protected: 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<OUString, sal_uLong> 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<WW8_CP> aCps; std::vector<const void*> 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<const SwRedlineData*> maProcessedRedlines; std::map<const OUString, WW8_CP> m_aRangeStartPositions; @@ -1234,8 +1234,8 @@ private: std::vector<sal_uInt32> aShapeIds; // VARARR of ShapeIds for the SwFrameFormats virtual const std::vector<sal_uInt32>* 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<ww::bytes>& 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<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(); diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index ffaa2a936ea8..a778987903b5 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -131,8 +131,8 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper void SetDataForDragAndDrop( const Point& rSttPos ); - SwTransferable( const SwTransferable& ) SAL_DELETED_FUNCTION; - SwTransferable& operator=( const SwTransferable& ) SAL_DELETED_FUNCTION; + SwTransferable( const SwTransferable& ) = delete; + SwTransferable& operator=( const SwTransferable& ) = delete; protected: virtual void AddSupportedFormats() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx index f81b1a8f737e..48bb27406b88 100644 --- a/sw/source/uibase/inc/toxmgr.hxx +++ b/sw/source/uibase/inc/toxmgr.hxx @@ -61,8 +61,8 @@ class SW_DLLPUBLIC SwTOXDescription //TODO: TemplateNames //const String* pTemplateName = 0, ??? - SwTOXDescription(SwTOXDescription&) SAL_DELETED_FUNCTION; - SwTOXDescription & operator= (SwTOXDescription&) SAL_DELETED_FUNCTION; + SwTOXDescription(SwTOXDescription&) = delete; + SwTOXDescription & operator= (SwTOXDescription&) = delete; public: // single argument ctors shall be explicit. @@ -185,8 +185,8 @@ class SwTOXMarkDescription OUString* pPhoneticReadingOfPrimKey; OUString* pPhoneticReadingOfSecKey; - SwTOXMarkDescription(SwTOXMarkDescription&) SAL_DELETED_FUNCTION; - SwTOXMarkDescription & operator= (SwTOXMarkDescription&) SAL_DELETED_FUNCTION; + SwTOXMarkDescription(SwTOXMarkDescription&) = delete; + SwTOXMarkDescription & operator= (SwTOXMarkDescription&) = delete; public: // single argument ctors shall be explicit. diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index e03e03398257..6276d8094159 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwNumRulesWithName sal_uInt16 nCharPoolId; std::vector<std::unique_ptr<SfxPoolItem>> m_Items; - _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) SAL_DELETED_FUNCTION; + _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) = delete; public: _SwNumFormatGlobal( const SwNumFormat& rFormat ); diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 14c1ad5f2f79..99f21d17a7ef 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -126,8 +126,8 @@ class SwXMailMerge : void launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const; - SwXMailMerge( const SwXMailMerge & ) SAL_DELETED_FUNCTION; - SwXMailMerge & operator = ( const SwXMailMerge & ) SAL_DELETED_FUNCTION; + SwXMailMerge( const SwXMailMerge & ) = delete; + SwXMailMerge & operator = ( const SwXMailMerge & ) = delete; protected: virtual ~SwXMailMerge(); public: |