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

[Xisco Fauli]

 vcl/inc/salframe.hxx             |    3 +--
 vcl/inc/salwtype.hxx             |    3 +--
 vcl/inc/window.h                 |    2 +-
 vcl/source/app/svapp.cxx         |    2 +-
 vcl/source/window/debugevent.cxx |   10 +++++-----
 vcl/source/window/winproc.cxx    |    3 +--
 6 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit cb71841a31404fdbe4df76d9473ee73c2fa8554b
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Fri Jan 15 19:52:09 2016 +0100

    tdf#78431: Clean up pFrame parameter in ImplWindowFrameProc
    
    Change-Id: I441c1b89a975fa7d31094e66ef3ccad37ce40818
    Reviewed-on: https://gerrit.libreoffice.org/21497
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index c08486f..e562acd 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -248,7 +248,6 @@ public:
         return false;
     }
 
-
     // Callbacks (indepent part in vcl/source/window/winproc.cxx)
     // for default message handling return 0
     void                    SetCallback( vcl::Window* pWindow, SALFRAMEPROC pProc );
@@ -260,7 +259,7 @@ public:
     // that should not know more than necessary about the SalFrame implementation
     // (e.g. input methods, printer update handlers).
     long                    CallCallback( sal_uInt16 nEvent, const void* pEvent ) const
-        { return m_pProc ? long(m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent )) : 0; }
+        { return m_pProc ? long(m_pProc( m_pWindow, nEvent, pEvent )) : 0; }
 
     bool PaintsBlocked() const { return m_bPaintsBlocked; }
 };
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 5400dfb..c98994f 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -227,8 +227,7 @@ struct SalQueryCharPositionEvent
 
 // - SalFrame-Types -
 
-typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, SalFrame* pFrame,
-                              sal_uInt16 nEvent, const void* pEvent );
+typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, sal_uInt16 nEvent, const void* pEvent );
 
 // - SalObject-Events -
 
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 25719ac..3fed5b3 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -93,7 +93,7 @@ namespace dnd {
     class XDropTarget;
 }}}}}
 
-bool ImplWindowFrameProc( vcl::Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent );
+bool ImplWindowFrameProc( vcl::Window* pInst, sal_uInt16 nEvent, const void* pEvent );
 
 #define WINDOW_HITTEST_INSIDE           ((sal_uInt16)0x0001)
 #define WINDOW_HITTEST_TRANSPARENT      ((sal_uInt16)0x0002)
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 2995453..9e21fbe 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -997,7 +997,7 @@ IMPL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, pCallData, void )
     };
 
     if( pData->mpWin && pData->mpWin.get()->mpWindowImpl->mpFrameWindow.get() && pEventData )
-        ImplWindowFrameProc( pData->mpWin.get()->mpWindowImpl->mpFrameWindow.get(), nullptr, (sal_uInt16) nEvent, pEventData );
+        ImplWindowFrameProc( pData->mpWin.get()->mpWindowImpl->mpFrameWindow.get(), (sal_uInt16) nEvent, pEventData );
 
     // remove this event from list of posted events, watch for destruction of internal data
     ::std::list< ImplPostEventPair >::iterator aIter( aPostedEventList.begin() );
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index e57b06b..6a101c6 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -104,7 +104,7 @@ void DebugEventInjector::InjectMenuEvent()
 
     sal_uInt16 nEvent = nEvents[ (int)(getRandom() * SAL_N_ELEMENTS( nEvents )) ];
     SalMenuEvent aEvent = aIds[ getRandom() * aIds.size() ];
-    bool bHandled = ImplWindowFrameProc( pSysWin, nullptr, nEvent, &aEvent);
+    bool bHandled = ImplWindowFrameProc( pSysWin, nEvent, &aEvent);
 
     SAL_INFO( "vcl.debugevent",
               "Injected menu event " << aEvent.mpMenu
@@ -160,14 +160,14 @@ void DebugEventInjector::InjectTextEvent()
     if( getRandom() < 0.05 ) // modifier
         aKeyEvent.mnCode |= (sal_uInt16)( getRandom() * KEY_MODIFIERS_MASK ) & KEY_MODIFIERS_MASK;
 
-    bool bHandled = ImplWindowFrameProc( pWindow, nullptr, SALEVENT_KEYINPUT, &aKeyEvent);
+    bool bHandled = ImplWindowFrameProc( pWindow, SALEVENT_KEYINPUT, &aKeyEvent);
 
     SAL_INFO( "vcl.debugevent",
               "Injected key 0x" << std::hex << (int) aKeyEvent.mnCode << std::dec
               << " -> " << bHandled
               << " win " << pWindow );
 
-    ImplWindowFrameProc( pWindow, nullptr, SALEVENT_KEYUP, &aKeyEvent );
+    ImplWindowFrameProc( pWindow, SALEVENT_KEYUP, &aKeyEvent );
 }
 
 /*
@@ -242,13 +242,13 @@ void DebugEventInjector::InjectKeyNavEdit()
 
     aKeyEvent.mnCharCode = 0x0; // hopefully unused.
 
-    bool bHandled = ImplWindowFrameProc( pWindow, nullptr, SALEVENT_KEYINPUT, &aKeyEvent );
+    bool bHandled = ImplWindowFrameProc( pWindow, SALEVENT_KEYINPUT, &aKeyEvent );
 
     SAL_INFO( "vcl.debugevent",
               "Injected edit / move key 0x" << std::hex << (int) aKeyEvent.mnCode << std::dec
               << " -> " << bHandled
               << " win " <<  pWindow );
-    ImplWindowFrameProc( pWindow, nullptr, SALEVENT_KEYUP, &aKeyEvent );
+    ImplWindowFrameProc( pWindow, SALEVENT_KEYUP, &aKeyEvent );
 }
 
 void DebugEventInjector::Invoke()
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index f8f1831..0a1225a 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2325,8 +2325,7 @@ static void ImplHandleSalQueryCharPosition( vcl::Window *pWindow,
     }
 }
 
-bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
-                          sal_uInt16 nEvent, const void* pEvent )
+bool ImplWindowFrameProc( vcl::Window* _pWindow, sal_uInt16 nEvent, const void* pEvent )
 {
     DBG_TESTSOLARMUTEX();