From faced6b5f72b096800a232749cce6b38a76d5bac Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 16 Feb 2014 22:50:50 +0100 Subject: ucbhelper: sal_Bool -> bool Change-Id: Iee327c3dd75bebb35d99de01eaa7103956e08974 --- ucb/source/core/FileAccess.cxx | 2 +- ucb/source/core/ucbcmds.cxx | 2 +- ucb/source/ucp/cmis/cmis_content.cxx | 18 +++++++++--------- ucb/source/ucp/cmis/cmis_datasupplier.cxx | 10 +++++----- ucb/source/ucp/cmis/cmis_datasupplier.hxx | 4 ++-- ucb/source/ucp/cmis/cmis_repo_content.cxx | 10 +++++----- ucb/source/ucp/ext/ucpext_content.cxx | 8 ++++---- ucb/source/ucp/ext/ucpext_datasupplier.cxx | 10 +++++----- ucb/source/ucp/ext/ucpext_datasupplier.hxx | 4 ++-- ucb/source/ucp/gio/gio_content.cxx | 8 ++++---- ucb/source/ucp/gio/gio_datasupplier.cxx | 10 +++++----- ucb/source/ucp/gio/gio_datasupplier.hxx | 4 ++-- ucb/source/ucp/hierarchy/hierarchycontent.cxx | 12 ++++++------ ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx | 12 ++++++------ ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx | 4 ++-- ucb/source/ucp/package/pkgcontent.cxx | 12 ++++++------ ucb/source/ucp/package/pkgdatasupplier.cxx | 12 ++++++------ ucb/source/ucp/package/pkgdatasupplier.hxx | 4 ++-- ucb/source/ucp/tdoc/tdoc_content.cxx | 14 +++++++------- ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 8 ++++---- ucb/source/ucp/tdoc/tdoc_datasupplier.hxx | 4 ++-- ucb/source/ucp/webdav-neon/webdavcontent.cxx | 16 ++++++++-------- ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx | 10 +++++----- ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx | 4 ++-- 24 files changed, 101 insertions(+), 101 deletions(-) (limited to 'ucb/source') diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index c9a167477d03..f629b37897fd 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -699,7 +699,7 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL, try { - aCnt.writeStream( data, sal_True /* bReplaceExisting */ ); + aCnt.writeStream( data, true /* bReplaceExisting */ ); } catch ( CommandFailedException const & ) { diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index b2612e35a67a..933444120b12 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -413,7 +413,7 @@ NameClashContinuation interactiveNameClashResolve( rTargetURL, // target folder URL rClashingName, // clashing name OUString(), // no proposal for new name - sal_True /* bSupportsOverwriteData */ ) ); + true /* bSupportsOverwriteData */ ) ); rException = xRequest->getRequest(); if ( xEnv.is() ) diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index ee45dcdc6d40..15d7b5c8f4d9 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -537,7 +537,7 @@ namespace cmis if ( obj ) xRow->appendBoolean( rProp, obj->getBaseType( ) == "cmis:folder" ); else - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } catch ( const libcmis::Exception& ) { @@ -674,27 +674,27 @@ namespace cmis } else if ( rProp.Name == "IsVolume" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsRemote" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsRemoveable" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsFloppy" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsCompactDisc" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsHidden" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "TargetURL" ) { @@ -1620,9 +1620,9 @@ namespace cmis aRet <<= getPropertyValues( Properties, xEnv ); } else if ( aCommand.Name == "getPropertySetInfo" ) - aRet <<= getPropertySetInfo( xEnv, sal_False ); + aRet <<= getPropertySetInfo( xEnv, false ); else if ( aCommand.Name == "getCommandInfo" ) - aRet <<= getCommandInfo( xEnv, sal_False ); + aRet <<= getCommandInfo( xEnv, false ); else if ( aCommand.Name == "open" ) { ucb::OpenCommandArgument2 aOpenCommand; diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 27f046525793..195847481d10 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -84,15 +84,15 @@ namespace cmis return maResults[ nIndex ]->xContent; } - sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) + bool DataSupplier::getResult( sal_uInt32 nIndex ) { if ( maResults.size() > nIndex ) // Result already present. - return sal_True; + return true; if ( getData() && maResults.size() > nIndex ) - return sal_True; + return true; - return sal_False; + return false; } sal_uInt32 DataSupplier::totalCount() @@ -106,7 +106,7 @@ namespace cmis return maResults.size(); } - sal_Bool DataSupplier::isCountFinal() + bool DataSupplier::isCountFinal() { return mbCountFinal; } diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 1cbf901473a6..a205217cc4f1 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -57,11 +57,11 @@ namespace cmis 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 ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index e0714a226419..26c2f2652477 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -89,11 +89,11 @@ namespace cmis { if ( rProp.Name == "IsDocument" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsFolder" ) { - xRow->appendBoolean( rProp, sal_True ); + xRow->appendBoolean( rProp, true ); } else if ( rProp.Name == "Title" ) { @@ -101,7 +101,7 @@ namespace cmis } else if ( rProp.Name == "IsReadOnly" ) { - xRow->appendBoolean( rProp, sal_True ); + xRow->appendBoolean( rProp, true ); } else { @@ -325,9 +325,9 @@ namespace cmis aRet <<= getPropertyValues( Properties, xEnv ); } else if ( aCommand.Name == "getPropertySetInfo" ) - aRet <<= getPropertySetInfo( xEnv, sal_False ); + aRet <<= getPropertySetInfo( xEnv, false ); else if ( aCommand.Name == "getCommandInfo" ) - aRet <<= getCommandInfo( xEnv, sal_False ); + aRet <<= getCommandInfo( xEnv, false ); else if ( aCommand.Name == "open" ) { ucb::OpenCommandArgument2 aOpenCommand; diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index ad3290962a92..2e5b7658a717 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -417,11 +417,11 @@ namespace ucb { namespace ucp { namespace ext } else if ( rProp.Name == "IsDocument" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsFolder" ) { - xRow->appendBoolean( rProp, sal_True ); + xRow->appendBoolean( rProp, true ); } else { @@ -447,12 +447,12 @@ namespace ucb { namespace ucp { namespace ext -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), - sal_False ); + false ); xRow->appendBoolean( Property( OUString("IsFolder"), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), - sal_True ); + true ); } return Reference< XRow >( xRow.get() ); diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 8c8057d47907..3c2d80ef34ca 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -272,15 +272,15 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - sal_Bool DataSupplier::getResult( sal_uInt32 i_nIndex ) + bool DataSupplier::getResult( sal_uInt32 i_nIndex ) { ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( m_pImpl->m_aResults.size() > i_nIndex ) // result already present. - return sal_True; + return true; - return sal_False; + return false; } //------------------------------------------------------------------------------------------------------------------ @@ -297,9 +297,9 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - sal_Bool DataSupplier::isCountFinal() + bool DataSupplier::isCountFinal() { - return sal_True; + return true; } //------------------------------------------------------------------------------------------------------------------ diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index cfa5e04be074..6b123bedb1db 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -55,11 +55,11 @@ namespace ucb { namespace ucp { namespace ext virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); 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 ); virtual void releasePropertyValues( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 0dbeb0f7c0d3..b0787fa7dd3f 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -481,7 +481,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * else if ( rProp.Name == "IsVolume" ) { //What do we use this for ? - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsCompactDisc" ) { @@ -499,7 +499,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * } else if ( rProp.Name == "IsFloppy" ) { - xRow->appendBoolean( rProp, sal_False ); + xRow->appendBoolean( rProp, false ); } else if ( rProp.Name == "IsHidden" ) { @@ -929,9 +929,9 @@ uno::Any SAL_CALL Content::execute( aRet <<= getPropertyValues( Properties, xEnv ); } else if ( aCommand.Name == "getPropertySetInfo" ) - aRet <<= getPropertySetInfo( xEnv, sal_False ); + aRet <<= getPropertySetInfo( xEnv, false ); else if ( aCommand.Name == "getCommandInfo" ) - aRet <<= getCommandInfo( xEnv, sal_False ); + aRet <<= getCommandInfo( xEnv, false ); else if ( aCommand.Name == "open" ) { ucb::OpenCommandArgument2 aOpenCommand; diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 6a1197f65bec..2bcc219c1b67 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -185,15 +185,15 @@ uno::Reference< ucb::XContent > DataSupplier::queryContent( sal_uInt32 nIndex ) return uno::Reference< ucb::XContent >(); } -sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) +bool DataSupplier::getResult( sal_uInt32 nIndex ) { if ( maResults.size() > nIndex ) // Result already present. - return sal_True; + return true; if ( getData() && maResults.size() > nIndex ) - return sal_True; + return true; - return sal_False; + return false; } sal_uInt32 DataSupplier::totalCount() @@ -207,7 +207,7 @@ sal_uInt32 DataSupplier::currentCount() return maResults.size(); } -sal_Bool DataSupplier::isCountFinal() +bool DataSupplier::isCountFinal() { return mbCountFinal; } diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index 3a119a62360c..054d3527ddbc 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -70,11 +70,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 ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index d15c90b6cd3e..9ca0820ddf18 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -500,7 +500,7 @@ uno::Any SAL_CALL HierarchyContent::execute( } // Remove own and all children's Additional Core Properties. - removeAdditionalPropertySet( sal_True ); + removeAdditionalPropertySet( true ); } else if ( aCommand.Name == "transfer" && isFolder() && !isReadOnly() ) { @@ -976,7 +976,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( xAdditionalPropSet = uno::Reference< beans::XPropertySet >( pProvider->getAdditionalPropertySet( rContentId, - sal_False ), + false ), uno::UNO_QUERY ); bTriedToGetAdditionalPropSet = sal_True; } @@ -1053,7 +1053,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( // Append all Additional Core Properties. uno::Reference< beans::XPropertySet > xSet( - pProvider->getAdditionalPropertySet( rContentId, sal_False ), + pProvider->getAdditionalPropertySet( rContentId, false ), uno::UNO_QUERY ); xRow->appendPropertySet( xSet ); } @@ -1252,7 +1252,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { - xAdditionalPropSet = getAdditionalPropertySet( sal_False ); + xAdditionalPropSet = getAdditionalPropertySet( false ); bTriedToGetAdditionalPropSet = sal_True; } @@ -1317,7 +1317,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( // Adapt Additional Core Properties. renameAdditionalPropertySet( xOldId->getContentIdentifier(), xNewId->getContentIdentifier(), - sal_True ); + true ); } else { @@ -1846,7 +1846,7 @@ void HierarchyContent::transfer( } // Remove own and all children's Additional Core Properties. - xSource->removeAdditionalPropertySet( sal_True ); + xSource->removeAdditionalPropertySet( true ); } } diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index a27f462c06db..b03b35684706 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -230,25 +230,25 @@ HierarchyResultSetDataSupplier::queryContent( sal_uInt32 nIndex ) //========================================================================= // virtual -sal_Bool HierarchyResultSetDataSupplier::getResult( sal_uInt32 nIndex ) +bool HierarchyResultSetDataSupplier::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; } // Result not (yet) present. if ( m_pImpl->m_bCountFinal ) - return sal_False; + return false; // Try to obtain result... sal_uInt32 nOldCount = m_pImpl->m_aResults.size(); - sal_Bool bFound = sal_False; + bool bFound = false; sal_uInt32 nPos = nOldCount; while ( m_pImpl->m_aFolder.next( m_pImpl->m_aIterator ) ) @@ -261,7 +261,7 @@ sal_Bool HierarchyResultSetDataSupplier::getResult( sal_uInt32 nIndex ) if ( nPos == nIndex ) { // Result obtained. - bFound = sal_True; + bFound = true; break; } } @@ -333,7 +333,7 @@ sal_uInt32 HierarchyResultSetDataSupplier::currentCount() //========================================================================= // virtual -sal_Bool HierarchyResultSetDataSupplier::isCountFinal() +bool HierarchyResultSetDataSupplier::isCountFinal() { return m_pImpl->m_bCountFinal; } diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index 2b1a5c3f2f76..adb5678a56ec 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -53,11 +53,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 ); diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 267bb5e87188..2e05762e2dbb 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -597,7 +597,7 @@ uno::Any SAL_CALL Content::execute( } // Remove own and all children's Additional Core Properties. - removeAdditionalPropertySet( sal_True ); + removeAdditionalPropertySet( true ); } else if ( aCommand.Name == "transfer" ) { @@ -894,7 +894,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xAdditionalPropSet = uno::Reference< beans::XPropertySet >( rProvider->getAdditionalPropertySet( rContentId, - sal_False ), + false ), uno::UNO_QUERY ); bTriedToGetAdditionalPropSet = sal_True; } @@ -1015,7 +1015,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Additional Core Properties. uno::Reference< beans::XPropertySet > xSet( - rProvider->getAdditionalPropertySet( rContentId, sal_False ), + rProvider->getAdditionalPropertySet( rContentId, false ), uno::UNO_QUERY ); xRow->appendPropertySet( xSet ); } @@ -1315,7 +1315,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { - xAdditionalPropSet = getAdditionalPropertySet( sal_False ); + xAdditionalPropSet = getAdditionalPropertySet( false ); bTriedToGetAdditionalPropSet = sal_True; } @@ -1385,7 +1385,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Adapt Additional Core Properties. renameAdditionalPropertySet( xOldId->getContentIdentifier(), xNewId->getContentIdentifier(), - sal_True ); + true ); } else { @@ -2088,7 +2088,7 @@ void Content::transfer( } // Remove own and all children's Additional Core Properties. - xSource->removeAdditionalPropertySet( sal_True ); + xSource->removeAdditionalPropertySet( true ); } } diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 3b39f58e9b4b..e4a532941414 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -224,25 +224,25 @@ uno::Reference< ucb::XContent > DataSupplier::queryContent( //========================================================================= // 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; } // Result not (yet) present. if ( m_pImpl->m_bCountFinal ) - return sal_False; + return false; // Try to obtain result... sal_uInt32 nOldCount = m_pImpl->m_aResults.size(); - sal_Bool bFound = sal_False; + bool bFound = false; sal_uInt32 nPos = nOldCount; while ( m_pImpl->m_xFolderEnum->hasMoreElements() ) @@ -274,7 +274,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) if ( nPos == nIndex ) { // Result obtained. - bFound = sal_True; + bFound = true; break; } @@ -388,7 +388,7 @@ sal_uInt32 DataSupplier::currentCount() //========================================================================= // virtual -sal_Bool DataSupplier::isCountFinal() +bool DataSupplier::isCountFinal() { return m_pImpl->m_bCountFinal; } diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx index e8f7ab947d3a..e7b0a30db042 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.hxx +++ b/ucb/source/ucp/package/pkgdatasupplier.hxx @@ -46,11 +46,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 ); diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 04312d0d5429..0caba865fb99 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -564,7 +564,7 @@ uno::Any SAL_CALL Content::execute( } // Remove own and all children's Additional Core Properties. - removeAdditionalPropertySet( sal_True ); + removeAdditionalPropertySet( true ); } else if ( aCommand.Name == "transfer" ) { @@ -1008,7 +1008,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xAdditionalPropSet = uno::Reference< beans::XPropertySet >( pProvider->getAdditionalPropertySet( rContentId, - sal_False ), + false ), uno::UNO_QUERY ); bTriedToGetAdditionalPropSet = sal_True; } @@ -1106,7 +1106,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Additional Core Properties. uno::Reference< beans::XPropertySet > xSet( - pProvider->getAdditionalPropertySet( rContentId, sal_False ), + pProvider->getAdditionalPropertySet( rContentId, false ), uno::UNO_QUERY ); xRow->appendPropertySet( xSet ); } @@ -1279,7 +1279,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { - xAdditionalPropSet = getAdditionalPropertySet( sal_False ); + xAdditionalPropSet = getAdditionalPropertySet( false ); bTriedToGetAdditionalPropSet = sal_True; } @@ -1344,7 +1344,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Adapt Additional Core Properties. renameAdditionalPropertySet( xOldId->getContentIdentifier(), xNewId->getContentIdentifier(), - sal_True ); + true ); } else { @@ -2104,7 +2104,7 @@ void Content::transfer( aTargetUri += aSourceUri.getName(); if ( !copyAdditionalPropertySet( - aSourceUri.getUri(), aTargetUri, sal_True ) ) + aSourceUri.getUri(), aTargetUri, true ) ) { uno::Any aProps = uno::makeAny( @@ -2225,7 +2225,7 @@ void Content::transfer( } // Remove own and all children's Additional Core Properties. - if ( !xSource->removeAdditionalPropertySet( sal_True ) ) + if ( !xSource->removeAdditionalPropertySet( true ) ) { uno::Any aProps = uno::makeAny( diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 42f80af30bfe..f14cd677222c 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -211,20 +211,20 @@ ResultSetDataSupplier::queryContent( sal_uInt32 nIndex ) } // virtual -sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex ) +bool ResultSetDataSupplier::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; } // Result not (yet) present. if ( m_pImpl->m_bCountFinal ) - return sal_False; + return false; // Try to obtain result... @@ -337,7 +337,7 @@ sal_uInt32 ResultSetDataSupplier::currentCount() } // virtual -sal_Bool ResultSetDataSupplier::isCountFinal() +bool ResultSetDataSupplier::isCountFinal() { return m_pImpl->m_bCountFinal; } diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index aff926a57cbf..af170d517e1a 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -52,11 +52,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 ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index c6fbe4f80e23..0316facbeea2 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -459,7 +459,7 @@ uno::Any SAL_CALL Content::execute( // Note: Implemented by base class. aRet <<= getPropertySetInfo( Environment, - sal_False /* don't cache data */ ); + false /* don't cache data */ ); } else if ( aCommand.Name == "getCommandInfo" ) { @@ -468,7 +468,7 @@ uno::Any SAL_CALL Content::execute( ////////////////////////////////////////////////////////////////// // Note: Implemented by base class. - aRet <<= getCommandInfo( Environment, sal_False ); + aRet <<= getCommandInfo( Environment, false ); } else if ( aCommand.Name == "open" ) { @@ -565,7 +565,7 @@ uno::Any SAL_CALL Content::execute( destroy( bDeletePhysical ); // Remove own and all children's Additional Core Properties. - removeAdditionalPropertySet( sal_True ); + removeAdditionalPropertySet( true ); } else if ( aCommand.Name == "transfer" && isFolder( Environment ) ) { @@ -801,7 +801,7 @@ void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg, aCmdArg.Property.Name, aSpecialName ); // Note: This requires network access! - if ( getPropertySetInfo( xEnv, sal_False /* don't cache data */ ) + if ( getPropertySetInfo( xEnv, false /* don't cache data */ ) ->hasPropertyByName( bIsSpecial ? aSpecialName : aCmdArg.Property.Name ) ) { @@ -1179,7 +1179,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xAdditionalPropSet = uno::Reference< beans::XPropertySet >( rProvider->getAdditionalPropertySet( rContentId, - sal_False ), + false ), uno::UNO_QUERY ); bTriedToGetAdditionalPropSet = sal_True; } @@ -1218,7 +1218,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all local Additional Properties. uno::Reference< beans::XPropertySet > xSet( - rProvider->getAdditionalPropertySet( rContentId, sal_False ), + rProvider->getAdditionalPropertySet( rContentId, false ), uno::UNO_QUERY ); xRow->appendPropertySet( xSet ); } @@ -1689,7 +1689,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( !xInfo.is() ) xInfo = getPropertySetInfo( xEnv, - sal_False /* don't cache data */ ); + false /* don't cache data */ ); if ( !xInfo->hasPropertyByName( bIsSpecial ? aSpecialName : rName ) ) @@ -1758,7 +1758,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( !xAdditionalPropSet.is() ) { xAdditionalPropSet - = getAdditionalPropertySet( sal_False ); + = getAdditionalPropertySet( false ); bTriedToGetAdditionalPropSet = sal_True; } diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index 2bca85f3f0cd..f27bb81924d0 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -230,14 +230,14 @@ 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; } // Obtain values... @@ -246,11 +246,11 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) if ( m_pImpl->m_aResults.size() > nIndex ) { // Result already present. - return sal_True; + return true; } } - return sal_False; + return false; } //========================================================================= @@ -272,7 +272,7 @@ sal_uInt32 DataSupplier::currentCount() //========================================================================= // virtual -sal_Bool DataSupplier::isCountFinal() +bool DataSupplier::isCountFinal() { return m_pImpl->m_bCountFinal; } diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index a48b6b6c606c..5db691850a3f 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -62,11 +62,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 ); -- cgit