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

[Tor Lillqvist]

 include/vcl/vclmedit.hxx      |    2 +-
 vcl/source/control/button.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

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

diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 7e21355..c95258a 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -75,7 +75,7 @@ public:
     virtual void    EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT );
     virtual void    DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; }
 
-    virtual void    SetReadOnly( bool bReadOnly = sal_True );
+    virtual void    SetReadOnly( bool bReadOnly = true );
     virtual bool    IsReadOnly() const;
 
     void            EnableFocusSelectionHide( bool bHide );
commit b530a91f059ac29b1f596f36f3eb065de4db4352
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 11:32:04 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'long'
    
    Use the proper RET_OK amd RET_CANCEL parameters to EndDialog().
    
    Change-Id: I2500e5e9793ee98c8cf38fc094d9f984576b67db

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 5c8859a..3086de5 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1682,7 +1682,7 @@ void OKButton::Click()
             if ( pParent->IsDialog() )
             {
                 if ( ((Dialog*)pParent)->IsInExecute() )
-                    ((Dialog*)pParent)->EndDialog( true );
+                    ((Dialog*)pParent)->EndDialog( RET_OK );
                 // prevent recursive calls
                 else if ( !((Dialog*)pParent)->IsInClose() )
                 {
@@ -1739,7 +1739,7 @@ void CancelButton::Click()
             if ( pParent->IsDialog() )
             {
                 if ( ((Dialog*)pParent)->IsInExecute() )
-                    ((Dialog*)pParent)->EndDialog( false );
+                    ((Dialog*)pParent)->EndDialog( RET_CANCEL );
                 // prevent recursive calls
                 else if ( !((Dialog*)pParent)->IsInClose() )
                 {