diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:10:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:10:03 +0000 |
| commit | 2508e1e5a6f65d6d94a91931fd040ed44350fc95 (patch) | |
| tree | 75d135c2a48c20f6b2293554c40684b664ed00ba /sfx2/source/appl/imagemgr.cxx | |
| parent | ac8bc3906ecc1a18fcc7c007482a3ae77b72e245 (diff) | |
INTEGRATION: CWS warnings01 (1.14.66); FILE MERGED
2006/05/23 21:31:21 sb 1.14.66.3: RESYNC: (1.14-1.15); FILE MERGED
2005/11/28 16:13:24 cd 1.14.66.2: #i55991# Remove warnings
2005/11/09 12:03:09 cd 1.14.66.1: #i55991# Make code warning free for gcc
Diffstat (limited to 'sfx2/source/appl/imagemgr.cxx')
| -rw-r--r-- | sfx2/source/appl/imagemgr.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index d68995a71f99..955a3ec23b02 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: imagemgr.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2006-05-02 16:19:38 $ + * last change: $Author: hr $ $Date: 2006-06-19 22:10:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -133,7 +133,7 @@ Image SAL_CALL GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::fra sal_Int64 nHandle = xObj.is() ? xObj->getSomething( aSeq ) : 0; if ( nHandle ) { - SfxObjectShell* pDoc = (SfxObjectShell*) (sal_Int32*) nHandle; + SfxObjectShell* pDoc = reinterpret_cast<SfxObjectShell*>(sal::static_int_cast<sal_IntPtr>( nHandle )); SfxModule* pModule = pDoc->GetFactory().GetModule(); pSlot = pModule->GetSlotPool()->GetSlot( nId ); } @@ -229,13 +229,6 @@ Image SAL_CALL GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::fra m_aModuleIdToImageMgrMap.insert( ModuleIdToImagegMgr::value_type( aModuleId, xModuleImageManager )); } - sal_Int16 nImageType( ::com::sun::star::ui::ImageType::COLOR_NORMAL| - ::com::sun::star::ui::ImageType::SIZE_DEFAULT ); - if ( bBig ) - nImageType |= ::com::sun::star::ui::ImageType::SIZE_LARGE; - if ( bHiContrast ) - nImageType |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST; - Sequence< Reference< ::com::sun::star::graphic::XGraphic > > aGraphicSeq; Sequence< rtl::OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCommandURL; |