diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 14:23:01 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 14:23:01 +0000 |
| commit | 61d2b95aae172e42f197eac1d707cc2409486ccd (patch) | |
| tree | cab8e8bd2717f090dfb9270e691169d28b227de7 /framework/source/uielement | |
| parent | e3103949aed9b78a46143159f77482044da07a9d (diff) | |
INTEGRATION: CWS logger2 (1.20.28); FILE MERGED
2008/07/08 13:26:21 b_michaelsen 1.20.28.4: #i88653# implemeted logging hooks solution without dispatch interception
2008/07/04 11:57:39 b_michaelsen 1.20.28.3: #i88653# removing appending of DispatchOrigin
2008/05/19 11:26:47 b_michaelsen 1.20.28.2: #i88653# added origin of dispatch to args for uilogging
2008/05/13 14:43:40 b_michaelsen 1.20.28.1: merged logger cws
Diffstat (limited to 'framework/source/uielement')
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index ac88f0277be5..91c0257ae083 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: generictoolbarcontroller.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.22 $ * * This file is part of OpenOffice.org. * @@ -64,6 +64,7 @@ #include <vcl/mnemonic.hxx> #endif #include <tools/urlobj.hxx> +#include <comphelper/uieventslogger.hxx> using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; @@ -284,10 +285,16 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI const sal_uInt32 nRef = Application::ReleaseSolarMutex(); try { - // Asynchronous execution as this can lead to our own destruction! - // Framework can recycle our current frame and the layout manager disposes all user interface - // elements if a component gets detached from its frame! - pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs ); + if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# + { + Sequence<PropertyValue> source; + ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("GenericToolbarController")); + ::comphelper::UiEventsLogger::logDispatch(pExecuteInfo->aTargetURL, source); + } + // Asynchronous execution as this can lead to our own destruction! + // Framework can recycle our current frame and the layout manager disposes all user interface + // elements if a component gets detached from its frame! + pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs ); } catch ( Exception& ) { |