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

[Noel Grandin (via logerrit)]

 sw/qa/extras/layout/layout.cxx |    5 ++---
 vcl/source/gdi/bitmapex.cxx    |   14 +++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 36f306d8891ef8cba53676e4a2a30434718228e4
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Apr 30 10:49:44 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 1 08:06:49 2019 +0200

    fix bug in BitmapEx::operator==
    
    Just because this image is transparent, does not mean it is equal to the
    other image.
    
    Similarly, just because this image has transparency color, does not mean
    the other image has valid transparency color.
    
    Also move the cheaper mbAlpha check before the more expensive
    ShallowEquals check.
    
    there since
        commit 8ab086b6cc054501bfbf7ef6fa509c393691e860
        Date:   Mon Sep 18 16:07:07 2000 +0000
        initial import
    
    Change-Id: I63033bc8e7fed991513a171e637768e826eafad9
    Reviewed-on: https://gerrit.libreoffice.org/71572
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 7c90e6d349ef..e5aea9401e9f 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -187,13 +187,17 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
     if (GetSizePixel() != rBitmapEx.GetSizePixel())
         return false;
 
-    if (meTransparent == TransparentType::NONE)
-        return true;
+    if (meTransparent != rBitmapEx.meTransparent)
+        return false;
 
-    if (meTransparent == TransparentType::Color)
-        return maTransparentColor == rBitmapEx.maTransparentColor;
+    if (meTransparent == TransparentType::Color
+        && maTransparentColor != rBitmapEx.maTransparentColor)
+        return false;
+
+    if (mbAlpha != rBitmapEx.mbAlpha)
+        return false;
 
-    return maMask.ShallowEquals(rBitmapEx.maMask) && mbAlpha == rBitmapEx.mbAlpha;
+    return maMask.ShallowEquals(rBitmapEx.maMask);
 }
 
 bool BitmapEx::IsEmpty() const
commit 71d329d142806151e8a32c058abd57f38b795486
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Apr 30 23:12:14 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 1 08:06:35 2019 +0200

    loplugin:stringconstant in sw/qa/extras/layout
    
    Change-Id: I4934240946b435e7b5b13c2623143f7741106efa
    Reviewed-on: https://gerrit.libreoffice.org/71599
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 3e8e597dd6e8..381f9c0087b6 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2741,10 +2741,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122607_regression)
     if (mxComponent.is())
         mxComponent->dispose();
 
-    auto const pName("tdf122607_leerzeile.odt");
+    OUString const pName("tdf122607_leerzeile.odt");
 
-    OUString const url(m_directories.getURLFromSrc(DATA_DIRECTORY)
-                       + OUString::createFromAscii(pName));
+    OUString const url(m_directories.getURLFromSrc(DATA_DIRECTORY) + pName);
 
     // note: must set Hidden property, so that SfxFrameViewWindow_Impl::Resize()
     // does *not* forward initial VCL Window Resize and thereby triggers a