summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-11-25 13:16:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-11-26 14:25:19 +0100
commitb8cbe67fa4c9fe63ff54e408cd64d885d4c21331 (patch)
tree757fcfeb9787248c343039a9d96d74aaa0d8ebac
parentdf701c92f3f8071d1dd6df70898c33d99e905e7e (diff)
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx4
1 files changed, 4 insertions, 0 deletions
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);