include/vcl/metric.hxx | 1 + vcl/source/font/fontmetric.cxx | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-)
New commits: commit b4f2aff5add027bf9155ee9fee9aaff79986821a Author: Caolán McNamara <[email protected]> Date: Fri Sep 2 09:10:59 2016 +0100 coverity#1371325 Missing move assignment operator Change-Id: Iebe5ec7e2cdc6743dbabdecaa7cbb1c4a04893c4 Reviewed-on: https://gerrit.libreoffice.org/28610 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index d4eb7ec..7299274 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -65,6 +65,7 @@ public: void SetBuiltInFontFlag(bool); FontMetric& operator=( const FontMetric& rMetric ); + FontMetric& operator=( FontMetric&& rMetric ); bool operator==( const FontMetric& rMetric ) const; bool operator!=( const FontMetric& rMetric ) const { return !operator==( rMetric ); } diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx index 28b506f..9cde929 100644 --- a/vcl/source/font/fontmetric.cxx +++ b/vcl/source/font/fontmetric.cxx @@ -48,15 +48,17 @@ FontMetric::~FontMetric() mxImplMetric = nullptr; } -FontMetric& FontMetric::operator=( const FontMetric& rFontMetric ) +FontMetric& FontMetric::operator=(const FontMetric& rFontMetric) { - Font::operator=( rFontMetric ); - - if( mxImplMetric != rFontMetric.mxImplMetric ) - { - mxImplMetric = rFontMetric.mxImplMetric; - } + Font::operator=(rFontMetric); + mxImplMetric = rFontMetric.mxImplMetric; + return *this; +} +FontMetric& FontMetric::operator=(FontMetric&& rFontMetric) +{ + Font::operator=(std::move(rFontMetric)); + mxImplMetric = std::move(rFontMetric.mxImplMetric); return *this; }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
