ucb/source/ucp/gvfs/gvfs_content.cxx | 6 +++--- ucb/source/ucp/gvfs/gvfs_directory.cxx | 10 +++++----- ucb/source/ucp/gvfs/gvfs_directory.hxx | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 80d9fbdde2a921958ec6725a1d80ba17fc5165c9 Author: Stephan Bergmann <[email protected]> Date: Tue Feb 18 08:43:24 2014 +0100 sal_Bool -> bool fixup Change-Id: I4e69744d99334bfe9dafdfd19b2f0242ccf0d4cc diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index a2e5573..26f6ba8 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -318,10 +318,10 @@ uno::Any SAL_CALL Content::execute( aRet <<= setPropertyValues( aProperties, xEnv ); } else if ( COMMAND_IS( aCommand, "getPropertySetInfo" ) ) { - aRet <<= getPropertySetInfo( xEnv, sal_False ); + aRet <<= getPropertySetInfo( xEnv, false ); } else if ( COMMAND_IS( aCommand, "getCommandInfo" ) ) { - aRet <<= getCommandInfo( xEnv, sal_False ); + aRet <<= getCommandInfo( xEnv, false ); } else if ( COMMAND_IS( aCommand, "open" ) ) { ucb::OpenCommandArgument2 aOpenCommand; @@ -650,7 +650,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendVoid( rProp ); else if ( rProp.Name == "IsVolume" || rProp.Name == "IsCompactDisk" ) - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); else if ( rProp.Name == "DateCreated" ) { if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_CTIME) diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx index 5871baa..21612a0 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.cxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx @@ -233,17 +233,17 @@ DataSupplier::queryContent( sal_uInt32 nIndex ) } // virtual -sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) +bool DataSupplier::getResult( sal_uInt32 nIndex ) { osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( m_pImpl->m_aResults.size() > nIndex ) // Result already present. - return sal_True; + return true; if ( getData() && m_pImpl->m_aResults.size() > nIndex ) - return sal_True; + return true; - return sal_False; + return false; } // virtual @@ -264,7 +264,7 @@ sal_uInt32 DataSupplier::currentCount() } // virtual -sal_Bool DataSupplier::isCountFinal() +bool DataSupplier::isCountFinal() { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); return m_pImpl->m_bCountFinal; diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx index 37d6aa0..1ea9fa7 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.hxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx @@ -66,11 +66,11 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ); - virtual sal_Bool getResult( sal_uInt32 nIndex ); + virtual bool getResult( sal_uInt32 nIndex ); virtual sal_uInt32 totalCount(); virtual sal_uInt32 currentCount(); - virtual sal_Bool isCountFinal(); + virtual bool isCountFinal(); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
