Skip to content

C
core
Kaydet (Commit) 57e0062f authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#1169826 Dereference after null check 

Change-Id: Ie431672b5a6ba1d613ae1cb9e48fa6d1db6a6b4a
üst daf4fb95
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
framework/source/uielement/controlmenucontroller.cxx
Dosyayı görüntüle @ 57e0062f
...@@ -264,7 +264,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) ...@@ -264,7 +264,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
if ( pResMgr->IsAvailable( aResId )) if ( pResMgr->IsAvailable( aResId ))
{ {
ImageList aImageList( aResId ); ImageList aImageList( aResId );
for ( sal_uInt32 i=0; i < sizeof(nConvertSlots)/sizeof(nConvertSlots[0]); ++i ) for ( sal_uInt32 i=0; i < sizeof(nConvertSlots)/sizeof(nConvertSlots[0]); ++i )
{ {
// das entsprechende Image dran // das entsprechende Image dran
if ( m_bShowMenuImages ) if ( m_bShowMenuImages )
...@@ -411,9 +411,11 @@ void ControlMenuController::impl_setPopupMenu() ...@@ -411,9 +411,11 @@ void ControlMenuController::impl_setPopupMenu()
ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr ); ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr );
aResId.SetRT( RSC_MENU ); aResId.SetRT( RSC_MENU );
if ( pResMgr->IsAvailable( aResId )) if ( pResMgr->IsAvailable( aResId ))
{
m_pResPopupMenu = new PopupMenu( aResId ); m_pResPopupMenu = new PopupMenu( aResId );
updateImagesPopupMenu( m_pResPopupMenu );
}
updateImagesPopupMenu( m_pResPopupMenu );
delete pResMgr; delete pResMgr;
} }
} // if ( m_pResPopupMenu == 0 ) } // if ( m_pResPopupMenu == 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment