diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-11-03 09:59:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-11-03 09:59:38 +0000 |
| commit | ba9850edf9c8b169418d01c9567c97d34b44849d (patch) | |
| tree | ff13a025384a6a8a418979c224d6e0d4780fa38d /framework/source/helper/popupmenucontrollerbase.cxx | |
| parent | b0923dadf7fc8c027130d60f6974a4b0c30f9cbc (diff) | |
CWS-TOOLING: integrate CWS dba32i
2009-11-02 08:24:27 +0100 oj r277285 : i105959# simply logic again
2009-10-30 14:47:31 +0100 oj r277271 : #i105959# duplicate contion row when new or criteria was found
2009-10-30 14:46:50 +0100 oj r277270 : #i105959# replace boolean_term with search_condition and add extra ()
2009-10-28 08:12:38 +0100 oj r277235 : #i105825# try catch in the wrong place
2009-10-27 12:15:40 +0100 fs r277197 : compiler bug: streaming a volatile double into an Any results in a boolean-Any ... removed the 'volatile', which was nonsense, anyway
2009-10-23 22:07:54 +0200 fs r277171 : #i103611# re-introduced the hack for transparent VCL child windows, which got lost since OOo 3.1.x (commit approved by aw)
2009-10-23 07:11:59 +0200 oj r277131 : #i105959# handle parameter like column_ref
2009-10-22 14:57:55 +0200 fs r277124 : #i10000# wrongly resolved the merge conflict, corrected now
2009-10-22 13:53:23 +0200 oj r277118 : #i105959# change config when doc location has changed
2009-10-22 11:31:22 +0200 oj r277111 : #i106072# attachprovider at the end of doc
2009-10-22 09:12:47 +0200 fs r277102 : CWS-TOOLING: rebase CWS dba32i to branches/OOO320@276942 (milestone: OOO320:m2)
2009-10-21 21:13:02 +0200 fs r277101 : module 'data' does not exist anymore (for a long time by now), so now need to list it here
2009-10-21 13:35:35 +0200 fs r277089 : #i105992#
2009-10-21 13:17:51 +0200 fs r277088 : reintroduced the fix for issue #i102090#, which got lost since 3.1.1, during one of the many merges/changes
2009-10-21 13:06:55 +0200 fs r277085 : #i105992# position the control in isPrimitiveVisible, not in get2DDecomposition. The latter might not be called in some situations, the former (hopefully) always is
2009-10-20 07:35:27 +0200 oj r277036 : #i106041# check the dispatch in impl_select not before
2009-10-13 08:40:52 +0200 oj r276843 : #i105825# throw exception when database was written by newer version
2009-10-12 14:32:19 +0200 oj r276834 : #i105724# check tDisplayCondition
2009-10-12 13:24:28 +0200 fs r276829 : #i105806# getPropertyValue: throw an UnknownPropertyException for, well, unknown properties
2009-10-12 10:46:27 +0200 fs r276821 : since tags
2009-10-09 10:51:29 +0200 fs r276800 : #i105712# re-introduce XUnoTunnel
2009-10-09 10:46:48 +0200 oj r276799 : #i105716# end chars with 0
Diffstat (limited to 'framework/source/helper/popupmenucontrollerbase.cxx')
| -rw-r--r-- | framework/source/helper/popupmenucontrollerbase.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/helper/popupmenucontrollerbase.cxx index e8215eccca..8b6f75aa53 100644 --- a/framework/source/helper/popupmenucontrollerbase.cxx +++ b/framework/source/helper/popupmenucontrollerbase.cxx @@ -186,7 +186,9 @@ void SAL_CALL PopupMenuControllerBase::highlight( const css::awt::MenuEvent& ) t void PopupMenuControllerBase::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL) { Sequence<PropertyValue> aArgs; - _xDispatch->dispatch( aURL, aArgs ); + OSL_ENSURE(_xDispatch.is(),"PopupMenuControllerBase::impl_select: No dispatch"); + if ( _xDispatch.is() ) + _xDispatch->dispatch( aURL, aArgs ); } void SAL_CALL PopupMenuControllerBase::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException) @@ -204,7 +206,7 @@ void SAL_CALL PopupMenuControllerBase::select( const css::awt::MenuEvent& rEvent xServiceManager = m_xServiceManager; aLock.unlock(); - if ( xPopupMenu.is() && xDispatch.is() ) + if ( xPopupMenu.is() ) { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu ); if ( pPopupMenu ) |