[Libreoffice-commits] core.git: oox/source ucb/source

Stephan Bergmann sbergman at redhat.com
Wed Jan 24 18:18:17 UTC 2018


 oox/source/ppt/timenodelistcontext.cxx |    2 +-
 ucb/source/ucp/file/bc.cxx             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9c8ae146042a28d1d56b7c672d5b3a9d659515b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 24 08:22:02 2018 +0100

    sal_Bool -> bool (remaining uses of css::uno::Any::has)
    
    Change-Id: I041540307d48083955a74d20f73219ac458037fe
    Reviewed-on: https://gerrit.libreoffice.org/48482
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 00841a2c487a..7c98cfd49340 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -185,7 +185,7 @@ namespace oox { namespace ppt {
                         else if( aString == "false" )
                             maTo <<= false;
 
-                        if (!maTo.has<sal_Bool>())
+                        if (!maTo.has<bool>())
                         {
                             SAL_WARN("oox.ppt", "conversion failed");
                             maTo <<= false;
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 9f9203166d2a..4f076002ac8c 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -353,7 +353,7 @@ BaseContent::execute( const Command& aCommand,
     }
     else if ( aCommand.Name == "delete" )
     {
-        if( ! aCommand.Argument.has< sal_Bool >() )
+        if( ! aCommand.Argument.has< bool >() )
             m_pMyShell->installError( CommandId,
                                       TASKHANDLING_WRONG_DELETE_ARGUMENT );
         else


More information about the Libreoffice-commits mailing list