From 089620728299ab1688edaf066e9f9790d67449aa Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 Aug 2016 13:16:31 +0100 Subject: cppcheck: noCopyConstructor Change-Id: Id5323cb6f52666f85965e11b07e4f2bca8af4e78 --- sw/source/core/docnode/node2lay.cxx | 4 ++++ sw/source/core/text/frmpaint.cxx | 4 ++++ sw/source/core/text/txtftn.cxx | 4 ++++ sw/source/core/undo/untbl.cxx | 11 +++++++++++ sw/source/core/unocore/unodraw.cxx | 3 +++ sw/source/core/unocore/unosrch.cxx | 4 ++++ sw/source/filter/ascii/parasc.cxx | 3 +++ sw/source/filter/html/htmlfly.hxx | 3 +++ sw/source/filter/html/htmltab.cxx | 3 +++ sw/source/filter/ww8/wrtww8.cxx | 4 ++++ sw/source/filter/ww8/ww8atr.cxx | 10 +++++++--- sw/source/filter/ww8/ww8scan.hxx | 12 ++++++++++++ sw/source/uibase/app/docstyle.cxx | 2 ++ ucb/source/ucp/ftp/ftpintreq.hxx | 3 +++ ucb/source/ucp/webdav/AprEnv.hxx | 2 ++ vcl/headless/svpgdi.cxx | 6 ++++++ vcl/headless/svpglyphcache.cxx | 4 ++++ vcl/opengl/FixedTextureAtlas.cxx | 4 ++++ vcl/source/filter/igif/decode.hxx | 2 ++ vcl/source/gdi/impvect.cxx | 3 +++ vcl/source/window/toolbox.cxx | 3 +++ vcl/unx/generic/gdi/gcach_xpeer.cxx | 4 ++++ vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 3 +++ xmloff/source/forms/officeforms.hxx | 3 +++ 24 files changed, 101 insertions(+), 3 deletions(-) diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index ae1a3fcb47a7..18c01ee16ed0 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -42,6 +42,10 @@ class SwNode2LayImpl sal_uLong nIndex; // The Index of the to-be-inserted Nodes bool bMaster : 1; // true => only Master, false => only Frames without Follow bool bInit : 1; // Did we already call First() at SwClient? + + SwNode2LayImpl(const SwNode2LayImpl&) = delete; + SwNode2LayImpl& operator=(const SwNode2LayImpl&) = delete; + public: SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, bool bSearch ); ~SwNode2LayImpl() { delete pIter; delete pUpperFrames; } diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index d22d5af964d4..bbbe0fa6478c 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -71,6 +71,10 @@ class SwExtraPainter bool bGoLeft; bool bLineNum; inline bool IsClipChg() { return aClip.IsChg(); } + + SwExtraPainter(const SwExtraPainter&) = delete; + SwExtraPainter& operator=(const SwExtraPainter&) = delete; + public: SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh, const SwLineNumberInfo &rLnInf, const SwRect &rRct, diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 1eb36ef6ddef..5e856dd51e9c 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -1231,6 +1231,10 @@ class SwFootnoteSave SwTextSizeInfo *pInf; SwFont *pFnt; SwFont *pOld; + + SwFootnoteSave(const SwFootnoteSave&) = delete; + SwFootnoteSave& operator=(const SwFootnoteSave&) = delete; + public: SwFootnoteSave( const SwTextSizeInfo &rInf, const SwTextFootnote *pTextFootnote, diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index f6e96d668b35..3cace3dee1d7 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -119,6 +119,9 @@ class SaveTable bool m_bSaveFormula : 1; bool m_bNewModel : 1; + SaveTable(const SaveTable&) = delete; + SaveTable& operator=(const SaveTable&) = delete; + public: SaveTable( const SwTable& rTable, sal_uInt16 nLnCnt = USHRT_MAX, bool bSaveFormula = true ); @@ -144,6 +147,9 @@ class SaveLine SaveBox* pBox; sal_uInt16 nItemSet; + SaveLine(const SaveLine&) = delete; + SaveLine& operator=(const SaveLine&) = delete; + public: SaveLine( SaveLine* pPrev, const SwTableLine& rLine, SaveTable& rSTable ); ~SaveLine(); @@ -204,6 +210,11 @@ struct SwTableToTextSave SwTableToTextSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, sal_Int32 nContent ); ~SwTableToTextSave() { delete m_pHstry; } + +private: + SwTableToTextSave(const SwTableToTextSave&) = delete; + SwTableToTextSave& operator=(const SwTableToTextSave&) = delete; + }; sal_uInt16 aSave_BoxContentSet[] = { diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 8082ad4dcf9a..977e95bcc9e0 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -86,6 +86,9 @@ class SwShapeDescriptor_Impl // #i28749# sal_Int16 mnPositionLayoutDir; + SwShapeDescriptor_Impl(const SwShapeDescriptor_Impl&) = delete; + SwShapeDescriptor_Impl& operator=(const SwShapeDescriptor_Impl&) = delete; + public: bool bInitializedPropertyNotifier; diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 6a6d10fe2602..d218881a827f 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -43,6 +43,10 @@ class SwSearchProperties_Impl beans::PropertyValue** pValueArr; sal_uInt32 nArrLen; const PropertyEntryVector_t aPropertyEntries; + + SwSearchProperties_Impl(const SwSearchProperties_Impl&) = delete; + SwSearchProperties_Impl& operator=(const SwSearchProperties_Impl&) = delete; + public: SwSearchProperties_Impl(); ~SwSearchProperties_Impl(); diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 61ea58603a33..b3c75f625b85 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -61,6 +61,9 @@ class SwASCIIParser sal_uLong ReadChars(); void InsertText( const OUString& rStr ); + SwASCIIParser(const SwASCIIParser&) = delete; + SwASCIIParser& operator=(const SwASCIIParser&) = delete; + public: SwASCIIParser( SwDoc* pD, const SwPaM& rCursor, SvStream& rIn, bool bReadNewDoc, const SwAsciiOptions& rOpts ); diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 49df7cfc6a13..bec4aa7bce4d 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -91,6 +91,9 @@ class SwHTMLPosFlyFrame sal_Int32 nContentIdx; // seine Position im Content sal_uInt8 nOutputMode; // Ausgabe-Infos + SwHTMLPosFlyFrame(const SwHTMLPosFlyFrame&) = delete; + SwHTMLPosFlyFrame& operator=(const SwHTMLPosFlyFrame&) = delete; + public: SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly, diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 0385ec63089d..a3ccb666c604 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -116,6 +116,9 @@ class HTMLTableContext bool bRestartXMP : 1; bool bRestartListing : 1; + HTMLTableContext(const HTMLTableContext&) = delete; + HTMLTableContext& operator=(const HTMLTableContext&) = delete; + public: HTMLAttrTable aAttrTab; // attributes diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 5f098b2d875b..5e815f038eb3 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -137,6 +137,10 @@ class WW8_WrFkp bool bCombined; // true : paste not allowed sal_uInt8 SearchSameSprm( sal_uInt16 nVarLen, const sal_uInt8* pSprms ); + + WW8_WrFkp(const WW8_WrFkp&) = delete; + WW8_WrFkp& operator=(const WW8_WrFkp&) = delete; + public: WW8_WrFkp(ePLCFT ePl, WW8_FC nStartFc); ~WW8_WrFkp(); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 4eb59c56b6ee..3a0a93d436cd 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4507,11 +4507,15 @@ void WW8AttributeOutput::ParaWidows( const SvxWidowsItem& rWidows ) class SwWW8WrTabu { - sal_uInt8* pDel; // DelArray - sal_uInt8* pAddPos; // AddPos-Array - sal_uInt8* pAddTyp; // AddTyp-Array + sal_uInt8* pDel; // DelArray + sal_uInt8* pAddPos; // AddPos-Array + sal_uInt8* pAddTyp; // AddTyp-Array sal_uInt16 nAdd; // so viele Tabs kommen hinzu sal_uInt16 nDel; // so viele Tabs fallen weg + + SwWW8WrTabu(const SwWW8WrTabu&) = delete; + SwWW8WrTabu& operator=(const SwWW8WrTabu&) = delete; + public: SwWW8WrTabu(sal_uInt16 nDelMax, sal_uInt16 nAddMax); ~SwWW8WrTabu(); diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index c2f03bb1e1e1..941ce82286ec 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -211,6 +211,9 @@ private: long nIdx; ///< marker where we currently are sal_uInt32 nStru; + WW8PLCFspecial(const WW8PLCFspecial&) = delete; + WW8PLCFspecial& operator=(const WW8PLCFspecial&) = delete; + public: WW8PLCFspecial(SvStream* pSt, sal_uInt32 nFilePos, sal_uInt32 nPLCF, sal_uInt32 nStruct); @@ -329,6 +332,9 @@ class WW8PLCFpcd long nIMax; sal_uInt32 nStru; + WW8PLCFpcd(const WW8PLCFpcd&) = delete; + WW8PLCFpcd& operator=(const WW8PLCFpcd&) = delete; + public: WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos, sal_uInt32 nPLCF, sal_uInt32 nStruct); @@ -1045,6 +1051,9 @@ private: WW8PLCFpcd* OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ); void DeletePieceTable(); + WW8ScannerBase(const WW8ScannerBase&) = delete; + WW8ScannerBase& operator=(const WW8ScannerBase&) = delete; + public: WW8ScannerBase( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt, WW8Fib* pWwF ); @@ -1549,6 +1558,9 @@ public: class WW8Fonts { +private: + WW8Fonts(const WW8Fonts&) = delete; + WW8Fonts& operator=(const WW8Fonts&) = delete; protected: WW8_FFN* pFontA; // Array of Pointers to Font Description sal_uInt16 nMax; // Array-Size diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index e2a8e3bb52ec..557a00af2043 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -94,6 +94,8 @@ class SwImplShellAction public: explicit SwImplShellAction( SwDoc& rDoc ); ~SwImplShellAction(); + SwImplShellAction(const SwImplShellAction&) = delete; + SwImplShellAction& operator=(const SwImplShellAction&) = delete; }; SwImplShellAction::SwImplShellAction( SwDoc& rDoc ) diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index a00feb520dfd..1816662558bb 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -87,6 +87,9 @@ namespace ftp { XInteractionDisapproveImpl* p2; css::uno::Reference m_xRequest; + + XInteractionRequestImpl(const XInteractionRequestImpl&) = delete; + XInteractionRequestImpl& operator=(const XInteractionRequestImpl&) = delete; }; } diff --git a/ucb/source/ucp/webdav/AprEnv.hxx b/ucb/source/ucp/webdav/AprEnv.hxx index 3d724786c94a..8dae15db3689 100644 --- a/ucb/source/ucp/webdav/AprEnv.hxx +++ b/ucb/source/ucp/webdav/AprEnv.hxx @@ -47,6 +47,8 @@ class AprEnv AprEnv(); + AprEnv(const AprEnv&) = delete; + AprEnv& operator=(const AprEnv&) = delete; }; } // namespace apr_environment diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index af454a9f0ba4..e3218f649606 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -136,6 +136,9 @@ namespace private: SvpSalBitmap aTmpBmp; cairo_surface_t* source; + + SourceHelper(const SourceHelper&) = delete; + SourceHelper& operator=(const SourceHelper&) = delete; }; class MaskHelper @@ -196,6 +199,9 @@ namespace private: cairo_surface_t *mask; unsigned char* pAlphaBits; + + MaskHelper(const MaskHelper&) = delete; + MaskHelper& operator=(const MaskHelper&) = delete; }; } diff --git a/vcl/headless/svpglyphcache.cxx b/vcl/headless/svpglyphcache.cxx index f1af1e6a62c0..087fb7c4864b 100644 --- a/vcl/headless/svpglyphcache.cxx +++ b/vcl/headless/svpglyphcache.cxx @@ -34,6 +34,10 @@ namespace { private: GlyphCache* m_pSvpGlyphCache; + + GlyphCacheHolder(const GlyphCacheHolder&) = delete; + GlyphCacheHolder& operator=(const GlyphCacheHolder&) = delete; + public: GlyphCacheHolder() { diff --git a/vcl/opengl/FixedTextureAtlas.cxx b/vcl/opengl/FixedTextureAtlas.cxx index 7a980c9251e4..963818c17847 100644 --- a/vcl/opengl/FixedTextureAtlas.cxx +++ b/vcl/opengl/FixedTextureAtlas.cxx @@ -69,6 +69,10 @@ struct FixedTexture } return -1; } + +private: + FixedTexture(const FixedTexture&) = delete; + FixedTexture& operator=(const FixedTexture&) = delete; }; FixedTextureAtlasManager::FixedTextureAtlasManager(int nWidthFactor, int nHeightFactor, int nSubTextureSize) diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx index d4a99a71d240..0983958ef679 100644 --- a/vcl/source/filter/igif/decode.hxx +++ b/vcl/source/filter/igif/decode.hxx @@ -46,6 +46,8 @@ class GIFLZWDecompressor bool AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData); bool ProcessOneCode(); + GIFLZWDecompressor(const GIFLZWDecompressor&) = delete; + GIFLZWDecompressor& operator=(const GIFLZWDecompressor&) = delete; public: explicit GIFLZWDecompressor( sal_uInt8 cDataSize ); diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index d8edab2617de..b33ef2744ab0 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -274,6 +274,9 @@ private: void ImplPostProcess( const ImplPointArray& rArr ); + ImplChain(const ImplChain&) = delete; + ImplChain& operator=(const ImplChain&) = delete; + public: ImplChain(); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index f203f4e5f5f4..4937e5957e3b 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -106,6 +106,9 @@ private: bool mbResizeMode; bool mbShowDragRect; + ImplTBDragMgr(const ImplTBDragMgr&) = delete; + ImplTBDragMgr& operator=(const ImplTBDragMgr&) = delete; + public: ImplTBDragMgr(); ~ImplTBDragMgr(); diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index d98fe3fb2af9..c74498e3d00d 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -63,6 +63,10 @@ namespace { private: X11GlyphCache* m_pX11GlyphCache; + + GlyphCacheHolder(const GlyphCacheHolder&) = delete; + GlyphCacheHolder& operator=(const GlyphCacheHolder&) = delete; + public: GlyphCacheHolder() { diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 2f26cceb13ea..79744b2353df 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -1098,6 +1098,9 @@ private: sal_uInt16 mnPoints; sal_uInt16 mnPoly; bool bHasOffline; + + PolyArgs(const PolyArgs&) = delete; + PolyArgs& operator=(const PolyArgs&) = delete; }; PolyArgs::PolyArgs( tools::PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 314b9d64cc28..4c478ac73360 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -78,6 +78,9 @@ namespace xmloff const OUString& _rPropName, bool _bDefault ); + + OFormsRootExport(const OFormsRootExport&) = delete; + OFormsRootExport& operator=(const OFormsRootExport&) = delete; }; } // namespace xmloff -- cgit v1.2.3