continue if theme cannot be determined

Change-Id: Ia5b6e77b66357dd74c5163472e07a5c31166e8d2

continue if theme cannot be determined
Change-Id: Ia5b6e77b66357dd74c5163472e07a5c31166e8d2
d712a4f8 · Caolán McNamara · 06bf9330 · d712a4f8
Kaydet (Commit) d712a4f8 authored Haz 15, 2017 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 2 deletions

bitmapex.cxx vcl/source/gdi/bitmapex.cxx +13 -2

No files found.
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -96,9 +96,20 @@ BitmapEx::BitmapEx( const OUString& rIconName )

 void BitmapEx::loadFromIconTheme( const OUString& rIconName )
 {
-    OUString aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme();
+    bool bSuccess;
+    OUString aIconTheme;

-    if (!ImageTree::get().loadImage(rIconName, aIconTheme, *this, true))
+    try
+    {
+        aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme();
+        bSuccess = ImageTree::get().loadImage(rIconName, aIconTheme, *this, true);
+    }
+    catch (...)
+    {
+        bSuccess = false;
+    }
+
+    if (!bSuccess)
    {
 #ifdef DBG_UTIL
        OStringBuffer aErrorStr(