include/vcl/image.hxx | 1 reportdesign/inc/reportformula.hxx | 2 - reportdesign/source/core/misc/reportformula.cxx | 9 -------- sc/inc/docoptio.hxx | 25 ------------------------ sd/inc/OutlinerIterator.hxx | 10 --------- sd/source/ui/view/OutlinerIterator.cxx | 14 ------------- vcl/source/image/Image.cxx | 6 +++++ 7 files changed, 7 insertions(+), 60 deletions(-)
New commits: commit c233b1b63750a995fcc0547459fae4cf3ec9e735 Author: Caolán McNamara <[email protected]> Date: Sun Sep 4 15:34:30 2016 +0100 coverity#1371177 default assign is good enough and coverity#1371311 coverity#1371240 Change-Id: I1f792b9a8e3e386633d4026d8b073ab615d243f3 diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 1e591b8..4e41ae2 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -56,8 +56,6 @@ namespace rptui ReportFormula( const BindType _eType, const OUString& _rFieldOrExpression ); ~ReportFormula(); - ReportFormula& operator=(class ReportFormula const &); - /// returns whether the object denotes a valid formula bool isValid() const; diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index d491791..bdecbc6 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -124,15 +124,6 @@ namespace rptui } bool ReportFormula::isValid() const { return getType() != Invalid; } - ReportFormula& ReportFormula::operator=(class ReportFormula const & _rHd) - { - if ( this == &_rHd ) - return *this; - m_eType = _rHd.m_eType; - m_sCompleteFormula = _rHd.m_sCompleteFormula; - m_sUndecoratedContent = _rHd.m_sUndecoratedContent; - return *this; - } OUString ReportFormula::getEqualUndecoratedContent() const { diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 5c0c28b..8e4ebb5 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -82,7 +82,6 @@ public: void ResetDocOptions(); - inline const ScDocOptions& operator=( const ScDocOptions& rOpt ); inline bool operator==( const ScDocOptions& rOpt ) const; inline bool operator!=( const ScDocOptions& rOpt ) const; @@ -112,30 +111,6 @@ public: bool IsWriteCalcConfig() const { return bWriteCalcConfig; } }; -inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) -{ - bIsIgnoreCase = rCpy.bIsIgnoreCase; - bIsIter = rCpy.bIsIter; - nIterCount = rCpy.nIterCount; - fIterEps = rCpy.fIterEps; - nPrecStandardFormat = rCpy.nPrecStandardFormat; - nDay = rCpy.nDay; - nMonth = rCpy.nMonth; - nYear = rCpy.nYear; - nYear2000 = rCpy.nYear2000; - nTabDistance = rCpy.nTabDistance; - bCalcAsShown = rCpy.bCalcAsShown; - bMatchWholeCell = rCpy.bMatchWholeCell; - bDoAutoSpell = rCpy.bDoAutoSpell; - bLookUpColRowNames = rCpy.bLookUpColRowNames; - bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled; - bFormulaWildcardsEnabled = rCpy.bFormulaWildcardsEnabled; - eFormulaSearchType = rCpy.eFormulaSearchType; - bWriteCalcConfig = rCpy.bWriteCalcConfig; - - return *this; -} - inline bool ScDocOptions::operator==( const ScDocOptions& rOpt ) const { return ( diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index d5a4392..c4a1308 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -303,16 +303,6 @@ public: */ IteratorPosition (const IteratorPosition& aPosition); - /// The destructor is a no-op at the moment. - ~IteratorPosition(); - /** Assign the content of the given position to this one. - @param aPosition - This is the position object from which to take the values of all - data members. - @return - Returns a reference to this object. - */ - IteratorPosition& operator= (const IteratorPosition& aPosition); /** Compare two positions for equality. @return <TRUE/> is returned only when all data members have the same diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 1eb3351..36cdb32 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -53,20 +53,6 @@ IteratorPosition::IteratorPosition (const IteratorPosition& aPosition) { } -IteratorPosition::~IteratorPosition() -{ -} - -IteratorPosition& IteratorPosition::operator= (const IteratorPosition& aPosition) -{ - mxObject = aPosition.mxObject; - mnText = aPosition.mnText; - mnPageIndex = aPosition.mnPageIndex; - mePageKind = aPosition.mePageKind; - meEditMode = aPosition.meEditMode; - return *this; -} - bool IteratorPosition::operator== (const IteratorPosition& aPosition) const { return mxObject.get() == aPosition.mxObject.get() commit c5653039412114a14eb0b53e6e1ca26efaf468cd Author: Caolán McNamara <[email protected]> Date: Sun Sep 4 15:26:12 2016 +0100 coverity#1371167 Missing move assignment operator Change-Id: I95bafeb32b0444bf387efc1f6a56018975f09f29 diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 910bb02..1803c9b 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -62,6 +62,7 @@ public: bool operator!() const { return !mpImplData; } Image& operator=( const Image& rImage ); + Image& operator=( Image&& rImage ); bool operator==( const Image& rImage ) const; bool operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); } diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index 20c3777..de1774e 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -201,6 +201,12 @@ Image& Image::operator=( const Image& rImage ) return *this; } +Image& Image::operator=( Image&& rImage ) +{ + std::swap(mpImplData, rImage.mpImplData); + return *this; +} + bool Image::operator==(const Image& rImage) const { bool bRet = false;
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
