From 4d22586d6f0cc0686f3b2c3353818f55a0e7b376 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 19 Nov 2008 16:40:06 +0000 Subject: CWS-TOOLING: integrate CWS oooimprovementcorefixes_DEV300 --- comphelper/inc/comphelper/uieventslogger.hxx | 4 +- comphelper/source/misc/uieventslogger.cxx | 140 ++++++++++++++++++++------- 2 files changed, 107 insertions(+), 37 deletions(-) (limited to 'comphelper') diff --git a/comphelper/inc/comphelper/uieventslogger.hxx b/comphelper/inc/comphelper/uieventslogger.hxx index ad0375612d82..5321d97c89bc 100644 --- a/comphelper/inc/comphelper/uieventslogger.hxx +++ b/comphelper/inc/comphelper/uieventslogger.hxx @@ -7,7 +7,7 @@ * * $RCSfile: uieventslogger.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.20.1 $ * * This file is part of OpenOffice.org. * @@ -49,7 +49,7 @@ namespace comphelper public: static sal_Bool isEnabled(); static sal_Int32 getSessionLogEventCount(); - static void appendDispatchOrigin( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& args, const ::rtl::OUString& origin); + static void appendDispatchOrigin( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& args, const ::rtl::OUString& originapp, const ::rtl::OUString& originwidget); static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> purgeDispatchOrigin(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& args); static void logDispatch(const ::com::sun::star::util::URL& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& args); static void logVcl(const ::rtl::OUString& parent_id, sal_Int32 window_type, const ::rtl::OUString& id, const ::rtl::OUString& method, const ::rtl::OUString& param); diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx index a4124cb1657b..ab6f087fced7 100644 --- a/comphelper/source/misc/uieventslogger.cxx +++ b/comphelper/source/misc/uieventslogger.cxx @@ -7,7 +7,7 @@ * * $RCSfile: uieventslogger.cxx,v $ * -* $Revision: 1.3 $ +* $Revision: 1.3.20.3 $ * * This file is part of OpenOffice.org. * @@ -45,6 +45,7 @@ #include #include #include +#include using namespace com::sun::star::beans; @@ -56,6 +57,41 @@ using namespace com::sun::star::util; using namespace rtl; using namespace cppu; using namespace osl; +using namespace std; + + +namespace +{ + static void lcl_SetupOriginAppAbbr(map& abbrs) + { + abbrs[OUString::createFromAscii("com.sun.star.text.TextDocument")] = OUString::createFromAscii("W"); // Writer + abbrs[OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument")] = OUString::createFromAscii("C"); // Calc + abbrs[OUString::createFromAscii("com.sun.star.presentation.PresentationDocument")] = OUString::createFromAscii("I"); // Impress + abbrs[OUString::createFromAscii("com.sun.star.drawing.DrawingDocument")] = OUString::createFromAscii("D"); // Draw + }; + + static void lcl_SetupOriginWidgetAbbr(map& abbrs) + { + abbrs[OUString::createFromAscii("ButtonToolbarController")] = OUString::createFromAscii("0"); + abbrs[OUString::createFromAscii("ComplexToolbarController")] = OUString::createFromAscii("1"); + abbrs[OUString::createFromAscii("ControlMenuController")] = OUString::createFromAscii("2"); + abbrs[OUString::createFromAscii("FontMenuController")] = OUString::createFromAscii("3"); + abbrs[OUString::createFromAscii("FontSizeMenuController")] = OUString::createFromAscii("4"); + abbrs[OUString::createFromAscii("FooterMenuController")] = OUString::createFromAscii("5"); + abbrs[OUString::createFromAscii("GenericToolbarController")] = OUString::createFromAscii("6"); + abbrs[OUString::createFromAscii("HeaderMenuController")] = OUString::createFromAscii("7"); + abbrs[OUString::createFromAscii("LanguageSelectionMenuController")] = OUString::createFromAscii("8"); + abbrs[OUString::createFromAscii("LangSelectionStatusbarController")] = OUString::createFromAscii("9"); + abbrs[OUString::createFromAscii("MacrosMenuController")] = OUString::createFromAscii("10"); + abbrs[OUString::createFromAscii("MenuBarManager")] = OUString::createFromAscii("11"); + abbrs[OUString::createFromAscii("NewMenuController")] = OUString::createFromAscii("12"); + abbrs[OUString::createFromAscii("ObjectMenuController")] = OUString::createFromAscii("13"); + abbrs[OUString::createFromAscii("RecentFilesMenuController")] = OUString::createFromAscii("14"); + abbrs[OUString::createFromAscii("ToolbarsMenuController")] = OUString::createFromAscii("15"); + abbrs[OUString::createFromAscii("SfxToolBoxControl")] = OUString::createFromAscii("16"); + abbrs[OUString::createFromAscii("SfxAsyncExec")] = OUString::createFromAscii("17"); + }; +} namespace comphelper { @@ -95,6 +131,9 @@ namespace comphelper Reference m_Logger; Reference m_LogHandler; Reference m_Formatter; + map m_OriginAppAbbr; + map m_OriginWidgetAbbr; + // static methods and data static ptr getInstance(); @@ -103,7 +142,7 @@ namespace comphelper static bool getEnabledFromCfg(); static TimeValue getIdleTimeoutFromCfg(); static OUString getLogPathFromCfg(); - static sal_Int32 findDispatchOriginIdx(const Sequence& args); + static sal_Int32 findIdx(const Sequence& args, const OUString& key); static ptr instance; static Mutex * singleton_mutex; @@ -123,19 +162,21 @@ namespace comphelper static const OUString CSST_JOBEXECUTOR; static const OUString CSSU_PATHSUB; static const OUString LOGGERNAME; - static const OUString LOGORIGINNAME; + static const OUString LOGORIGINAPP; + static const OUString LOGORIGINWIDGET; static const OUString UNKNOWN_ORIGIN; static const OUString FN_CURRENTLOG; static const OUString FN_ROTATEDLOG; static const OUString LOGROTATE_EVENTNAME; static const OUString URL_UNO; + static const OUString URL_FILE; }; } namespace comphelper { // consts - const sal_Int32 UiEventsLogger_Impl::COLUMNS = 8; + const sal_Int32 UiEventsLogger_Impl::COLUMNS = 9; const OUString UiEventsLogger_Impl::CFG_ENABLED = OUString::createFromAscii("EnablingAllowed"); const OUString UiEventsLogger_Impl::CFG_IDLETIMEOUT = OUString::createFromAscii("IdleTimeout"); const OUString UiEventsLogger_Impl::CFG_LOGGING = OUString::createFromAscii("/org.openoffice.Office.Logging"); @@ -153,7 +194,8 @@ namespace comphelper const OUString UiEventsLogger_Impl::ETYPE_VCL = OUString::createFromAscii("vcl"); const OUString UiEventsLogger_Impl::LOGGERNAME = OUString::createFromAscii("org.openoffice.oooimprovement.Core.UiEventsLogger"); - const OUString UiEventsLogger_Impl::LOGORIGINNAME = OUString::createFromAscii("comphelper.UiEventsLogger.LogOrigin"); + const OUString UiEventsLogger_Impl::LOGORIGINWIDGET = OUString::createFromAscii("comphelper.UiEventsLogger.LogOriginWidget"); + const OUString UiEventsLogger_Impl::LOGORIGINAPP = OUString::createFromAscii("comphelper.UiEventsLogger.LogOriginApp"); const OUString UiEventsLogger_Impl::UNKNOWN_ORIGIN = OUString::createFromAscii("unknown origin"); const OUString UiEventsLogger_Impl::FN_CURRENTLOG = OUString::createFromAscii("Current"); @@ -161,6 +203,7 @@ namespace comphelper const OUString UiEventsLogger_Impl::LOGROTATE_EVENTNAME = OUString::createFromAscii("onOOoImprovementLogRotated"); const OUString UiEventsLogger_Impl::URL_UNO = OUString::createFromAscii(".uno:"); + const OUString UiEventsLogger_Impl::URL_FILE = OUString::createFromAscii("file:"); // public UiEventsLogger interface @@ -182,24 +225,27 @@ namespace comphelper void UiEventsLogger::appendDispatchOrigin( Sequence& args, - const OUString& origin) + const OUString& originapp, + const OUString& originwidget) { sal_Int32 old_length = args.getLength(); - args.realloc(old_length+1); - args[old_length].Name = UiEventsLogger_Impl::LOGORIGINNAME; - args[old_length].Value = static_cast(origin); + args.realloc(old_length+2); + args[old_length].Name = UiEventsLogger_Impl::LOGORIGINAPP; + args[old_length].Value = static_cast(originapp); + args[old_length+1].Name = UiEventsLogger_Impl::LOGORIGINWIDGET; + args[old_length+1].Value = static_cast(originwidget); } Sequence UiEventsLogger::purgeDispatchOrigin( const Sequence& args) { - if(args.getLength()==0) return args; - sal_Int32 idx = UiEventsLogger_Impl::findDispatchOriginIdx(args); - if(idx==-1) return args; - Sequence result(args); - if(idx!=result.getLength()-1) - result[idx] = result[result.getLength()-1]; - result.realloc(result.getLength()-1); + Sequence result(args.getLength()); + sal_Int32 target_idx=0; + for(sal_Int32 source_idx=0; source_idx& args) { if(!m_Active) return; - if(!url.Complete.match(URL_UNO)) return; + if(!url.Complete.match(URL_UNO) && !url.Complete.match(URL_FILE)) return; Guard log_guard(m_LogMutex); checkIdleTimeout(); Sequence logdata = Sequence(COLUMNS); logdata[0] = ETYPE_DISPATCH; - sal_Int32 origin_idx = findDispatchOriginIdx(args); - if(origin_idx!=-1) - args[origin_idx].Value >>= logdata[1]; + sal_Int32 originapp_idx = findIdx(args, LOGORIGINAPP); + if(originapp_idx!=-1) + { + OUString app; + args[originapp_idx].Value >>= app; + map::iterator abbr_it = m_OriginAppAbbr.find(app); + if(abbr_it != m_OriginAppAbbr.end()) + app = abbr_it->second; + logdata[1] = app; + } else logdata[1] = UNKNOWN_ORIGIN; - logdata[2] = url.Complete; + sal_Int32 originwidget_idx = findIdx(args, LOGORIGINWIDGET); + if(originwidget_idx!=-1) + { + OUString widget; + args[originwidget_idx].Value >>= widget; + map::iterator widget_it = m_OriginWidgetAbbr.find(widget); + if(widget_it != m_OriginWidgetAbbr.end()) + widget = widget_it->second; + logdata[2] = widget; + } + else + logdata[2] = UNKNOWN_ORIGIN; + logdata[3] = url.Complete; + if(url.Complete.match(URL_FILE)) + logdata[3] = URL_FILE; m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata)); m_SessionLogEventCount++; } @@ -301,11 +370,11 @@ namespace comphelper OUStringBuffer buf; Sequence logdata = Sequence(COLUMNS); logdata[0] = ETYPE_VCL; - logdata[3] = parent_id; - logdata[4] = buf.append(window_type).makeStringAndClear(); - logdata[5] = id; - logdata[6] = method; - logdata[7] = param; + logdata[4] = parent_id; + logdata[5] = buf.append(window_type).makeStringAndClear(); + logdata[6] = id; + logdata[7] = method; + logdata[8] = param; m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata)); m_SessionLogEventCount++; } @@ -419,13 +488,14 @@ namespace comphelper { Sequence columns = Sequence(COLUMNS); columns[0] = OUString::createFromAscii("eventtype"); - columns[1] = OUString::createFromAscii("origin"); - columns[2] = OUString::createFromAscii("uno url"); - columns[3] = OUString::createFromAscii("parent id"); - columns[4] = OUString::createFromAscii("window type"); - columns[5] = OUString::createFromAscii("id"); - columns[6] = OUString::createFromAscii("method"); - columns[7] = OUString::createFromAscii("parameter"); + columns[1] = OUString::createFromAscii("originapp"); + columns[2] = OUString::createFromAscii("originwidget"); + columns[3] = OUString::createFromAscii("uno url"); + columns[4] = OUString::createFromAscii("parent id"); + columns[5] = OUString::createFromAscii("window type"); + columns[6] = OUString::createFromAscii("id"); + columns[7] = OUString::createFromAscii("method"); + columns[8] = OUString::createFromAscii("parameter"); m_Formatter->setColumnnames(columns); m_LogHandler->setFormatter(Reference(m_Formatter, UNO_QUERY)); m_Logger->setLevel(LogLevel::ALL); @@ -515,10 +585,10 @@ namespace comphelper return instance; } - sal_Int32 UiEventsLogger_Impl::findDispatchOriginIdx(const Sequence& args) + sal_Int32 UiEventsLogger_Impl::findIdx(const Sequence& args, const OUString& key) { for(sal_Int32 i=0; i