[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ea31d3cc8566eeb9d3dbf55b385d8c619daaddf9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 25 13:14:28 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 26 16:31:03 2019 +0100

    tdf#126043 we can use the stock attribute to skip an intermediate Bitmap
    
    Change-Id: I8fb3c348cff92fe5b47d7473dc23684b3bdc6dad
    Reviewed-on: https://gerrit.libreoffice.org/83679
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 9238651b44ef..a64edcd8c1be 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2909,6 +2909,10 @@ namespace
     {
         Image aImage(rImage);
 
+        OUString sStock(aImage.GetStock());
+        if (!sStock.isEmpty())
+            return ::load_icon_by_name(sStock);
+
         std::unique_ptr<SvMemoryStream> xMemStm(new SvMemoryStream);
         vcl::PNGWriter aWriter(aImage.GetBitmapEx());
         aWriter.Write(*xMemStm);