summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-02-09 11:56:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-02-09 11:56:32 +0000
commit070601483bc1addc01bbf11d39c8d58f07c64de0 (patch)
tree3fca0adf1e902251ae9aa3f02dffcabaaf885abb /framework
parent8ed3685cf4682097e1b00b8dc0c5db2206142245 (diff)
broken image isn't going to fly
There are intentional text-only toolbar entries e.g. print preview
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/toolbarmanager.cxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index fe94cc59df..1efed61b2e 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