diff options
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 86 |
3 files changed, 0 insertions, 88 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index d611d941f5d4..81bf1f649d9a 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -138,7 +138,6 @@ #include <unotools/syslocaleoptions.hxx> #include <unotools/syslocale.hxx> #include <framework/addonsoptions.hxx> -#include <svtools/ttprops.hxx> #include <unotools/extendedsecurityoptions.hxx> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 8fa9c07f7b2a..f035e026315d 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -49,7 +49,6 @@ #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> -#include <svtools/ttprops.hxx> #include <sfx2/sfxsids.hrc> #include <sot/exchange.hxx> diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 44d0a51a84d9..a72035421a9a 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -36,7 +36,6 @@ #include <svl/eitem.hxx> #include <svl/undo.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/ttprops.hxx> #include <stdio.h> #include <stdarg.h> #include <stdlib.h> // due to bsearch @@ -995,91 +994,6 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem ) #define SFX_USE_BINDINGS 0x8000 #endif -sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, SfxPoolItem **pArgs, - sal_uInt16 nMode ) -{ - if ( !nMode ) - nMode = pImp->nStandardMode; - - // through Bindings/Interceptor? (then the return value is not exact) - sal_Bool bViaBindings = SFX_USE_BINDINGS == ( nMode & SFX_USE_BINDINGS ); - nMode &= ~sal_uInt16(SFX_USE_BINDINGS); - if ( bViaBindings && GetBindings() ) - return GetBindings()->Execute( nSlot, (const SfxPoolItem **) pArgs, nMode ) - ? EXECUTE_POSSIBLE - : EXECUTE_NO; - - // otherwise through the Dispatcher - if ( IsLocked(nSlot) ) - return 0; - SfxShell *pShell = 0; - SfxCallMode eCall = SFX_CALLMODE_SYNCHRON; - sal_uInt16 nRet = EXECUTE_NO; - const SfxSlot *pSlot = 0; - if ( GetShellAndSlot_Impl( nSlot, &pShell, &pSlot, sal_False, sal_False ) ) - { - // Feasibility test before - if ( pSlot->IsMode( SFX_SLOT_FASTCALL ) || - pShell->CanExecuteSlot_Impl( *pSlot ) ) - nRet = EXECUTE_POSSIBLE; - - if ( nMode == EXECUTEMODE_ASYNCHRON ) - eCall = SFX_CALLMODE_ASYNCHRON; - else if ( nMode == EXECUTEMODE_DIALOGASYNCHRON && pSlot->IsMode( SFX_SLOT_HASDIALOG ) ) - eCall = SFX_CALLMODE_ASYNCHRON; - else if ( pSlot->GetMode() & SFX_SLOT_ASYNCHRON ) - eCall = SFX_CALLMODE_ASYNCHRON; - if ( pArgs && *pArgs ) - { - SfxAllItemSet aSet( pShell->GetPool() ); - for ( SfxPoolItem **pArg = pArgs; *pArg; ++pArg ) - MappedPut_Impl( aSet, **pArg ); - SfxRequest aReq( nSlot, eCall, aSet ); - _Execute( *pShell, *pSlot, aReq, eCall ); - } - else - { - SfxRequest aReq( nSlot, eCall, pShell->GetPool() ); - _Execute( *pShell, *pSlot, aReq, eCall ); - } - } - - return nRet; -} - -sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, const SfxItemSet& rArgs, - sal_uInt16 nMode ) -{ - if ( !nMode ) - nMode = pImp->nStandardMode; - - // otherwise through the Dispatcher - if ( IsLocked(nSlot) ) - return 0; - SfxShell *pShell = 0; - SfxCallMode eCall = SFX_CALLMODE_SYNCHRON; - sal_uInt16 nRet = EXECUTE_NO; - const SfxSlot *pSlot = 0; - if ( GetShellAndSlot_Impl( nSlot, &pShell, &pSlot, sal_False, sal_False ) ) - { - // Feasibility test before - if ( pSlot->IsMode( SFX_SLOT_FASTCALL ) || - pShell->CanExecuteSlot_Impl( *pSlot ) ) - nRet = EXECUTE_POSSIBLE; - - if ( nMode == EXECUTEMODE_ASYNCHRON ) - eCall = SFX_CALLMODE_ASYNCHRON; - else if ( nMode == EXECUTEMODE_DIALOGASYNCHRON && pSlot->IsMode( SFX_SLOT_HASDIALOG ) ) - eCall = SFX_CALLMODE_ASYNCHRON; - else if ( pSlot->GetMode() & SFX_SLOT_ASYNCHRON ) - eCall = SFX_CALLMODE_ASYNCHRON; - SfxRequest aReq( nSlot, eCall, rArgs ); - _Execute( *pShell, *pSlot, aReq, eCall ); - } - - return nRet; -} - const SfxSlot* SfxDispatcher::GetSlot( const String& rCommand ) { // Count the number of Shells on the linked Dispatcher |