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

[Tor Lillqvist]

 vcl/inc/headless/svpframe.hxx   |    2 +-
 vcl/unx/generic/app/saldisp.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8f5444e83261dd7300326b6fc083572c21a86569
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 12:14:12 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'int'
    
    Change-Id: Ifaeeb0f01dbcd0225ee50c15d0b2417f99b1bd0e

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index ea6f9b8..c343552 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -362,7 +362,7 @@ static int DisplayYield( int fd, SalX11Display *pDisplay )
   GetSalData()->m_pInstance->GetYieldMutex()->acquire();
   pDisplay->Yield();
   GetSalData()->m_pInstance->GetYieldMutex()->release();
-  return true;
+  return 1;
 }
 
 SalX11Display::SalX11Display( Display *display )
commit 9bbc04988a1a890b8db99d61497f567cbc7e21e0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 12:12:28 2014 +0200

    WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
    
    Change-Id: I826f7649a1e9ed8aad06848aa1f2ed5a5827f3ab

diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 63986cf..8e72709 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -87,7 +87,7 @@ public:
     virtual void                DrawMenuBar();
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( bool bVisible, bool bNoActivate = sal_False );
+    virtual void                Show( bool bVisible, bool bNoActivate = false );
     virtual void                Enable( bool bEnable );
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );