[Libreoffice-commits] core.git: vcl/inc vcl/source

Stephan Bergmann sbergman at redhat.com
Tue May 6 03:29:00 PDT 2014


 vcl/inc/svdata.hxx            |    1 -
 vcl/source/app/svapp.cxx      |    1 -
 vcl/source/window/window.cxx  |    1 -
 vcl/source/window/winproc.cxx |    4 ++--
 4 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit ae92e6e6d5dec81c2e22a51a89f463cae1ac1edb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 6 12:27:38 2014 +0200

    ImplSVEvent::mnEvent is always zero
    
    ...at least since f74efe63d9a70da723f046c1c6708b9254dfa887 "callcatcher: remove
    newly unused code."
    
    Change-Id: I7067e9e6af6693c1401510e2de196533d6963cb2

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index f16fe37..7fa60e3 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -395,7 +395,6 @@ private:
 
 struct ImplSVEvent
 {
-    sal_uLong               mnEvent;
     void*               mpData;
     Link*               mpLink;
     Window*             mpWindow;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index dd21319..ba2c51f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -938,7 +938,6 @@ sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller )
 bool Application::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller )
 {
     ImplSVEvent* pSVEvent = new ImplSVEvent;
-    pSVEvent->mnEvent   = 0;
     pSVEvent->mpData    = pCaller;
     pSVEvent->mpLink    = new Link( rLink );
     pSVEvent->mpWindow  = NULL;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 3d05688..2b155e9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5305,7 +5305,6 @@ bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCalle
 {
 
     ImplSVEvent* pSVEvent = new ImplSVEvent;
-    pSVEvent->mnEvent   = 0;
     pSVEvent->mpData    = pCaller;
     pSVEvent->mpLink    = new Link( rLink );
     pSVEvent->mpWindow  = this;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 5560cdd..7ee8e79 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1879,14 +1879,14 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
                 if ( pSVEvent->mpLink )
                     pSVEvent->mpLink->Call( pSVEvent->mpData );
                 else
-                    pSVEvent->mpWindow->UserEvent( pSVEvent->mnEvent, pSVEvent->mpData );
+                    pSVEvent->mpWindow->UserEvent( 0, pSVEvent->mpData );
             }
             else
             {
                 if ( pSVEvent->mpLink )
                     pSVEvent->mpLink->Call( pSVEvent->mpData );
                 else
-                    GetpApp()->UserEvent( pSVEvent->mnEvent, pSVEvent->mpData );
+                    GetpApp()->UserEvent( 0, pSVEvent->mpData );
             }
         }
 


More information about the Libreoffice-commits mailing list