diff options
Diffstat (limited to 'ucb/source/ucp/package')
-rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgdatasupplier.cxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgdatasupplier.hxx | 4 |
3 files changed, 14 insertions, 14 deletions
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 ); |