[Libreoffice-commits] core.git: cui/source

[Maxim Monastirsky]

 cui/source/customize/cfg.cxx |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit cf26921658c0905a4d2dda13f91e3db99c76ade6
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Tue Nov 18 01:24:31 2014 +0200

    fdo#80280 Don't add items with no bitmaps
    
    Change-Id: I625aff5d2dcae0b1491fa77b04605d4579ec8530

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index b00dcd0..b015f08 100644
--- 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() )
-                xGraphic->acquire();
+                if ( xGraphic.is() )
+                    xGraphic->acquire();
 
-            pTbSymbol->SetItemData(
-                nId, static_cast< void * > ( xGraphic.get() ) );
+                pTbSymbol->SetItemData(
+                    nId, static_cast< void * > ( xGraphic.get() ) );
 
-            ++nId;
+                ++nId;
+            }
         }
 
         ++pConstIter;