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

[Tor Lillqvist]

 vcl/source/window/toolbox.cxx |    2 +-
 vcl/source/window/window.cxx  |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 29a4487a067946fa3227807787280d1f13c45d1a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 12:10:46 2014 +0200

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0c51710..277531b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -6266,7 +6266,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
         else if ( mpWindowImpl->mbFrame )
         {
             mpWindowImpl->mbSuppressAccessibilityEvents = true;
-            mpWindowImpl->mpFrame->Show( sal_False, sal_False );
+            mpWindowImpl->mpFrame->Show( false, false );
         }
 
         StateChanged( STATE_CHANGE_VISIBLE );
@@ -6419,7 +6419,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
 
             mpWindowImpl->mbPaintFrame = true;
             bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) ? sal_True : sal_False;
-            mpWindowImpl->mpFrame->Show( sal_True, bNoActivate );
+            mpWindowImpl->mpFrame->Show( true, bNoActivate );
             if( aDogTag.IsDead() )
                 return;
 
@@ -7603,7 +7603,7 @@ void Window::CaptureMouse()
     if ( pSVData->maWinData.mpCaptureWin != this )
     {
         pSVData->maWinData.mpCaptureWin = this;
-        mpWindowImpl->mpFrame->CaptureMouse( sal_True );
+        mpWindowImpl->mpFrame->CaptureMouse( true );
     }
 }
 
@@ -7620,7 +7620,7 @@ void Window::ReleaseMouse()
     if ( pSVData->maWinData.mpCaptureWin == this )
     {
         pSVData->maWinData.mpCaptureWin = NULL;
-        mpWindowImpl->mpFrame->CaptureMouse( sal_False );
+        mpWindowImpl->mpFrame->CaptureMouse( false );
         ImplGenerateMouseMove();
     }
 }
commit 74c17d618759759e2ba532e09d36f4e34bca957d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 12:09:00 2014 +0200

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

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index b43dd84..f749509 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1412,7 +1412,7 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel )
     else
         EndDragging( true );
 
-    return true;
+    return (long) true;
 }