coverity#1213247 Dereference null return value

Change-Id: I039536322fd1c9c786c4cd7088807aee7e2e929d

coverity#1213247 Dereference null return value
Change-Id: I039536322fd1c9c786c4cd7088807aee7e2e929d
98979134 · Caolán McNamara · 3e40e67b · 98979134
Kaydet (Commit) 98979134 authored May 10, 2014 tarafından Caolán McNamara
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

controlmenucontroller.cxx framework/source/uielement/controlmenucontroller.cxx +5 -2

No files found.
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -321,10 +321,13 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
        }
    }

+    VCLXPopupMenu*  pPopupMenu = NULL;
+
    if ( nMenuId )
-    {
-        VCLXPopupMenu*  pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
+        pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );

+    if (pPopupMenu)
+    {
        SolarMutexGuard aSolarMutexGuard;

        PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();