mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#1371220 Missing move assignment operator

Browse Source 
Change-Id: Ie2947ea621da7ffc6c9530f007e1acdd4efb50cb
Reviewed-on: https://gerrit.libreoffice.org/32650
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2017-01-02 15:17:33 +00:00
parent 9d6a749bc6
commit f97cd16ea4
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/svl/svdde.hxx
View File

@ -65,9 +65,10 @@ class SVL_DLLPUBLIC DdeData
public: public:
DdeData(); DdeData();
DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER SotClipboardFormatId = SotClipboardFormatId::STRING ); DdeData(SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER SotClipboardFormatId = SotClipboardFormatId::STRING);
DdeData( SAL_UNUSED_PARAMETER const OUString& ); DdeData(SAL_UNUSED_PARAMETER const OUString&);
DdeData( const DdeData& ); DdeData(const DdeData&);
DdeData(DdeData&&);
~DdeData(); ~DdeData();
void const * getData() const; void const * getData() const;
@ -75,7 +76,8 @@ public:
SotClipboardFormatId GetFormat() const; SotClipboardFormatId GetFormat() const;
DdeData& operator = ( const DdeData& ); DdeData& operator=(const DdeData&);
DdeData& operator=(DdeData&&);
static sal_uLong GetExternalFormat(SotClipboardFormatId nFmt); static sal_uLong GetExternalFormat(SotClipboardFormatId nFmt);
static SotClipboardFormatId GetInternalFormat(sal_uLong nFmt); static SotClipboardFormatId GetInternalFormat(sal_uLong nFmt);

15
svl/source/svdde/ddedata.cxx
View File

@ -57,7 +57,7 @@ DdeData::DdeData( const OUString& s )
xImp->nFmt = SotClipboardFormatId::STRING; xImp->nFmt = SotClipboardFormatId::STRING;
} }
DdeData::DdeData( const DdeData& rData ) DdeData::DdeData(const DdeData& rData)
{ {
xImp.reset(new DdeDataImp); xImp.reset(new DdeDataImp);
xImp->hData = rData.xImp->hData; xImp->hData = rData.xImp->hData;
@ -67,6 +67,11 @@ DdeData::DdeData( const DdeData& rData )
Lock(); Lock();
} }
DdeData::DdeData(DdeData&& rData)
: xImp(std::move(rData.xImp))
{
}
DdeData::~DdeData() DdeData::~DdeData()
{ {
if (xImp && xImp->hData) if (xImp && xImp->hData)
@ -99,7 +104,7 @@ long DdeData::getSize() const
return xImp->nData; return xImp->nData;
} }
DdeData& DdeData::operator = ( const DdeData& rData ) DdeData& DdeData::operator=(const DdeData& rData)
{ {
if ( &rData != this ) if ( &rData != this )
{ {
@ -110,6 +115,12 @@ DdeData& DdeData::operator = ( const DdeData& rData )
return *this; return *this;
} }
DdeData& DdeData::operator=(DdeData&& rData)
{
xImp = std::move(rData.xImp);
return *this;
}
sal_uLong DdeData::GetExternalFormat(SotClipboardFormatId nFmt) sal_uLong DdeData::GetExternalFormat(SotClipboardFormatId nFmt)
{ {
switch( nFmt ) switch( nFmt )

13
svl/unx/source/svdde/ddedummy.cxx
View File

@ -32,7 +32,11 @@ DdeData::DdeData( const OUString& )
{ {
} }
DdeData::DdeData( const DdeData& ) DdeData::DdeData(const DdeData&)
{
}
DdeData::DdeData(DdeData&&)
{ {
} }
@ -53,7 +57,12 @@ SotClipboardFormatId DdeData::GetFormat() const
return SotClipboardFormatId::NONE; return SotClipboardFormatId::NONE;
} }
DdeData& DdeData::operator = ( const DdeData& ) DdeData& DdeData::operator=(const DdeData&)
{
return *this;
}
DdeData& DdeData::operator=(DdeData&&)
{ {
return *this; return *this;
} }