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

[Tor Lillqvist]

 vcl/source/window/printdlg.cxx |    2 +-
 vcl/source/window/toolbox2.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c005d07dbcea821ff620826090ca146d39788528
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 11:55:28 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'sal_uInt16'
    
    Change-Id: If6c41795a4015eb6bdd6bf785dd5ea6f7069e76b

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index b8db778..6008cfe 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1489,7 +1489,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease )
             if ( nPos != mnCurPos )
             {
                 mnCurPos = nPos;
-                ImplDrawItem( mnCurPos, true );
+                ImplDrawItem( mnCurPos, 1 );
                 Flush();
             }
         }
@@ -1497,7 +1497,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease )
         {
             if ( nPos == mnCurPos )
             {
-                ImplDrawItem( mnCurPos, false );
+                ImplDrawItem( mnCurPos, 0 );
                 Flush();
                 mnCurPos = TOOLBOX_ITEM_NOTFOUND;
             }
@@ -1799,7 +1799,7 @@ void ToolBox::ImplFillLayoutData() const
 
         // only draw, if the rectangle is within PaintRectangle
         if ( !pItem->maRect.IsEmpty() )
-            const_cast<ToolBox*>(this)->ImplDrawItem( i, false, false, true );
+            const_cast<ToolBox*>(this)->ImplDrawItem( i, 0, false, true );
     }
 }
 
commit bf470dcdf53beeca6a93f89b4d7c82ad11dc7168
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 11:52:04 2014 +0200

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

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7c1c5a2..7f7cbd8 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1052,7 +1052,7 @@ void PrintDialog::setupOptionalUI()
                 pBtn->SetText( aChoices[m] );
                 pBtn->Check( m == nSelectVal );
                 pBtn->SetToggleHdl( LINK( this, PrintDialog, UIOption_RadioHdl ) );
-                if( aChoicesDisabled.getLength() > m && aChoicesDisabled[m] == true )
+                if( aChoicesDisabled.getLength() > m && aChoicesDisabled[m] )
                     pBtn->Enable( false );
                 pBtn->Show();
                 maPropertyToWindowMap[ aPropertyName ].push_back( pBtn );