summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2016-05-13 10:14:59 +0200
committerJan Holesovsky <kendy@collabora.com>2016-05-16 14:56:55 +0200
commitc5f401b762f90718995ec5d8503b1db0ab6c43ad (patch)
tree41ecd10cec8ce3684cad2ece588580548d034d30
parentd07cf23101c89f8e8d46ac0ffbb86b143eac21e0 (diff)
cairo svp: SalFrameToTop -> sal_uInt16.
Change-Id: Ic062124e82076e125d8d51cd303983b44fe8af68
-rw-r--r--vcl/headless/svpframe.cxx2
-rw-r--r--vcl/inc/headless/svpframe.hxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index a455ac96c27d..f2c54c782baa 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -364,7 +364,7 @@ void SvpSalFrame::SetAlwaysOnTop( bool )
{
}
-void SvpSalFrame::ToTop( SalFrameToTop )
+void SvpSalFrame::ToTop( sal_uInt16 )
{
GetFocus();
}
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index a26aff0e00c2..3503f21d9d47 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -70,7 +70,7 @@ public:
virtual SalGraphics* AcquireGraphics() override;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) override;
- virtual bool PostEvent(ImplSVEvent* pData) override;
+ virtual bool PostEvent(void* pData) override;
virtual void SetTitle( const OUString& rTitle ) override;
virtual void SetIcon( sal_uInt16 nIcon ) override;
@@ -90,7 +90,7 @@ public:
virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override;
virtual void StartPresentation( bool bStart ) override;
virtual void SetAlwaysOnTop( bool bOnTop ) override;
- virtual void ToTop( SalFrameToTop nFlags ) override;
+ virtual void ToTop( sal_uInt16 nFlags ) override;
virtual void SetPointer( PointerStyle ePointerStyle ) override;
virtual void CaptureMouse( bool bMouse ) override;
virtual void SetPointerPos( long nX, long nY ) override;