diff options
Diffstat (limited to 'framework/source/uielement/generictoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 6ed76510a5b3..fc6ad416e93f 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -362,8 +362,14 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime } } + if ( !pMenu || !m_pToolbar ) + return NULL; + + OSL_ENSURE ( pMenu->GetItemCount(), "Empty PopupMenu!" ); + ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) ); pMenu->Execute( m_pToolbar, aRect, POPUPMENU_EXECUTE_DOWN ); + return NULL; } } // namespace |