[Libreoffice-commits] core.git: sal/qa vcl/source

[Libreoffice Gerrit user]

 sal/qa/rtl/ref/rtl_ref.cxx     |    4 ++--
 vcl/source/font/fontmetric.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dbd9ff5a29d60209ddff958ba9f8a1929011e5f7
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 6 17:18:32 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Sep 7 10:17:03 2018 +0200

    clang-tidy bugprone-use-after-move
    
    Change-Id: I6213706ace039492429349c2459923b0e9a5d758
    Reviewed-on: https://gerrit.libreoffice.org/60127
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sal/qa/rtl/ref/rtl_ref.cxx b/sal/qa/rtl/ref/rtl_ref.cxx
index d8dc59e65839..e3987d9bb267 100644
--- a/sal/qa/rtl/ref/rtl_ref.cxx
+++ b/sal/qa/rtl/ref/rtl_ref.cxx
@@ -70,7 +70,7 @@ class TestReferenceRefCounting : public CppUnit::TestFixture
 
         // test1 now contains a null pointer
         CPPUNIT_ASSERT_MESSAGE("!test1.is()",
-                               !test1.is());
+                               !test1.is()); // NOLINT(bugprone-use-after-move)
 
         // function return should move the reference
         test2 = get_reference( &cTestClass );
@@ -94,7 +94,7 @@ class TestReferenceRefCounting : public CppUnit::TestFixture
         CPPUNIT_ASSERT_MESSAGE("!test1.is()",
                                !test1.is());
         CPPUNIT_ASSERT_MESSAGE("!test2.is()",
-                               !test2.is());
+                               !test2.is()); // NOLINT(bugprone-use-after-move)
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("cTestClass.use_count() == 0",
                                static_cast<long>(0), cTestClass.use_count());
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 6ed8fdb97496..5a108ca26f47 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -65,8 +65,8 @@ FontMetric& FontMetric::operator=(const FontMetric& rFontMetric)
 
 FontMetric& FontMetric::operator=(FontMetric&& rFontMetric)
 {
-    Font::operator=(std::move(rFontMetric));
     mxImplMetric = std::move(rFontMetric.mxImplMetric);
+    Font::operator=(std::move(rFontMetric));
     return *this;
 }