CWS-TOOLING: integrate CWS oooimprovementcorefixes_DEV300

16 files changed, 61 insertions, 117 deletions

diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index c3c5b39a6a82..bce27ca58c76 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: buttontoolbarcontroller.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -70,7 +70,7 @@
 #include <vcl/bitmap.hxx>
 #include <svtools/filter.hxx>
 #include <svtools/miscopt.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
@@ -288,11 +288,7 @@ throw (::com::sun::star::uno::RuntimeException)
             aArgs[0].Value  = makeAny( KeyModifier );
 
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                Sequence<PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("ButtonToolbarController"));
-                ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-            }
+                UiEventLogHelper(::rtl::OUString::createFromAscii("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 8dc43db5a55f..1571d53ca497 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -65,7 +65,7 @@
 #include <vcl/mnemonic.hxx>
 #endif
 #include <tools/urlobj.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
@@ -159,6 +159,12 @@ throw ( RuntimeException )
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+            UiEventLogHelper(::rtl::OUString::createFromAscii("ComplexToolbarController")).log(
+                m_xServiceManager,
+                m_xFrame,
+                aTargetURL,
+                aArgs);
         Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
@@ -240,12 +246,6 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteI
    const sal_uInt32 nRef = Application::ReleaseSolarMutex();
    try
    {
-        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        {
-            Sequence<PropertyValue> source;
-            ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("ComplexToolbarController"));
-            ::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!
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 65246e175ea7..a9df17558f4d 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: controlmenucontroller.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -68,7 +68,7 @@
 #include <tools/rcid.h>
 #include <vcl/image.hxx>
 #include <svtools/menuoptions.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 // Copied from svx
 // Function-Id's
@@ -333,7 +333,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
                     break;
             }
 
-            if ( MENU_ITEM_NOTFOUND == nPrevInConversion )
+          if ( MENU_ITEM_NOTFOUND == nPrevInConversion )
                 // none of the items which precede the nSID-slot in the source menu are present in our conversion menu
                 nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
 
@@ -385,11 +385,7 @@ void SAL_CALL ControlMenuController::select( const css::awt::MenuEvent& rEvent )
             {
                 Reference< XDispatch > xDispatch = pIter->second;
                 if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                {
-                    Sequence<css::beans::PropertyValue> source;
-                    ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("ControlMenuController"));
-                    ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-                }
+                    UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
                 if ( xDispatch.is() )
                     xDispatch->dispatch( aTargetURL, aArgs );
             }
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 530a951cfe8b..1845f6f4cdb7 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fontmenucontroller.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -62,7 +62,7 @@
 #ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
 #endif
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -215,11 +215,11 @@ void SAL_CALL FontMenuController::select( const css::awt::MenuEvent& rEvent ) th
 
             xURLTransformer->parseStrict( aTargetURL );
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                Sequence<PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("FontMenuController"));
-                ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-            }
+                UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log(
+                    m_xServiceManager,
+                    m_xFrame,
+                    aTargetURL,
+                    Sequence<PropertyValue>());
             xDispatch->dispatch( aTargetURL, aArgs );
         }
     }
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 3ccfaae5689d..d1097e621be9 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fontsizemenucontroller.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,7 +67,7 @@
 #ifndef _SVTOOLS_CTRLTOOL_HXX_
 #include <svtools/ctrltool.hxx>
 #endif
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -360,11 +360,7 @@ void SAL_CALL FontSizeMenuController::select( const css::awt::MenuEvent& rEvent
 
             xURLTransformer->parseStrict( aTargetURL );
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                Sequence<PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("FontSizeMenuController"));
-                ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-            }
+                UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
             xDispatch->dispatch( aTargetURL, aArgs );
         }
     }
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 682e47be5450..8f295b82c11d 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: footermenucontroller.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,7 +65,7 @@
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -275,11 +275,7 @@ void SAL_CALL FooterMenuController::select( const css::awt::MenuEvent& rEvent )
 
             xURLTransformer->parseStrict( aTargetURL );
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                Sequence<PropertyValue> source(1);
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("FooterMenuController"));
-                ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-            }
+                UiEventLogHelper(::rtl::OUString::createFromAscii("FooterMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
             xDispatch->dispatch( aTargetURL, aArgs );
         }
     }
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 8cdf1ddea568..2a2d13d49c41 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -66,7 +66,7 @@
 #include <tools/urlobj.hxx>
 #include <classes/resource.hrc>
 #include <classes/fwkresid.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventslogger.hxx>
 
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::uno;
@@ -203,6 +203,8 @@ throw ( RuntimeException )
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+            UiEventLogHelper(::rtl::OUString::createFromAscii("GenericToolbarController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs);
         Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
@@ -310,12 +312,6 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI
    const sal_uInt32 nRef = Application::ReleaseSolarMutex();
    try
    {
-        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!
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index a6fd47639008..c3645aea3cac 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: headermenucontroller.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,7 +67,7 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 //#include <tools/solar.hrc>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -283,11 +283,7 @@ void SAL_CALL HeaderMenuController::select( const css::awt::MenuEvent& rEvent )
 
             xURLTransformer->parseStrict( aTargetURL );
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                Sequence<PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("HeaderMenuController"));
-                ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-            }
+                UiEventLogHelper(::rtl::OUString::createFromAscii("HeaderMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
             xDispatch->dispatch( aTargetURL, aArgs );
         }
     }
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index e08be728fba2..e7d3fad09ac1 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: langselectionmenucontroller.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -77,7 +77,7 @@
 #ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
 #endif
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -235,11 +235,7 @@ void SAL_CALL LanguageSelectionMenuController::select( const css::awt::MenuEvent
             if ( xDispatch.is() )
             {
                 if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                {
-                    Sequence<PropertyValue> source;
-                    ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("LanguageSelectionMenuController"));
-                    ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-                }
+                    UiEventLogHelper(::rtl::OUString::createFromAscii("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 3f2641cc2913..63bd51d27525 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: langselectionstatusbarcontroller.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -73,7 +73,7 @@
 #include <com/sun/star/awt/Command.hpp>
 #include <svtools/languageoptions.hxx>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
@@ -395,11 +395,7 @@ void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::R
         {
             uno::Sequence< beans::PropertyValue > aPV;
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                uno::Sequence<beans::PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("LangSelectionStatusbarController"));
-                ::comphelper::UiEventsLogger::logDispatch(aURL, source);
-            }
+                UiEventLogHelper(::rtl::OUString::createFromAscii("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 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& )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 10988fc97c71..39586fc65611 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: menubarmanager.cxx,v $
- * $Revision: 1.52 $
+ * $Revision: 1.52.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -99,7 +99,7 @@
 #include "svtools/miscopt.hxx"
 #include <classes/addonmenu.hxx>
 #include <uielement/menubarmerger.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -1399,11 +1399,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
     {
         const sal_uInt32 nRef = Application::ReleaseSolarMutex();
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        {
-            Sequence<PropertyValue> source;
-            ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("MenuBarManager"));
-            ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-        }
+            UiEventLogHelper(::rtl::OUString::createFromAscii("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 ce4f0c45dfe5..ca66eefdbaaf 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: newmenucontroller.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -69,7 +69,7 @@
 #include <svtools/menuoptions.hxx>
 #include <svtools/acceleratorexecute.hxx>
 #include <svtools/moduleoptions.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -476,6 +476,8 @@ 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::createFromAscii("NewMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
         Application::PostUserEvent( STATIC_LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument );
     }
 }
@@ -634,12 +636,6 @@ IMPL_STATIC_LINK_NOINSTANCE( NewMenuController, ExecuteHdl_Impl, NewDocument*, p
         // 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("NewMenuController"));
-            ::comphelper::UiEventsLogger::logDispatch(pNewDocument->aTargetURL, source);
-        }
         pNewDocument->xDispatch->dispatch( pNewDocument->aTargetURL, pNewDocument->aArgSeq );
 /*
     }
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 2df8c68a4bf9..2009c16a1f64 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: objectmenucontroller.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -62,7 +62,7 @@
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -192,11 +192,7 @@ void SAL_CALL ObjectMenuController::select( const css::awt::MenuEvent& rEvent )
 
             xURLTransformer->parseStrict( aTargetURL );
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                Sequence<PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("ObjectMenuController"));
-                ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
-            }
+                UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
             xDispatch->dispatch( aTargetURL, aArgs );
         }
     }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 374b318c205d..3d92f1e10615 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: recentfilesmenucontroller.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,7 +67,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <osl/file.hxx>
 //#include <tools/solar.hrc>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -308,6 +308,8 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         pLoadRecentFile->xDispatch  = xDispatch;
         pLoadRecentFile->aTargetURL = aTargetURL;
         pLoadRecentFile->aArgSeq    = aArgsList;
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+            UiEventLogHelper(::rtl::OUString::createFromAscii("RecentFilesMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
         Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile );
     }
 }
@@ -531,12 +533,6 @@ IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRec
         // 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("RecentFilesMenuController"));
-            ::comphelper::UiEventsLogger::logDispatch(pLoadRecentFile->aTargetURL, source);
-        }
         pLoadRecentFile->xDispatch->dispatch( pLoadRecentFile->aTargetURL, pLoadRecentFile->aArgSeq );
     }
     catch ( Exception& )
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 1d07e9a67e88..de73862b3596 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: toolbarsmenucontroller.cxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.21.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -84,7 +84,7 @@
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/cmdoptions.hxx>
-#include <comphelper/uieventslogger.hxx>
+#include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -760,6 +760,8 @@ 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::createFromAscii("ToolbarsMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
                     Application::PostUserEvent( STATIC_LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo );
                 }
             }
@@ -948,12 +950,6 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInf
         // elements if a component gets detached from its frame!
         if ( pExecuteInfo->xDispatch.is() )
         {
-            if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            {
-                Sequence<PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, rtl::OUString::createFromAscii("ToolbarsMenuController"));
-                ::comphelper::UiEventsLogger::logDispatch(pExecuteInfo->aTargetURL, source);
-            }
             pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
         }
     }