[Libreoffice-commits] .: framework/source

[Caolán McNamara]

 framework/source/uielement/toolbarmanager.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 070601483bc1addc01bbf11d39c8d58f07c64de0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 9 11:56:32 2011 +0000

    broken image isn't going to fly
    
    There are intentional text-only toolbar entries e.g. print preview

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index fe94cc5..1efed61 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -91,7 +91,6 @@
 #include <unotools/cmdoptions.hxx>
 #include <boost/bind.hpp>
 #include <svtools/acceleratorexecute.hxx>
-#include <vcl/imagerepository.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespaces
@@ -1559,18 +1558,11 @@ void ToolBarManager::RequestImages()
         if ( !aImage )
         {
             aImage = Image( aModGraphicSeq[i] );
-            // Try also to query for add-on images
+            // Try also to query for add-on images before giving up and use an
+            // empty image.
             if ( !aImage )
                 aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages );
 
-            // Give up and use a placeholder image.
-            if (!aImage)
-            {
-                BitmapEx aBitmap;
-                if (::vcl::ImageRepository::loadDefaultImage(aBitmap))
-                    aImage = Image(aBitmap);
-            }
-
             pIter->second.nImageInfo = 1; // mark image as module based
         }
         else