fdo#80280 Don't add items with no bitmaps

Change-Id: I625aff5d2dcae0b1491fa77b04605d4579ec8530

fdo#80280 Don't add items with no bitmaps
Change-Id: I625aff5d2dcae0b1491fa77b04605d4579ec8530
cf269216 · Maxim Monastirsky · 7ad6eb2c · cf269216
Kaydet (Commit) cf269216 authored Kas 17, 2014 tarafından Maxim Monastirsky
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

cfg.cxx cui/source/customize/cfg.cxx +10 -7

No files found.
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4887,17 +4887,20 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
        if ( graphics.getLength() > 0 )
        {
            Image img = Image( graphics[ 0 ] );
-            pTbSymbol->InsertItem( nId, img, pConstIter->first );
+            if ( !img.GetBitmapEx().IsEmpty() )
+            {
+                pTbSymbol->InsertItem( nId, img, pConstIter->first );
-            uno::Reference< graphic::XGraphic > xGraphic = graphics[ 0 ];
+                uno::Reference< graphic::XGraphic > xGraphic = graphics[ 0 ];
-            if ( xGraphic.is() )
+                if ( xGraphic.is() )
-                xGraphic->acquire();
+                    xGraphic->acquire();
-            pTbSymbol->SetItemData(
+                pTbSymbol->SetItemData(
-                nId, static_cast< void * > ( xGraphic.get() ) );
+                    nId, static_cast< void * > ( xGraphic.get() ) );
-            ++nId;
+                ++nId;
+            }
        }
        ++pConstIter;