[Libreoffice-commits] core.git: 2 commits - include/sal include/vcl vcl/source

[Tor Lillqvist]

 include/sal/log-areas.dox        |    1 +
 include/vcl/debugevent.hxx       |    2 +-
 vcl/source/window/debugevent.cxx |   26 ++++++++++++++++----------
 3 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit a27100f43b7a57639cdf62197ec853133ef17cee
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 22 12:11:49 2014 +0300

    WaE: virtual function declaration not marked 'SAL_OVERRIDE'
    
    Change-Id: I5b3e785ce50b5959d64c855869533a310e9c277a

diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index 2700324..56c47ff 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -25,7 +25,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer {
   void InjectMouseEvent();
   void InjectEvent();
   void InjectKeyNavEdit();
-  virtual void Timeout();
+  virtual void Timeout() SAL_OVERRIDE;
 
   public:
      static DebugEventInjector *getCreate();
commit 0fcc41e6d142c50a43e14e120e639227a7795dc9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 22 12:10:12 2014 +0300

    WaE: unused variable 'bHandled'
    
    While at it, make it use SAL_INFO instead of fprintf.
    
    Change-Id: Id4018819f8f790bef219e5aca3b6bbb5f6acd6aa

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 826872d..8412f01 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -369,6 +369,7 @@ certain functionality.
 @li @c vcl.cg - CoreGraphics calls on OS X and iOS
 @li @c vcl.control
 @li @c vcl.coretext - CoreText-using code for Mac OS X and iOS
+ at li @c vcl.debugevent
 @li @c vcl.emf - EMF/EMF+ processing
 @li @c vcl.filter
 @li @c vcl.fonts - font-specific code
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index e83909e..373001c 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-// #include <stdio.h>
 #include <rtl/math.hxx>
 #include <rtl/string.hxx>
 #include <tools/time.hxx>
@@ -110,11 +109,11 @@ void DebugEventInjector::InjectMenuEvent()
     SalMenuEvent aEvent = aIds[ getRandom() * aIds.size() ];
     bool bHandled = ImplWindowFrameProc( pSysWin, NULL, nEvent, &aEvent);
 
-/*    fprintf( stderr, "Injected menu event %p (%d) '%s' -> %d\n",
-             aEvent.mpMenu, aEvent.mnId,
-             OUStringToOString( ((Menu *)aEvent.mpMenu)->GetItemText( aEvent.mnId ),
-                                RTL_TEXTENCODING_UTF8 ).getStr(),
-             (int)bHandled); */
+    SAL_INFO( "vcl.debugevent",
+              "Injected menu event " << aEvent.mpMenu
+              << " (" << aEvent.mnId << ") "
+              << "'" << ((Menu *)aEvent.mpMenu)->GetItemText( aEvent.mnId ) << "'"
+              << " -> " << bHandled );
 }
 
 static void InitKeyEvent( SalKeyEvent &rKeyEvent )
@@ -165,8 +164,12 @@ void DebugEventInjector::InjectTextEvent()
         aKeyEvent.mnCode |= (sal_uInt16)( getRandom() * KEY_MODTYPE ) & KEY_MODTYPE;
 
     bool bHandled = ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYINPUT, &aKeyEvent);
-//    fprintf( stderr, "Injected key 0x%x -> %d win %p\n",
-//             (int) aKeyEvent.mnCode, (int)bHandled, pWindow );
+
+    SAL_INFO( "vcl.debugevent",
+              "Injected key 0x" << std::hex << (int) aKeyEvent.mnCode << std::dec
+              << " -> " << bHandled
+              << " win " << pWindow );
+
     ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYUP, &aKeyEvent );
 }
 
@@ -245,8 +248,11 @@ void DebugEventInjector::InjectKeyNavEdit()
     aKeyEvent.mnCharCode = 0x0; // hopefully unused.
 
     bool bHandled = ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYINPUT, &aKeyEvent );
-//    fprintf( stderr, "Injected edit / move key 0x%x -> %d win %p\n",
-//             (int) aKeyEvent.mnCode, (int)bHandled, pWindow );
+
+    SAL_INFO( "vcl.debugevent",
+              "Injected edit / move key 0x" << std::hex << (int) aKeyEvent.mnCode << std::dec
+              << " -> " << bHandled
+              << " win " <<  pWindow );
     ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYUP, &aKeyEvent );
 }