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

[Tor Lillqvist]

 vcl/source/gdi/print.cxx        |    4 ++--
 vcl/source/helper/strhelper.cxx |    4 ++--
 vcl/source/window/dialog.cxx    |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 02e355370dcac945172c0064258ce66a98d193fd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 11:49:58 2014 +0200

    More EndDialog() cleanup
    
    Change-Id: I2e79190936d1eb7f55b521d2ce558fba45bf5f28

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 0d648a6..55f9856 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -790,7 +790,7 @@ bool Dialog::Close()
 
     if ( IsInExecute() )
     {
-        EndDialog( false );
+        EndDialog( RET_CANCEL );
         mbInClose = false;
         return true;
     }
@@ -1078,7 +1078,7 @@ void Dialog::EndAllDialogs( Window* pParent )
      pTempModDialog = pModDialog->mpPrevExecuteDlg;
      if( !pParent || ( pParent && pParent->IsWindowOrChild( pModDialog, true ) ) )
      {
-        pModDialog->EndDialog( false );
+        pModDialog->EndDialog( RET_CANCEL );
         pModDialog->PostUserEvent( Link() );
      }
      pModDialog = pTempModDialog;
commit df94df2d7beba113f915c92f5ccb3af706ac08d6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 11:48:01 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'int'
    
    The bIncludeUntil parameter is used as a bool, so make it a bool. It is passed
    bool values anyway.
    
    Change-Id: If477419e8d94af69ad2bd5b452819e83a5a8149f

diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 4376ab1..53fd5b0 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -49,7 +49,7 @@ inline bool isProtect( sal_Unicode cChar )
     return cChar == '`' || cChar == '\'' || cChar == '"';
 }
 
-inline void CopyUntil( char*& pTo, const char*& pFrom, char cUntil, int bIncludeUntil = 0 )
+inline void CopyUntil( char*& pTo, const char*& pFrom, char cUntil, bool bIncludeUntil = false )
 {
     do
     {
@@ -80,7 +80,7 @@ inline void CopyUntil( char*& pTo, const char*& pFrom, char cUntil, int bInclude
         pFrom++;
 }
 
-inline void CopyUntil( sal_Unicode*& pTo, const sal_Unicode*& pFrom, sal_Unicode cUntil, int bIncludeUntil = 0 )
+inline void CopyUntil( sal_Unicode*& pTo, const sal_Unicode*& pFrom, sal_Unicode cUntil, bool bIncludeUntil = false )
 {
     do
     {
commit 17ec83705ae7f005e4f729fe531c7f1e86415632
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 11:46:31 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'sal_uLong'
    
    Change-Id: I5089279745c4247ec0006f2273f6ec3d40d7c2a2

diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 968ebab..d6eb52d 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -698,12 +698,12 @@ Printer::~Printer()
 sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const
 {
     if ( IsDisplayPrinter() )
-        return false;
+        return 0;
 
     if( mpInfoPrinter )
         return mpInfoPrinter->GetCapabilities( maJobSetup.ImplGetConstData(), nType );
     else
-        return false;
+        return 0;
 }