diff options
Diffstat (limited to 'framework')
17 files changed, 0 insertions, 140 deletions
diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx deleted file mode 100644 index 90df4943d9f6..000000000000 --- a/framework/source/inc/dispatch/uieventloghelper.hxx +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ -#define __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ - -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/util/URL.hpp> -#include <comphelper/uieventslogger.hxx> -#include <rtl/ustring.hxx> -#include <services.h> - -namespace framework -{ - class UiEventLogHelper - { - public: - UiEventLogHelper(const ::rtl::OUString& aWidgetname) - : m_aWidgetName(aWidgetname) - , m_hasAppName(false) - { } - - void log(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, - const ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rModel, - const ::com::sun::star::util::URL& rUrl, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs) - { - - if(!m_hasAppName && rServiceManager.is() && rModel.is()) - { - try - { - static ::rtl::OUString our_aModuleManagerName = SERVICENAME_MODULEMANAGER; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager( - rServiceManager->createInstance(our_aModuleManagerName) - , ::com::sun::star::uno::UNO_QUERY_THROW); - m_aAppName = xModuleManager->identify(rModel); - m_hasAppName = true; - } catch(::com::sun::star::uno::Exception&) {} - } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> aArgsWithOrigin(rArgs); - ::comphelper::UiEventsLogger::appendDispatchOrigin(aArgsWithOrigin, m_aAppName, m_aWidgetName); - ::comphelper::UiEventsLogger::logDispatch(rUrl, aArgsWithOrigin); - } - - private: - const ::rtl::OUString m_aWidgetName; - bool m_hasAppName; - ::rtl::OUString m_aAppName; - }; -} - -#endif // __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index d219a8fd3a41..4bedf0cf2884 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -62,7 +62,6 @@ #include <vcl/bitmap.hxx> #include <svtools/filter.hxx> #include <svtools/miscopt.hxx> -#include <dispatch/uieventloghelper.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::awt; @@ -279,8 +278,6 @@ throw (::com::sun::star::uno::RuntimeException) aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); aArgs[0].Value <<= KeyModifier; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); } catch ( DisposedException& ) diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 91b5951a392c..6d088b1a3b62 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -55,7 +55,6 @@ #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> -#include <dispatch/uieventloghelper.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::awt; @@ -154,12 +153,6 @@ throw ( RuntimeException ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComplexToolbarController"))).log( - m_xServiceManager, - m_xFrame, - aTargetURL, - aArgs); Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 1e7ae5f55bd3..7fd52d33768e 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -60,7 +60,6 @@ #include <tools/rcid.h> #include <vcl/image.hxx> #include <svtools/menuoptions.hxx> -#include <dispatch/uieventloghelper.hxx> #include <osl/mutex.hxx> // Copied from svx @@ -338,8 +337,6 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat { Sequence<PropertyValue> aArgs; Reference< XDispatch > xDispatch = pIter->second; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlMenuController"))).log(m_xServiceManager, m_xFrame, aURL, aArgs); if ( xDispatch.is() ) xDispatch->dispatch( aURL, aArgs ); } diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 56871bce5e2b..a31b9f91c853 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -53,7 +53,6 @@ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/mnemonic.hxx> -#include <dispatch/uieventloghelper.hxx> #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ @@ -174,12 +173,6 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { Sequence<PropertyValue> aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontMenuController"))).log( - m_xServiceManager, - m_xFrame, - aTargetURL, - Sequence<PropertyValue>()); OSL_ENSURE(_xDispatch.is(),"FontMenuController::impl_select: No dispatch"); if ( _xDispatch.is() ) _xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 137ec5fb4689..fadf338bec5c 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -54,7 +54,6 @@ #include <vcl/outdev.hxx> #include <vcl/print.hxx> #include <svtools/ctrltool.hxx> -#include <dispatch/uieventloghelper.hxx> #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ @@ -312,8 +311,6 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { Sequence<PropertyValue> aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontSizeMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch"); if ( _xDispatch.is() ) _xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 05a5898628e8..6b6926bf667e 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -57,7 +57,6 @@ #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#include <dispatch/uieventloghelper.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 5265315a0074..7e6c566e0c71 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -56,8 +56,6 @@ #include <tools/urlobj.hxx> #include <classes/resource.hrc> #include <classes/fwkresid.hxx> -#include <dispatch/uieventloghelper.hxx> - #include <framework/menuconfiguration.hxx> #include <uielement/menubarmanager.hxx> @@ -197,8 +195,6 @@ throw ( RuntimeException ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenericToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs); Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 301a2355e997..dabce89c3f58 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -57,7 +57,6 @@ #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#include <dispatch/uieventloghelper.hxx> #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ @@ -242,8 +241,6 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { Sequence<PropertyValue> aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(m_bFooter ? "FooterMenuController" : "HeaderMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"HeaderMenuController::impl_select: No dispatch"); if ( _xDispatch.is() ) _xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index b5f1566b42fd..2e243328334f 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -67,7 +67,6 @@ #include <classes/fwlresid.hxx> #include <classes/resource.hrc> -#include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" #include <osl/mutex.hxx> @@ -185,8 +184,6 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& if ( xDispatch.is() ) { Sequence<PropertyValue> aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("LanguageSelectionMenuController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs ); xDispatch->dispatch( aTargetURL, aArgs ); } } diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 680ed90fbf1c..902b2bd90b8c 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -64,7 +64,6 @@ #include <com/sun/star/awt/Command.hpp> #include <svl/languageoptions.hxx> #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> -#include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" @@ -321,8 +320,6 @@ throw (::com::sun::star::uno::RuntimeException) if( xDispatch.is() ) { uno::Sequence< beans::PropertyValue > aPV; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aURL, aPV); xDispatch->dispatch( aURL, aPV); } } diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 374e7023c09d..30eaa8f5cd58 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -45,7 +45,6 @@ #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" #include "helpid.hrc" #include <osl/mutex.hxx> @@ -147,8 +146,6 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc ExecuteInfo* pExecuteInfo = new ExecuteInfo; pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs); Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); } } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 5e80d0e20936..28c29dab5800 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -93,7 +93,6 @@ #include "svtools/miscopt.hxx" #include <framework/addonmenu.hxx> #include <uielement/menubarmerger.hxx> -#include <dispatch/uieventloghelper.hxx> // Be careful removing this "bad" construct. There are serious problems // with #define STRICT and including windows.h. Changing this needs some @@ -1119,8 +1118,6 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) if ( xDispatch.is() ) { const sal_uInt32 nRef = Application::ReleaseSolarMutex(); - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuBarManager"))).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); Application::AcquireSolarMutex( nRef ); } diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 8a785029424b..3877f193e317 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -63,7 +63,6 @@ #include <svtools/menuoptions.hxx> #include <svtools/acceleratorexecute.hxx> #include <unotools/moduleoptions.hxx> -#include <dispatch/uieventloghelper.hxx> #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ @@ -463,8 +462,6 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr pNewDocument->xDispatch = xDispatch; pNewDocument->aTargetURL = aTargetURL; pNewDocument->aArgSeq = aArgsList; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); Application::PostUserEvent( STATIC_LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument ); } } diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 63a1620bc59b..df8707bedbdf 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -53,7 +53,6 @@ #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#include <dispatch/uieventloghelper.hxx> #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ @@ -150,8 +149,6 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { Sequence<PropertyValue> aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"ObjectMenuController::impl_select: No dispatch"); if ( _xDispatch.is() ) _xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index df1d86dccc72..0329c3f89316 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -62,7 +62,6 @@ #undef GradientStyle_RECT #include <odma_lib.hxx> #endif -#include <dispatch/uieventloghelper.hxx> #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ @@ -338,8 +337,6 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) pLoadRecentFile->xDispatch = xDispatch; pLoadRecentFile->aTargetURL = aTargetURL; pLoadRecentFile->aArgSeq = aArgsList; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecentFilesMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile ); } } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 4acea2195d5d..9c06cceda2d0 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -70,7 +70,6 @@ #include <vcl/window.hxx> #include <svtools/menuoptions.hxx> #include <unotools/cmdoptions.hxx> -#include <dispatch/uieventloghelper.hxx> #include <rtl/logfile.hxx> #include <svtools/miscopt.hxx> @@ -740,8 +739,6 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolbarsMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); Application::PostUserEvent( STATIC_LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo ); } } |