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

Stephan Bergmann sbergman at redhat.com
Mon Aug 28 19:15:40 UTC 2017


 vcl/osx/salframeview.mm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ec92fc01fe3500fb82b1e99cc6ff59dc146cfc5c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 28 21:11:55 2017 +0200

    loplugin:implicitboolconversion
    
    Change-Id: Ie6c9b4c98d1fab26f79e7549ebeb03aa81a1dd1d

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index a20f3b7a6e5a..35f55c6e2f17 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1523,7 +1523,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 {
     SolarMutexGuard aGuard;
 
-    long nRet = 0;
+    bool nRet = false;
     if( AquaSalFrame::isAlive( mpFrame ) )
     {
         SalKeyEvent aEvent;
@@ -1533,11 +1533,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
         nRet = mpFrame->CallCallback( SalEvent::KeyInput, &aEvent );
         std::map< NSEvent*, bool >::iterator it = GetSalData()->maKeyEventAnswer.find( mpLastEvent );
         if( it != GetSalData()->maKeyEventAnswer.end() )
-            it->second = nRet != 0;
+            it->second = nRet;
         if( AquaSalFrame::isAlive( mpFrame ) )
             mpFrame->CallCallback( SalEvent::KeyUp, &aEvent );
     }
-    return nRet ? YES : NO;
+    return nRet;
 }
 
 


More information about the Libreoffice-commits mailing list