summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorAugust Sodora <augsod@gmail.com>2011-12-07 21:58:26 -0500
committerAugust Sodora <augsod@gmail.com>2011-12-07 21:59:28 -0500
commitbd7f8380113b0cbe706d131b33e7551b2c484205 (patch)
tree60ff450396806f72bf2945eae0a86af9461b3746 /sfx2
parent855115d2f5845502e8619b35666512023584e012 (diff)
Remove oooimprovement
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/bindings.cxx20
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx41
2 files changed, 0 insertions, 61 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 1e18d7c410b9..e063e119be30 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -71,7 +71,6 @@
#include <sfx2/objsh.hxx>
#include <sfx2/msgpool.hxx>
-#include <comphelper/uieventslogger.hxx>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <boost/scoped_ptr.hpp>
@@ -2223,25 +2222,6 @@ sal_Bool SfxBindings::ExecuteCommand_Impl( const String& rCommand )
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
if ( xDisp.is() )
{
- if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- {
- ::rtl::OUString sAppName;
- try
- {
- static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
- ::comphelper::getProcessServiceFactory();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
- xServiceManager->createInstance(our_aModuleManagerName)
- , ::com::sun::star::uno::UNO_QUERY_THROW);
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame(
- pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY_THROW);
- sAppName = xModuleManager->identify(xFrame);
- } catch(::com::sun::star::uno::Exception&) {}
- Sequence<beans::PropertyValue> source;
- ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxAsyncExec")));
- ::comphelper::UiEventsLogger::logDispatch(aURL, source);
- }
new SfxAsyncExec_Impl( aURL, xDisp );
return sal_True;
}
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index ba246d82a4a6..a5469b30d47e 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -101,7 +101,6 @@
#include <sfx2/module.hxx>
#include "sfx2/imagemgr.hxx"
-#include <comphelper/uieventslogger.hxx>
#include <com/sun/star/frame/XModuleManager.hpp>
using namespace ::com::sun::star::beans;
@@ -470,28 +469,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s
Reference < XDispatch > xDispatch = xProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
if ( xDispatch.is() )
- {
- if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- {
- ::rtl::OUString sAppName;
- try
- {
- static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
- ::comphelper::getProcessServiceFactory();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
- xServiceManager->createInstance(our_aModuleManagerName)
- , ::com::sun::star::uno::UNO_QUERY_THROW);
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame(
- getFrameInterface(), UNO_QUERY_THROW);
- sAppName = xModuleManager->identify(xFrame);
- } catch(::com::sun::star::uno::Exception&) {}
- Sequence<PropertyValue> source;
- ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxToolBoxControl")));
- ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
- }
xDispatch->dispatch( aTargetURL, aArgs );
- }
}
}
@@ -1012,25 +990,6 @@ void SfxToolBoxControl::Select( sal_uInt16 nModifier )
void SfxToolBoxControl::Select( sal_Bool /*bMod1*/ )
{
- if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# #i102805#
- {
- ::rtl::OUString sAppName;
- try
- {
- static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
- ::comphelper::getProcessServiceFactory();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
- xServiceManager->createInstance(our_aModuleManagerName)
- , ::com::sun::star::uno::UNO_QUERY_THROW);
- sAppName = xModuleManager->identify(m_xFrame);
- } catch(::com::sun::star::uno::Exception&) {}
- Sequence<PropertyValue> vSource;
- ::comphelper::UiEventsLogger::appendDispatchOrigin(vSource, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxToolBoxControl")));
- URL aURL;
- aURL.Complete = m_aCommandURL;
- ::comphelper::UiEventsLogger::logDispatch(aURL, vSource);
- }
svt::ToolboxController::execute( pImpl->nSelectModifier );
}