diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-19 16:40:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-19 16:40:06 +0000 |
| commit | a29935a32d0daddde35a60c853f7606b61c86262 (patch) | |
| tree | 8694a5c84e648ae59ab31cfdc6b210740d5f9bdc /framework/source/uielement/macrosmenucontroller.cxx | |
| parent | fbd6c04509d50dbd600b67c4249ab7057dc3d37f (diff) | |
CWS-TOOLING: integrate CWS oooimprovementcorefixes_DEV300
Diffstat (limited to 'framework/source/uielement/macrosmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/macrosmenucontroller.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 81b955f0282a..93997d27cbb0 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macrosmenucontroller.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.40.1 $ * * This file is part of OpenOffice.org. * @@ -49,7 +49,7 @@ #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#include <comphelper/uieventslogger.hxx> +#include <dispatch/uieventloghelper.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -181,6 +181,8 @@ void SAL_CALL MacrosMenuController::select( const css::awt::MenuEvent& rEvent ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; + if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# + UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); // xDispatch->dispatch( aTargetURL, aArgs ); Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); } @@ -199,12 +201,6 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* // 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! - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - { - Sequence<PropertyValue> source; - ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("MacrosMenuController")); - ::comphelper::UiEventsLogger::logDispatch(pExecuteInfo->aTargetURL, source); - } pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs ); } catch ( Exception& ) |