diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 12:37:40 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 12:37:40 +0000 |
commit | edc415ba089504ca24968a183cb13580b312639a (patch) | |
tree | 4975e0b7e2f52b3d6842b5d5423f20cb984ef270 /sfx2/source/control | |
parent | 33b806c4b77c65224533edbcf94081184190aee7 (diff) |
INTEGRATION: CWS abcd (1.47.18); FILE MERGED
2007/04/16 15:21:09 ab 1.47.18.1: #i76335# Check only real slots as enum slots don't have an execute function
Diffstat (limited to 'sfx2/source/control')
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 16a1a1bc11ee..4bb305607e6b 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dispatch.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: rt $ $Date: 2007-04-03 16:58:08 $ + * last change: $Author: ihi $ $Date: 2007-04-17 13:37:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1011,7 +1011,8 @@ int SfxDispatcher::GetShellAndSlot_Impl *ppSlot = aSvr.GetSlot(); if ( 0 == (*ppSlot)->GetExecFnc() && bRealSlot ) *ppSlot = (*ppShell)->GetInterface()->GetRealSlot(*ppSlot); - if ( (0 == *ppSlot) || (0 == (*ppSlot)->GetExecFnc()) ) + // Check only real slots as enum slots don't have an execute function! + if ( bRealSlot && ((0 == *ppSlot) || (0 == (*ppSlot)->GetExecFnc()) )) return sal_False; #ifdef DBG_UTILx |