retain type for another level

Change-Id: I4017e5404c99d37b36988f1d7a8ce17e42010070
Reviewed-on: https://gerrit.libreoffice.org/18913
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

11 files changed, 12 insertions, 11 deletions

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 459a71070bb3..f019ea5f4f8d 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -191,7 +191,7 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
     delete pSvpGraphics;
 }
 
-bool SvpSalFrame::PostEvent( void* pData )
+bool SvpSalFrame::PostEvent(ImplSVEvent* pData)
 {
     m_pInstance->PostEvent( this, pData, SALEVENT_USEREVENT );
     return true;
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 17d98b0efb3a..0b649ba81e35 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -115,7 +115,7 @@ SvpSalInstance::~SvpSalInstance()
     osl_destroyMutex( m_aEventGuard );
 }
 
-void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
+void SvpSalInstance::PostEvent(const SalFrame* pFrame, void* pData, sal_uInt16 nEvent)
 {
     if( osl_acquireMutex( m_aEventGuard ) )
     {
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 0598bf00158c..23edc627e98d 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -81,7 +81,7 @@ public:
     virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
     virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
 
-    virtual bool                PostEvent( void* pData ) SAL_OVERRIDE;
+    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
 
     virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
     virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 69ff3a1bfc48..f426200c7d01 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -108,7 +108,7 @@ public:
 
     virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
     virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                PostEvent( void* pData ) SAL_OVERRIDE;
+    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
     virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
     virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
     virtual void                SetRepresentedURL( const OUString& ) SAL_OVERRIDE;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index e75ed2da48b1..26d275ba4a19 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -95,6 +95,7 @@ typedef sal_uInt64 SalExtStyle;
 #define SAL_FRAME_POSSIZE_HEIGHT            ((sal_uInt16)0x0008)
 
 struct SystemParentData;
+struct ImplSVEvent;
 
 /// A SalFrame is a system window (e.g. an X11 window).
 class VCL_PLUGIN_PUBLIC SalFrame
@@ -126,7 +127,7 @@ public:
 
     // Event must be destroyed, when Frame is destroyed
     // When Event is called, SalInstance::Yield() must be returned
-    virtual bool            PostEvent( void* pData ) = 0;
+    virtual bool            PostEvent(ImplSVEvent* pData) = 0;
 
     virtual void            SetTitle( const OUString& rTitle ) = 0;
     virtual void            SetIcon( sal_uInt16 nIcon ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 411207b9c429..dcf7f2f1eabb 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -374,7 +374,7 @@ public:
 
     // Event must be destroyed, when Frame is destroyed
     // When Event is called, SalInstance::Yield() must be returned
-    virtual bool                PostEvent( void* pData ) SAL_OVERRIDE;
+    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
 
     virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
     virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 08be500241ae..d06279198f29 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -215,7 +215,7 @@ public:
     // call with false to setup graphics with window (GetWindow())
     virtual void                updateGraphics( bool bClear );
 
-    virtual bool                PostEvent( void* pData ) SAL_OVERRIDE;
+    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
 
     virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
     virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 3882c4023824..560a58448e75 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -273,7 +273,7 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
     mbGraphics = FALSE;
 }
 
-bool AquaSalFrame::PostEvent( void *pData )
+bool AquaSalFrame::PostEvent(ImplSVEvent* pData)
 {
     GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData );
     return TRUE;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 965d3b80f2c6..11ec3e4b0e00 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2423,7 +2423,7 @@ X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent)
 
 // PostEvent
 
-bool X11SalFrame::PostEvent( void *pData )
+bool X11SalFrame::PostEvent(ImplSVEvent* pData)
 {
     GetDisplay()->SendInternalEvent( this, pData );
     return true;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 21a1876b29cd..49eebbd77321 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1642,7 +1642,7 @@ void GtkSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
     }
 }
 
-bool GtkSalFrame::PostEvent( void* pData )
+bool GtkSalFrame::PostEvent(ImplSVEvent* pData)
 {
     getDisplay()->SendInternalEvent( this, pData );
     return true;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 5cb863f43b17..3a61bc2e1338 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1059,7 +1059,7 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
     mbGraphics = FALSE;
 }
 
-bool WinSalFrame::PostEvent( void* pData )
+bool WinSalFrame::PostEvent(ImplSVEvent* pData)
 {
     return (bool)PostMessageW( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData );
 }