diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-04 14:42:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-04 14:42:33 +0000 |
| commit | 90f63d4b2617e019891636946082a04de955677d (patch) | |
| tree | 74731a48d292363af378042d290a7c715e82da61 /framework | |
| parent | ebece222575829d444046dfe4b6a52113276e7c0 (diff) | |
INTEGRATION: CWS fwk25 (1.4.22); FILE MERGED
2005/10/14 14:03:42 cd 1.4.22.1: #126010# Use self-defined XBitmap references from context menu interceptor
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/helper/actiontriggerhelper.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx index 617303e6772a..afee49b0fe1e 100644 --- a/framework/source/helper/actiontriggerhelper.cxx +++ b/framework/source/helper/actiontriggerhelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: actiontriggerhelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:22:39 $ + * last change: $Author: kz $ $Date: 2005-11-04 15:42:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -229,10 +229,8 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta if ( !bImageSet ) { - // This is a unknown implementation of XBitmap interface. We have to + // This is an unknown implementation of a XBitmap interface. We have to // use a more time consuming way to build an Image! - // TODO: use memory streams to build a bitmap and this can be used - // to create an image!! Image aImage; Bitmap aBitmap; @@ -253,6 +251,9 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta } else aImage = Image( aBitmap ); + + if ( !!aImage ) + pSubMenu->SetItemImage( nNewItemId, aImage ); } } |