[Libreoffice-commits] core.git: ucb/source
Matúš Kukan
matus.kukan at collabora.com
Tue Mar 18 23:41:35 PDT 2014
ucb/source/ucp/webdav/ContentProperties.cxx | 36 +++---
ucb/source/ucp/webdav/ContentProperties.hxx | 2
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx | 2
ucb/source/ucp/webdav/SerfSession.cxx | 2
ucb/source/ucp/webdav/SerfSession.hxx | 2
ucb/source/ucp/webdav/webdavcontent.cxx | 118 ++++++++++-----------
ucb/source/ucp/webdav/webdavcontent.hxx | 14 +-
7 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit 26b4c8e5f13350c47e98bd78ba5494f117629e05
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Wed Mar 19 07:39:53 2014 +0100
webdav: loplugin warnings and sal_Bool -> bool
Change-Id: I0f1797aa03868e7652a0f90a5cf72ba851537b41
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index 6d09c5f..0d5e074 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -113,27 +113,27 @@ ContentProperties::ContentProperties( const DAVResource& rResource )
}
if ( rResource.uri.endsWith("/") )
- m_bTrailingSlash = sal_True;
+ m_bTrailingSlash = true;
}
ContentProperties::ContentProperties(
- const OUString & rTitle, sal_Bool bFolder )
+ const OUString & rTitle, bool bFolder )
: m_xProps( new PropertyValueMap ),
- m_bTrailingSlash( sal_False )
+ m_bTrailingSlash( false )
{
(*m_xProps)[ OUString( "Title" ) ]
= PropertyValue( uno::makeAny( rTitle ), true );
(*m_xProps)[ OUString( "IsFolder" ) ]
= PropertyValue( uno::makeAny( bFolder ), true );
(*m_xProps)[ OUString( "IsDocument" ) ]
- = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true );
+ = PropertyValue( uno::makeAny( bool( !bFolder ) ), true );
}
ContentProperties::ContentProperties( const OUString & rTitle )
: m_xProps( new PropertyValueMap ),
- m_bTrailingSlash( sal_False )
+ m_bTrailingSlash( false )
{
(*m_xProps)[ OUString( "Title" ) ]
= PropertyValue( uno::makeAny( rTitle ), true );
@@ -142,7 +142,7 @@ ContentProperties::ContentProperties( const OUString & rTitle )
ContentProperties::ContentProperties()
: m_xProps( new PropertyValueMap ),
- m_bTrailingSlash( sal_False )
+ m_bTrailingSlash( false )
{
}
@@ -219,11 +219,11 @@ void ContentProperties::UCBNamesToDAVNames(
// resourcetype <- IsFolder, IsDocument, ContentType
// (taken from URI) <- Title
- sal_Bool bCreationDate = sal_False;
- sal_Bool bLastModified = sal_False;
- sal_Bool bContentType = sal_False;
- sal_Bool bContentLength = sal_False;
- sal_Bool bResourceType = sal_False;
+ bool bCreationDate = false;
+ bool bLastModified = false;
+ bool bContentType = false;
+ bool bContentLength = false;
+ bool bResourceType = false;
sal_Int32 nCount = rProps.getLength();
for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -241,7 +241,7 @@ void ContentProperties::UCBNamesToDAVNames(
if ( !bCreationDate )
{
propertyNames.push_back( DAVProperties::CREATIONDATE );
- bCreationDate = sal_True;
+ bCreationDate = true;
}
}
else if ( rProp.Name == "DateModified" ||
@@ -251,7 +251,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames.push_back(
DAVProperties::GETLASTMODIFIED );
- bLastModified = sal_True;
+ bLastModified = true;
}
}
else if ( rProp.Name == "MediaType" ||
@@ -261,7 +261,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames.push_back(
DAVProperties::GETCONTENTTYPE );
- bContentType = sal_True;
+ bContentType = true;
}
}
else if ( rProp.Name == "Size" ||
@@ -271,7 +271,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames.push_back(
DAVProperties::GETCONTENTLENGTH );
- bContentLength = sal_True;
+ bContentLength = true;
}
}
else if ( rProp.Name == "ContentType" ||
@@ -282,7 +282,7 @@ void ContentProperties::UCBNamesToDAVNames(
if ( !bResourceType )
{
propertyNames.push_back( DAVProperties::RESOURCETYPE );
- bResourceType = sal_True;
+ bResourceType = true;
}
}
else
@@ -514,13 +514,13 @@ void ContentProperties::addProperty( const OUString & rName,
rValue >>= aValue;
// Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
- sal_Bool bFolder =
+ bool bFolder =
aValue.equalsIgnoreAsciiCase( "collection" );
(*m_xProps)[ OUString( "IsFolder" ) ]
= PropertyValue( uno::makeAny( bFolder ), true );
(*m_xProps)[ OUString( "IsDocument" ) ]
- = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true );
+ = PropertyValue( uno::makeAny( bool( !bFolder ) ), true );
(*m_xProps)[ OUString( "ContentType" ) ]
= PropertyValue( uno::makeAny( bFolder
? OUString( WEBDAV_COLLECTION_TYPE )
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index d71e80b..0a1667b 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -102,7 +102,7 @@ public:
ContentProperties( const DAVResource& rResource );
// Mini props for transient contents.
- ContentProperties( const OUString & rTitle, sal_Bool bFolder );
+ ContentProperties( const OUString & rTitle, bool bFolder );
// Micro props for non-existing contents.
ContentProperties( const OUString & rTitle );
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
index 0c89790..30a62b8 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
@@ -119,7 +119,7 @@ bool SerfRequestProcessorImpl::processSerfResponseBucket( serf_request_t * /*inS
const char* data;
apr_size_t len;
- while (1) {
+ while (true) {
outStatus = serf_bucket_read(inSerfResponseBucket, 8096, &data, &len);
if (SERF_BUCKET_READ_ERROR(outStatus))
{
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index c7c540f..e4c600f 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1559,7 +1559,7 @@ SerfSession::getDataFromInputStream(
sal_Bool
-SerfSession::isDomainMatch( OUString certHostName )
+SerfSession::isDomainMatch( const OUString & certHostName )
{
OUString hostName = getHostName();
diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx
index b6cc98f..b2642b1 100644
--- a/ucb/source/ucp/webdav/SerfSession.hxx
+++ b/ucb/source/ucp/webdav/SerfSession.hxx
@@ -250,7 +250,7 @@ public:
const OUString & getHostName() const { return m_aUri.GetHost(); }
int getPort() const { return m_aUri.GetPort(); }
- sal_Bool isDomainMatch( OUString certHostName );
+ sal_Bool isDomainMatch( const OUString & certHostName );
private:
friend class SerfLockStore;
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index d238114..b705822 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -233,7 +233,7 @@ Content::Content(
ContentProvider* pProvider,
const uno::Reference< ucb::XContentIdentifier >& Identifier,
rtl::Reference< DAVSessionFactory > const & rSessionFactory,
- sal_Bool isCollection )
+ bool isCollection )
throw ( ucb::ContentCreationException )
: ContentImplHelper( rxContext, pProvider, Identifier ),
m_eResourceType( UNKNOWN ),
@@ -343,7 +343,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
throw( uno::RuntimeException, std::exception )
{
- sal_Bool bFolder = sal_False;
+ bool bFolder = false;
try
{
bFolder
@@ -461,7 +461,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
OUString SAL_CALL Content::getContentType()
throw( uno::RuntimeException )
{
- sal_Bool bFolder = sal_False;
+ bool bFolder = false;
try
{
bFolder
@@ -560,7 +560,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" )
{
@@ -569,7 +569,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" )
{
@@ -617,7 +617,7 @@ uno::Any SAL_CALL Content::execute(
// delete
- sal_Bool bDeletePhysical = sal_False;
+ bool bDeletePhysical = false;
aCommand.Argument >>= bDeletePhysical;
// KSO: Ignore parameter and destroy the content, if you don't support
@@ -640,7 +640,7 @@ uno::Any SAL_CALL Content::execute(
}
catch ( DAVException const & e )
{
- cancelCommandExecution( e, Environment, sal_True );
+ cancelCommandExecution( e, Environment, true );
// Unreachable
}
// }
@@ -649,7 +649,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 ) )
{
@@ -881,7 +881,7 @@ throw( beans::PropertyExistException,
bool bIsSpecial = DAVProperties::isUCBSpecialProperty( aProperty.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 : aProperty.Name ) )
{
// Property does already exist.
@@ -985,7 +985,7 @@ throw( beans::UnknownPropertyException,
try
{
beans::Property aProp
- = getPropertySetInfo( xEnv, sal_False /* don't cache data */ )
+ = getPropertySetInfo( xEnv, false /* don't cache data */ )
->getPropertyByName( Name );
if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVABLE ) )
@@ -1176,16 +1176,16 @@ Content::createNewContent( const ucb::ContentInfo& Info )
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
aURL += "/";
- sal_Bool isCollection;
+ bool isCollection;
if ( Info.Type == WEBDAV_COLLECTION_TYPE )
{
aURL += "New_Collection";
- isCollection = sal_True;
+ isCollection = true;
}
else
{
aURL += "New_Content";
- isCollection = sal_False;
+ isCollection = false;
}
uno::Reference< ucb::XContentIdentifier > xId(
@@ -1259,7 +1259,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( nCount )
{
uno::Reference< beans::XPropertySet > xAdditionalPropSet;
- sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+ bool bTriedToGetAdditionalPropSet = false;
const beans::Property* pProps = rProperties.getConstArray();
for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -1280,9 +1280,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xAdditionalPropSet
= uno::Reference< beans::XPropertySet >(
rProvider->getAdditionalPropertySet( rContentId,
- sal_False ),
+ false ),
uno::UNO_QUERY );
- bTriedToGetAdditionalPropSet = sal_True;
+ bTriedToGetAdditionalPropSet = true;
}
if ( !xAdditionalPropSet.is() ||
@@ -1318,7 +1318,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 );
}
@@ -1635,7 +1635,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else if ( rName == "CreatableContentsInfo" )
{
// Add CreatableContentsInfo property, if requested.
- sal_Bool bFolder = sal_False;
+ bool bFolder = false;
xProps->getValue(
OUString( "IsFolder" ) )
>>= bFolder;
@@ -1678,7 +1678,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
uno::Reference< ucb::XContentIdentifier > xIdentifier;
rtl::Reference< ContentProvider > xProvider;
- sal_Bool bTransient;
+ bool bTransient;
boost::scoped_ptr< DAVResourceAccess > xResAccess;
{
@@ -1696,7 +1696,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
beans::PropertyChangeEvent aEvent;
aEvent.Source = static_cast< cppu::OWeakObject * >( this );
- aEvent.Further = sal_False;
+ aEvent.Further = false;
// aEvent.PropertyName =
aEvent.PropertyHandle = -1;
// aEvent.OldValue =
@@ -1706,9 +1706,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
std::vector< sal_Int32 > aProppatchPropsPositions;
uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet;
- sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+ bool bTriedToGetAdditionalPropSet = false;
- sal_Bool bExchange = sal_False;
+ bool bExchange = false;
OUString aNewTitle;
OUString aOldTitle;
sal_Int32 nTitlePos = -1;
@@ -1776,7 +1776,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// modified title -> modified URL -> exchange !
if ( !bTransient )
- bExchange = sal_True;
+ bExchange = true;
// new value will be set later...
aNewTitle = aNewValue;
@@ -1820,7 +1820,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 ) )
{
@@ -1888,8 +1888,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
!xAdditionalPropSet.is() )
{
xAdditionalPropSet
- = getAdditionalPropertySet( sal_False );
- bTriedToGetAdditionalPropSet = sal_True;
+ = getAdditionalPropertySet( false );
+ bTriedToGetAdditionalPropSet = true;
}
if ( xAdditionalPropSet.is() )
@@ -1982,7 +1982,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
while ( it != end )
{
// Set error.
- aRet[ (*it) ] <<= MapDAVException( e, sal_True );
+ aRet[ (*it) ] <<= MapDAVException( e, true );
++it;
}
#endif
@@ -2010,7 +2010,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
targetURI.SetScheme( sourceURI.GetScheme() );
xResAccess->MOVE(
- sourceURI.GetPath(), targetURI.GetURI(), sal_False, xEnv );
+ sourceURI.GetPath(), targetURI.GetURI(), false, xEnv );
// @@@ Should check for resources that could not be moved
// (due to source access or target overwrite) and send
// this information through the interaction handler.
@@ -2029,7 +2029,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
// // Adapt Additional Core Properties.
// renameAdditionalPropertySet( xOldId->getContentIdentifier(),
// xNewId->getContentIdentifier(),
-// sal_True );
+// true );
}
else
{
@@ -2048,7 +2048,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
aNewTitle = OUString();
// Set error .
- aRet[ nTitlePos ] <<= MapDAVException( e, sal_True );
+ aRet[ nTitlePos ] <<= MapDAVException( e, true );
}
}
@@ -2088,7 +2088,7 @@ uno::Any Content::open(
{
uno::Any aRet;
- sal_Bool bOpenFolder = ( ( rArg.Mode == ucb::OpenMode::ALL ) ||
+ bool bOpenFolder = ( ( rArg.Mode == ucb::OpenMode::ALL ) ||
( rArg.Mode == ucb::OpenMode::FOLDERS ) ||
( rArg.Mode == ucb::OpenMode::DOCUMENTS ) );
if ( bOpenFolder )
@@ -2283,7 +2283,7 @@ void Content::post(
}
catch ( DAVException const & e )
{
- cancelCommandExecution( e, xEnv, sal_True );
+ cancelCommandExecution( e, xEnv, true );
// Unreachable
}
}
@@ -2315,7 +2315,7 @@ void Content::post(
}
catch ( DAVException const & e )
{
- cancelCommandExecution( e, xEnv, sal_True );
+ cancelCommandExecution( e, xEnv, true );
// Unreachable
}
}
@@ -2387,11 +2387,11 @@ void Content::queryChildren( ContentRefList& rChildren )
void Content::insert(
const uno::Reference< io::XInputStream > & xInputStream,
- sal_Bool bReplaceExisting,
+ bool bReplaceExisting,
const uno::Reference< ucb::XCommandEnvironment >& Environment )
throw( uno::Exception )
{
- sal_Bool bTransient, bCollection;
+ bool bTransient, bCollection;
OUString aEscapedTitle;
boost::scoped_ptr< DAVResourceAccess > xResAccess;
@@ -2474,7 +2474,7 @@ void Content::insert(
case ucbhelper::CONTINUATION_APPROVE:
// Continue -> Overwrite.
- bReplaceExisting = sal_True;
+ bReplaceExisting = true;
break;
case ucbhelper::CONTINUATION_DISAPPROVE:
@@ -2541,7 +2541,7 @@ void Content::insert(
}
catch ( DAVException const & e )
{
- cancelCommandExecution( e, Environment, sal_True );
+ cancelCommandExecution( e, Environment, true );
// Unreachable
}
@@ -2582,7 +2582,7 @@ void Content::insert(
}
}
- cancelCommandExecution( except, Environment, sal_True );
+ cancelCommandExecution( except, Environment, true );
// Unreachable
}
@@ -2596,7 +2596,7 @@ void Content::insert(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_bTransient = sal_False;
+ m_bTransient = false;
}
}
else
@@ -2618,7 +2618,7 @@ void Content::insert(
}
catch ( DAVException const & e )
{
- cancelCommandExecution( e, Environment, sal_True );
+ cancelCommandExecution( e, Environment, true );
// Unreachable
}
}
@@ -2766,14 +2766,14 @@ void Content::transfer(
if ( xSource.is() )
{
// Propagate destruction to listeners.
- xSource->destroy( sal_True );
+ xSource->destroy( true );
}
// DAV resources store all additional props on server!
// // Rename own and all children's Additional Core Properties.
// renameAdditionalPropertySet( xId->getContentIdentifier(),
// xTargetId->getContentIdentifier(),
-// sal_True );
+// true );
}
else
{
@@ -2794,7 +2794,7 @@ void Content::transfer(
// // Copy own and all children's Additional Core Properties.
// copyAdditionalPropertySet( xId->getContentIdentifier(),
// xTargetId->getContentIdentifier(),
-// sal_True );
+// true );
}
// Note: The static cast is okay here, because its sure that
@@ -2855,7 +2855,7 @@ void Content::transfer(
}
}
- cancelCommandExecution( e, Environment, sal_True );
+ cancelCommandExecution( e, Environment, true );
// Unreachable
}
@@ -2866,7 +2866,7 @@ void Content::transfer(
}
-void Content::destroy( sal_Bool bDeletePhysical )
+void Content::destroy( bool bDeletePhysical )
throw( uno::Exception )
{
// @@@ take care about bDeletePhysical -> trashcan support
@@ -2952,7 +2952,7 @@ void Content::lock(
}
catch ( DAVException const & e )
{
- cancelCommandExecution( e, Environment, sal_False );
+ cancelCommandExecution( e, Environment, false );
// Unreachable
}
}
@@ -2979,17 +2979,17 @@ void Content::unlock(
}
catch ( DAVException const & e )
{
- cancelCommandExecution( e, Environment, sal_False );
+ cancelCommandExecution( e, Environment, false );
// Unreachable
}
}
-sal_Bool Content::exchangeIdentity(
+bool Content::exchangeIdentity(
const uno::Reference< ucb::XContentIdentifier >& xNewId )
{
if ( !xNewId.is() )
- return sal_False;
+ return false;
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
@@ -2999,7 +2999,7 @@ sal_Bool Content::exchangeIdentity(
if ( m_bTransient )
{
SAL_WARN( "ucb.ucp.webdav", "Content::exchangeIdentity - Not persistent!" );
- return sal_False;
+ return false;
}
// Exchange own identitity.
@@ -3038,22 +3038,22 @@ sal_Bool Content::exchangeIdentity(
= new ::ucbhelper::ContentIdentifier( aNewChildURL );
if ( !xChild->exchangeIdentity( xNewChildId ) )
- return sal_False;
+ return false;
++it;
}
- return sal_True;
+ return true;
}
}
SAL_WARN( "ucb.ucp.webdav",
"Content::exchangeIdentity - "
"Panic! Cannot exchange identity!" );
- return sal_False;
+ return false;
}
-sal_Bool Content::isFolder(
+bool Content::isFolder(
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw( uno::Exception )
{
@@ -3079,11 +3079,11 @@ sal_Bool Content::isFolder(
}
}
- return sal_False;
+ return false;
}
-uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
+uno::Any Content::MapDAVException( const DAVException & e, bool bWrite )
{
// Map DAVException...
uno::Any aException;
@@ -3200,7 +3200,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
static_cast< cppu::OWeakObject * >( this ),
task::InteractionClassification_ERROR,
aURL,
- sal_False ); // not SelfOwned
+ false ); // not SelfOwned
#else
{
uno::Sequence< uno::Any > aArgs( 1 );
@@ -3227,7 +3227,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
static_cast< cppu::OWeakObject * >( this ),
task::InteractionClassification_ERROR,
aURL,
- sal_True ); // SelfOwned
+ true ); // SelfOwned
break;
case DAVException::DAV_NOT_LOCKED:
@@ -3278,7 +3278,7 @@ bool Content::shouldAccessNetworkAfterException( const DAVException & e )
void Content::cancelCommandExecution(
const DAVException & e,
const uno::Reference< ucb::XCommandEnvironment > & xEnv,
- sal_Bool bWrite /* = sal_False */ )
+ bool bWrite /* = false */ )
throw ( uno::Exception )
{
ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv );
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 58f7477..6b4d07b 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -95,7 +95,7 @@ private:
com::sun::star::ucb::XCommandEnvironment > & xEnv );
virtual OUString getParentURL();
- sal_Bool isFolder( const ::com::sun::star::uno::Reference<
+ bool isFolder( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv )
throw ( ::com::sun::star::uno::Exception );
@@ -117,7 +117,7 @@ private:
typedef std::list< ContentRef > ContentRefList;
void queryChildren( ContentRefList& rChildren);
- sal_Bool
+ bool
exchangeIdentity( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& xNewId );
@@ -151,7 +151,7 @@ private:
// Command "insert"
void insert( const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > & xInputStream,
- sal_Bool bReplaceExisting,
+ bool bReplaceExisting,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment >& Environment )
throw( ::com::sun::star::uno::Exception );
@@ -163,7 +163,7 @@ private:
throw( ::com::sun::star::uno::Exception );
// Command "delete"
- void destroy( sal_Bool bDeletePhysical )
+ void destroy( bool bDeletePhysical )
throw( ::com::sun::star::uno::Exception );
// Command "lock"
@@ -177,12 +177,12 @@ private:
throw( ::com::sun::star::uno::Exception );
::com::sun::star::uno::Any MapDAVException( const DAVException & e,
- sal_Bool bWrite );
+ bool bWrite );
void cancelCommandExecution(
const DAVException & e,
const ::com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv,
- sal_Bool bWrite = sal_False )
+ bool bWrite = false )
throw( ::com::sun::star::uno::Exception );
static bool shouldAccessNetworkAfterException( const DAVException & e );
@@ -220,7 +220,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier,
rtl::Reference< DAVSessionFactory > const & rSessionFactory,
- sal_Bool isCollection )
+ bool isCollection )
throw ( ::com::sun::star::ucb::ContentCreationException );
virtual ~Content();
More information about the Libreoffice-commits
mailing list