vcl/source/bitmap/BitmapTools.cxx | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit f94aae5cbab5b826ea8821e9ed3b456d65c03c70
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed May 20 21:15:59 2020 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu May 21 07:32:30 2020 +0200
vcl: change bitmap::loadFromName to be like BitmapEx const.
Change-Id: Icb055c55b261514a91d76ce2dcb74862152fca56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94603
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/source/bitmap/BitmapTools.cxx
b/vcl/source/bitmap/BitmapTools.cxx
index 9323bffb8e2a..f0c5c522b7de 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -46,11 +46,20 @@ namespace vcl::bitmap
BitmapEx loadFromName(const OUString& rFileName, const ImageLoadFlags eFlags)
{
+ bool bSuccess = true;
+ OUString aIconTheme;
BitmapEx aBitmapEx;
+ try
+ {
+ aIconTheme =
Application::GetSettings().GetStyleSettings().DetermineIconTheme();
+ ImageTree::get().loadImage(rFileName, aIconTheme, aBitmapEx, true,
eFlags);
+ }
+ catch (...)
+ {
+ bSuccess = false;
+ }
- OUString aIconTheme =
Application::GetSettings().GetStyleSettings().DetermineIconTheme();
-
- ImageTree::get().loadImage(rFileName, aIconTheme, aBitmapEx, true, eFlags);
+ SAL_WARN_IF(!bSuccess, "vcl", "vcl::bitmap::loadFromName : could not load
image " << rFileName << " via icon theme " << aIconTheme);
return aBitmapEx;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
