vcl/source/bitmap/BitmapTools.cxx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
New commits: commit e214c09a6c8315f25a27360420cf67fa20299bf8 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Wed May 20 21:15:59 2020 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Wed May 20 21:15:59 2020 +0200 vcl: change bitmap::loadFromName to be like BitmapEx const. Change-Id: Icb055c55b261514a91d76ce2dcb74862152fca56 diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index 9323bffb8e2a..49fa66d8aba5 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; + 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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
