vcl/unx/gtk3/gtk3gtkinst.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit b8cbe67fa4c9fe63ff54e408cd64d885d4c21331
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 25 13:16:43 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Nov 26 14:25:19 2019 +0100
tdf#126043 we can use the stock attribute to skip an intermediate Bitmap
Change-Id: I972774bb2b2b3e494804145a1eebca57e519c3bd
Reviewed-on: https://gerrit.libreoffice.org/83680
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b182270b23d3..eaa83a421116 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2922,6 +2922,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);
css::uno::Sequence<css::beans::PropertyValue> aFilterData(1);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
