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

[Tor Lillqvist]

 vcl/unx/generic/window/salframe.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0526048e4e7ae46b3a8cf6cd9a4d2ffe0a082167
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 12:16:17 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'long'
    
    Change-Id: If0d7ca02e8ecbc15eabc7807a71554ce11d92552

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 0d8ad33..c24e960 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -4015,7 +4015,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                     }
                     bMapped_   = true;
                     bViewable_ = true;
-                    nRet = true;
+                    nRet = 1;
                     if ( mpInputContext != NULL )
                         mpInputContext->Map( this );
                     CallCallback( SALEVENT_RESIZE, NULL );
@@ -4075,7 +4075,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                 {
                     bMapped_   = false;
                     bViewable_ = false;
-                    nRet = true;
+                    nRet = 1;
                     if ( mpInputContext != NULL )
                         mpInputContext->Unmap( this );
                     CallCallback( SALEVENT_RESIZE, NULL );
@@ -4090,7 +4090,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
 
             case VisibilityNotify:
                 nVisibility_ = pEvent->xvisibility.state;
-                nRet = true;
+                nRet = 1;
                 if( bAlwaysOnTop_
                     && bMapped_
                     && ! GetDisplay()->getWMAdaptor()->isAlwaysOnTopOK()