[Libreoffice-commits] core.git: Branch 'refs/tags/libreoffice-6.4.0.3' - 2 commits - dictionaries helpcontent2 sfx2/source translations

Christian Lohmaier (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 21 22:29:10 UTC 2020


Rebased ref, commits from common ancestor:
commit 6de224840064dc8feb73e169b2d78670d3ec3d54
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Tue Jan 21 23:26:31 2020 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Jan 21 23:26:31 2020 +0100

    Version 6.4.0.3, tag libreoffice-6.4.0.3

diff --git a/dictionaries b/dictionaries
index 288ed78013d9..45a228882514 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 288ed78013d9df0bfadf604c412c9e25c8ee6e59
+Subproject commit 45a22888251481231a5bc0a9eb900f8bb0d621c6
diff --git a/helpcontent2 b/helpcontent2
index 2beba1663a2f..294d8ae73313 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2beba1663a2f069fa01badb5a4aceb4e37f24cd9
+Subproject commit 294d8ae733135ded7391ac15170b8bd4e4f5babb
diff --git a/translations b/translations
index fd49d16dcc4e..fb7fffe34792 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fd49d16dcc4ec31b0b02b7e7e7437a99f7d1a6bc
+Subproject commit fb7fffe34792f0a3349fdf085273cc465747456c
commit 0768fa976bd44f6a9c96720dcc1a0272c0364e8b
Author:     Xisco Faulí <xiscofauli at libreoffice.org>
AuthorDate: Fri Jan 17 14:44:21 2020 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Jan 21 23:20:33 2020 +0100

    tdf#129788: Revert "no need to use AlphaMask in RecentDocsViewItem"
    
    This reverts commit 31bd8c4a4a4752dcff12ee35636193f79a6d6137.
    
    Similar to 5c54778aad677d6bb6e6687f0f43dffad1aefa1e
    
    Change-Id: Ibb4daa702df1f683888b92b8b8041f28e25e6b04
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86998
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit d720e120b6534ff2fdf6cb11f0b46eca454d4e34)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87051
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 908a679a5629..85d84ddc699d 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -91,7 +91,8 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView &rView, const OUStri
         }
 
         // create empty, and copy the default thumbnail in
-        aThumbnail = BitmapEx(aThumbnailSize, 24);
+        sal_uInt8 nAlpha = 255;
+        aThumbnail = BitmapEx(Bitmap(aThumbnailSize, 24), AlphaMask(aThumbnailSize, &nAlpha));
 
         aThumbnail.CopyPixel(
                 ::tools::Rectangle(Point((aThumbnailSize.Width() - aExtSize.Width()) / 2, (aThumbnailSize.Height() - aExtSize.Height()) / 2), aExtSize),


More information about the Libreoffice-commits mailing list