[Libreoffice-commits] core.git: vcl/osx

Noel Grandin noel at peralex.com
Tue May 10 10:37:33 UTC 2016


 vcl/osx/salframe.cxx |    2 +-
 vcl/osx/salinst.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5afe70cf8b83708d27e15682725c01ce347a6a7
Author: Noel Grandin <noel at peralex.com>
Date:   Tue May 10 12:35:50 2016 +0200

    more OSX fix
    
    Change-Id: Id9500cf86988614d9dfa04a52b73decd2a4855e0

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index a1498c5..8945a57 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -575,7 +575,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
     // get new geometry
     UpdateFrameGeometry();
 
-    sal_uInt16 nEvent = 0;
+    SalEvent nEvent = SalEvent::NONE;
     if( pState->mnMask & (WindowStateMask::X | WindowStateMask::Y) )
     {
         mbPositioned = true;
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 10e3f2f..3bbff24 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -580,7 +580,7 @@ SalYieldResult AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents
         sal_uLong nCount = ReleaseYieldMutex();
 
         // get one user event
-        SalUserEvent aEvent( nullptr, nullptr, 0 );
+        SalUserEvent aEvent( nullptr, nullptr, SalEvent::NONE );
         {
             osl::MutexGuard g( maUserEventListMutex );
             if( ! maUserEvents.empty() )


More information about the Libreoffice-commits mailing list