Kaydet (Commit) f97cd16e authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1371220 Missing move assignment operator

Change-Id: Ie2947ea621da7ffc6c9530f007e1acdd4efb50cb
Reviewed-on: https://gerrit.libreoffice.org/32650Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 9d6a749b
......@@ -65,9 +65,10 @@ class SVL_DLLPUBLIC DdeData
public:
DdeData();
DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER SotClipboardFormatId = SotClipboardFormatId::STRING );
DdeData( SAL_UNUSED_PARAMETER const OUString& );
DdeData( const DdeData& );
DdeData(SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER SotClipboardFormatId = SotClipboardFormatId::STRING);
DdeData(SAL_UNUSED_PARAMETER const OUString&);
DdeData(const DdeData&);
DdeData(DdeData&&);
~DdeData();
void const * getData() const;
......@@ -75,7 +76,8 @@ public:
SotClipboardFormatId GetFormat() const;
DdeData& operator = ( const DdeData& );
DdeData& operator=(const DdeData&);
DdeData& operator=(DdeData&&);
static sal_uLong GetExternalFormat(SotClipboardFormatId nFmt);
static SotClipboardFormatId GetInternalFormat(sal_uLong nFmt);
......
......@@ -57,7 +57,7 @@ DdeData::DdeData( const OUString& s )
xImp->nFmt = SotClipboardFormatId::STRING;
}
DdeData::DdeData( const DdeData& rData )
DdeData::DdeData(const DdeData& rData)
{
xImp.reset(new DdeDataImp);
xImp->hData = rData.xImp->hData;
......@@ -67,6 +67,11 @@ DdeData::DdeData( const DdeData& rData )
Lock();
}
DdeData::DdeData(DdeData&& rData)
: xImp(std::move(rData.xImp))
{
}
DdeData::~DdeData()
{
if (xImp && xImp->hData)
......@@ -99,7 +104,7 @@ long DdeData::getSize() const
return xImp->nData;
}
DdeData& DdeData::operator = ( const DdeData& rData )
DdeData& DdeData::operator=(const DdeData& rData)
{
if ( &rData != this )
{
......@@ -110,6 +115,12 @@ DdeData& DdeData::operator = ( const DdeData& rData )
return *this;
}
DdeData& DdeData::operator=(DdeData&& rData)
{
xImp = std::move(rData.xImp);
return *this;
}
sal_uLong DdeData::GetExternalFormat(SotClipboardFormatId nFmt)
{
switch( nFmt )
......
......@@ -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;
}
DdeData& DdeData::operator = ( const DdeData& )
DdeData& DdeData::operator=(const DdeData&)
{
return *this;
}
DdeData& DdeData::operator=(DdeData&&)
{
return *this;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment