From 0f4a8becb467bd699ab2eb1f0532a6431a689579 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 28 Jan 2005 16:20:16 +0000 Subject: INTEGRATION: CWS fwkbeta03 (1.17.8); FILE MERGED 2005/01/26 09:06:26 cd 1.17.8.1: #i41339# Retrieve menu images only on demand --- framework/source/uielement/menubarmanager.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'framework') diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 8fb83aeed021..fce9c18a12b0 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menubarmanager.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2005-01-21 09:51:37 $ + * last change: $Author: rt $ $Date: 2005-01-28 17:20:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1821,12 +1821,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, Reference< XFrame >& rFrame, if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } - else if ( !pMenu->GetItemImage( nItemId )) - { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); - if ( !!aImage ) - pMenu->SetItemImage( nItemId, aImage ); - } + else + m_bRetrieveImages = sal_True; } MenuItemHandler* pItemHandler = new MenuItemHandler( nItemId, xStatusListener, xDispatch ); -- cgit