diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-09 15:50:10 +0000 |
---|---|---|
committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-02-09 18:48:06 +0000 |
commit | 0867eac7f862a9f871186df3482e8c1362a15175 (patch) | |
tree | b19085ba1ffbbf3213def4539828dab3ac133b24 /framework | |
parent | 5674cf16d2e053ac0590e665310683654b1036d7 (diff) |
coverity#1169826 Dereference after null check
Change-Id: Ie431672b5a6ba1d613ae1cb9e48fa6d1db6a6b4a
(cherry picked from commit 57e0062f2043f7a0382db5f4d01c6c70ca8aca46)
Reviewed-on: https://gerrit.libreoffice.org/7953
Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com>
Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index b5e4302ba93a..1a1f410df0bc 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -209,7 +209,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) if ( pResMgr->IsAvailable( 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 if ( m_bShowMenuImages ) @@ -356,9 +356,11 @@ void ControlMenuController::impl_setPopupMenu() ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr ); aResId.SetRT( RSC_MENU ); if ( pResMgr->IsAvailable( aResId )) + { m_pResPopupMenu = new PopupMenu( aResId ); + updateImagesPopupMenu( m_pResPopupMenu ); + } - updateImagesPopupMenu( m_pResPopupMenu ); delete pResMgr; } } // if ( m_pResPopupMenu == 0 ) |