cairo svp: SalEvent -> sal_uInt16.

Change-Id: Ibaef5f7cea23edbabcbb30e4b39ac71009fbd1a5

4 files changed, 15 insertions, 15 deletions

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index a7f81819fb3e..d835c5704285 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -89,7 +89,7 @@ SvpSalFrame::~SvpSalFrame()
         // SAL-DEBUG("SvpSalFrame::~SvpSalFrame: losing focus: " << this);
         s_pFocusFrame = nullptr;
         // call directly here, else an event for a destroyed frame would be dispatched
-        CallCallback( SalEvent::LoseFocus, nullptr );
+        CallCallback( SALEVENT_LOSEFOCUS, nullptr );
         // if the handler has not set a new focus frame
         // pass focus to another frame, preferably a document style window
         if( s_pFocusFrame == nullptr )
@@ -126,7 +126,7 @@ void SvpSalFrame::GetFocus()
             s_pFocusFrame->LoseFocus();
         // SAL-DEBUG("SvpSalFrame::GetFocus(): " << this);
         s_pFocusFrame = this;
-        m_pInstance->PostEvent( this, nullptr, SalEvent::GetFocus );
+        m_pInstance->PostEvent( this, nullptr, SALEVENT_GETFOCUS );
     }
 }
 
@@ -135,7 +135,7 @@ void SvpSalFrame::LoseFocus()
     if( s_pFocusFrame == this )
     {
         // SAL-DEBUG("SvpSalFrame::LoseFocus: " << this);
-        m_pInstance->PostEvent( this, nullptr, SalEvent::LoseFocus );
+        m_pInstance->PostEvent( this, nullptr, SALEVENT_LOSEFOCUS );
         s_pFocusFrame = nullptr;
     }
 }
@@ -159,7 +159,7 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
 
 bool SvpSalFrame::PostEvent(ImplSVEvent* pData)
 {
-    m_pInstance->PostEvent( this, pData, SalEvent::UserEvent );
+    m_pInstance->PostEvent( this, pData, SALEVENT_USEREVENT );
     return true;
 }
 
@@ -169,7 +169,7 @@ void SvpSalFrame::PostPaint() const
     {
         SalPaintEvent aPEvt(0, 0, maGeometry.nWidth, maGeometry.nHeight);
         aPEvt.mbImmediateUpdate = false;
-        CallCallback( SalEvent::Paint, &aPEvt );
+        CallCallback( SALEVENT_PAINT, &aPEvt );
     }
 }
 
@@ -199,7 +199,7 @@ void SvpSalFrame::Show( bool bVisible, bool bNoActivate )
     {
         // SAL-DEBUG("SvpSalFrame::Show: showing: " << this);
         m_bVisible = true;
-        m_pInstance->PostEvent( this, nullptr, SalEvent::Resize );
+        m_pInstance->PostEvent( this, nullptr, SALEVENT_RESIZE );
         if( ! bNoActivate )
             GetFocus();
     }
@@ -207,7 +207,7 @@ void SvpSalFrame::Show( bool bVisible, bool bNoActivate )
     {
         // SAL-DEBUG("SvpSalFrame::Show: hiding: " << this);
         m_bVisible = false;
-        m_pInstance->PostEvent( this, nullptr, SalEvent::Resize );
+        m_pInstance->PostEvent( this, nullptr, SALEVENT_RESIZE );
         LoseFocus();
     }
     else
@@ -279,7 +279,7 @@ void SvpSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
         }
     }
     if( m_bVisible )
-        m_pInstance->PostEvent( this, nullptr, SalEvent::Resize );
+        m_pInstance->PostEvent( this, nullptr, SALEVENT_RESIZE );
 #endif
 }
 
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 616865696ba1..6207bdfa5774 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -157,7 +157,7 @@ void SvpSalInstance::CreateWakeupPipe(bool log)
     }
 }
 
-void SvpSalInstance::PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, SalEvent nEvent)
+void SvpSalInstance::PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, sal_uInt16 nEvent)
 {
     {
         osl::MutexGuard g(m_aEventGuard);
@@ -191,7 +191,7 @@ void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
         {
             if( it->m_pFrame == pFrame )
             {
-                if (it->m_nEvent == SalEvent::UserEvent)
+                if (it->m_nEvent == SALEVENT_USEREVENT)
                 {
                     delete static_cast<ImplSVEvent *>(it->m_pData);
                 }
@@ -338,7 +338,7 @@ SalYieldResult SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents,
             if ( isFrameAlive( it->m_pFrame ) )
             {
                 it->m_pFrame->CallCallback( it->m_nEvent, it->m_pData );
-                if( it->m_nEvent == SalEvent::Resize )
+                if( it->m_nEvent == SALEVENT_RESIZE )
                 {
                     // this would be a good time to post a paint
                     const SvpSalFrame* pSvpFrame = static_cast<const SvpSalFrame*>(it->m_pFrame);
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 83276960e1c6..d88684fc4ff2 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -257,7 +257,7 @@ void SvpSalInstance::PostPrintersChanged()
     const std::list< SalFrame* >& rList = SvpSalInstance::s_pDefaultInstance->getFrames();
     for( std::list< SalFrame* >::const_iterator it = rList.begin();
          it != rList.end(); ++it )
-        SvpSalInstance::s_pDefaultInstance->PostEvent( *it, nullptr, SalEvent::PrinterChanged );
+        SvpSalInstance::s_pDefaultInstance->PostEvent( *it, nullptr, SALEVENT_PRINTERCHANGED );
 }
 
 GenPspGraphics *SvpSalInstance::CreatePrintGraphics()
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 343bc666da58..8b10ce054b75 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -68,9 +68,9 @@ class VCL_DLLPUBLIC SvpSalInstance : public SalGenericInstance
     {
         const SalFrame*     m_pFrame;
         ImplSVEvent*        m_pData;
-        SalEvent            m_nEvent;
+        sal_uInt16            m_nEvent;
 
-        SalUserEvent( const SalFrame* pFrame, ImplSVEvent* pData, SalEvent nEvent = SalEvent::UserEvent )
+        SalUserEvent( const SalFrame* pFrame, ImplSVEvent* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT )
                 : m_pFrame( pFrame ),
                   m_pData( pData ),
                   m_nEvent( nEvent )
@@ -95,7 +95,7 @@ public:
     void                    CloseWakeupPipe(bool log);
     void                    CreateWakeupPipe(bool log);
 
-    void                    PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, SalEvent nEvent);
+    void                    PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, sal_uInt16 nEvent);
 
 #ifdef ANDROID
     bool                    PostedEventsInQueue();