diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-02-09 11:39:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-02-09 11:39:02 +0000 |
| commit | 8a99338e6a39f25f56490a1941b3bbdc9508539c (patch) | |
| tree | 8402790a1bb0e12e897209d838b08520287bcd98 /framework/source/uiconfiguration | |
| parent | a69aca13ee5d94250001b534040cfe9f4880a0f0 (diff) | |
don't show broken icon for missing menu entries, but do for toolbar entries
Diffstat (limited to 'framework/source/uiconfiguration')
| -rw-r--r-- | framework/source/uiconfiguration/imagemanagerimpl.cxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 15f324185ddb..e3a502074a18 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -63,12 +63,6 @@ #include <rtl/logfile.hxx> #include "svtools/miscopt.hxx" -#include "vcl/imagerepository.hxx" - -//_________________________________________________________________________________________________________________ -// namespaces -//_________________________________________________________________________________________________________________ - using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; @@ -363,15 +357,7 @@ GlobalImageList::~GlobalImageList() Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ) { osl::MutexGuard guard( getGlobalImageListMutex() ); - Image aImage = CmdImageList::getImageFromCommandURL( nImageType, rCommandURL ); - if (!aImage) - { - BitmapEx rBitmap; - bool res = ::vcl::ImageRepository::loadDefaultImage(rBitmap); - if (res) - aImage = Image(rBitmap); - } - return aImage; + return CmdImageList::getImageFromCommandURL( nImageType, rCommandURL ); } bool GlobalImageList::hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ) |