mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ucbhelper: sal_Bool -> bool

Browse Source 
Change-Id: Iee327c3dd75bebb35d99de01eaa7103956e08974
This commit is contained in:
Stephan Bergmann 2014-02-16 22:50:50 +01:00
parent 7f902e1697
commit faced6b5f7
53 changed files with 413 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comphelper/source/misc/stillreadwriteinteraction.cxx
View File

@ -38,13 +38,13 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference<
aInterceptedRequest.Handle = HANDLE_INTERACTIVEIOEXCEPTION;
aInterceptedRequest.Request <<= css::ucb::InteractiveIOException();
aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
aInterceptedRequest.MatchExact = sal_False;
aInterceptedRequest.MatchExact = false;
lInterceptions.push_back(aInterceptedRequest);
aInterceptedRequest.Handle = HANDLE_UNSUPPORTEDDATASINKEXCEPTION;
aInterceptedRequest.Request <<= css::ucb::UnsupportedDataSinkException();
aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
aInterceptedRequest.MatchExact = sal_False;
aInterceptedRequest.MatchExact = false;
lInterceptions.push_back(aInterceptedRequest);
setInterceptedHandler(xHandler);

12
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
View File

@ -194,25 +194,25 @@ DataSupplier::queryContent( sal_uInt32 _nIndex )
return Reference< XContent >();
}
sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
bool DataSupplier::getResult( sal_uInt32 nIndex )
{
osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
if ( (size_t)nIndex < m_pImpl->m_aResults.size() )
{
// 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;
// @@@ Obtain data and put it into result list...
@ -229,7 +229,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
if ( nPos == nIndex )
{
// Result obtained.
bFound = sal_True;
bFound = true;
break;
}
}
@ -295,7 +295,7 @@ sal_uInt32 DataSupplier::currentCount()
return m_pImpl->m_aResults.size();
}
sal_Bool DataSupplier::isCountFinal()
bool DataSupplier::isCountFinal()
{
return m_pImpl->m_bCountFinal;
}

4
dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
View File

@ -45,11 +45,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 );

2
forms/source/xforms/submission/submission_put.cxx
View File

@ -52,7 +52,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference<
// insert serialized data to content -> PUT
CSS::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream();
aContent.writeStream(aInStream, sal_True);
aContent.writeStream(aInStream, true);
//aContent.closeStream();
// no content as a result of put...

18
include/ucbhelper/content.hxx
View File

@ -177,7 +177,7 @@ public:
* @param rContent will be filled by this method with the content created.
* @return true, if the operation was successful - false, otherwise.
*/
static sal_Bool
static bool
create( const OUString& rURL,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& rEnv,
@ -520,7 +520,7 @@ public:
* @param rSink is the implementation of an XActiveDataSink interface,
* which shall be used by the content to deliver the data.
*/
sal_Bool
bool
openStream( const ::com::sun::star::uno::Reference<
::com::sun::star::io::XActiveDataSink >& rSink )
throw( ::com::sun::star::ucb::CommandAbortedException,
@ -534,7 +534,7 @@ public:
* @param rStream is the implementation of an XOutputStream interface,
* which shall be used by the content to deliver the data.
*/
sal_Bool
bool
openStream( const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream >& rStream )
throw( ::com::sun::star::ucb::CommandAbortedException,
@ -553,7 +553,7 @@ public:
void
writeStream( const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& rStream,
sal_Bool bReplaceExisting )
bool bReplaceExisting )
throw( ::com::sun::star::ucb::CommandAbortedException,
::com::sun::star::uno::RuntimeException,
::com::sun::star::uno::Exception );
@ -594,7 +594,7 @@ public:
* @param rNewContent will be filled by the implementation of this method
* with the new content.
*/
sal_Bool
bool
insertNewContent( const OUString& rContentType,
const ::com::sun::star::uno::Sequence<
OUString >& rPropertyNames,
@ -630,7 +630,7 @@ public:
* @param rNewContent will be filled by the implementation of this method
* with the new content.
*/
sal_Bool
bool
insertNewContent( const OUString& rContentType,
const ::com::sun::star::uno::Sequence<
OUString >& rPropertyNames,
@ -672,7 +672,7 @@ public:
* case there was a change (introduced for the checkin operation)
* @param rDocumentId is the document Id ( in case of CMIS ).
*/
sal_Bool
bool
transferContent( const Content& rSourceContent,
InsertOperation eOperation,
const OUString & rTitle,
@ -696,7 +696,7 @@ public:
* @return true, if the content is a folder ( it can contain other
* UCB contents). false, otherwise.
*/
sal_Bool
bool
isFolder()
throw( ::com::sun::star::ucb::CommandAbortedException,
::com::sun::star::uno::RuntimeException,
@ -707,7 +707,7 @@ public:
* @return true, if the content is a document ( it has a content stream ).
* false, otherwise.
*/
sal_Bool
bool
isDocument()
throw( ::com::sun::star::ucb::CommandAbortedException,
::com::sun::star::uno::RuntimeException,

18
include/ucbhelper/contenthelper.hxx
View File

@ -166,7 +166,7 @@ protected:
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
getPropertySetInfo( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv,
sal_Bool bCache = sal_True );
bool bCache = true );
/**
* This method returns complete meta data for the commands supported by
@ -182,7 +182,7 @@ protected:
com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo >
getCommandInfo( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv,
sal_Bool bCache = sal_True );
bool bCache = true );
/**
* This method can be used to propagate changes of property values.
@ -238,7 +238,7 @@ protected:
* @param rNewId is the new content identifier for the contant.
* @return a success indicator.
*/
sal_Bool exchange( const com::sun::star::uno::Reference<
bool exchange( const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >& rNewId );
/**
@ -254,7 +254,7 @@ protected:
*/
com::sun::star::uno::Reference<
com::sun::star::ucb::XPersistentPropertySet >
getAdditionalPropertySet( sal_Bool bCreate );
getAdditionalPropertySet( bool bCreate );
/**
* This method renames the propertyset containing the Additional Core
@ -266,9 +266,9 @@ protected:
* children described by rOldKey shall be renamed too.
* @return True, if the operation succeeded - False, otherwise.
*/
sal_Bool renameAdditionalPropertySet( const OUString& rOldKey,
bool renameAdditionalPropertySet( const OUString& rOldKey,
const OUString& rNewKey,
sal_Bool bRecursive );
bool bRecursive );
/**
* This method copies the propertyset containing the Additional Core
@ -280,9 +280,9 @@ protected:
* children described by rSourceKey shall be copied too.
* @return True, if the operation succeeded - False, otherwise.
*/
sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey,
bool copyAdditionalPropertySet( const OUString& rSourceKey,
const OUString& rTargetKey,
sal_Bool bRecursive );
bool bRecursive );
/**
* This method removes the propertyset containing the Additional Core
@ -292,7 +292,7 @@ protected:
* children described by rOldKey shall be removed too.
* @return True, if the operation succeeded - False, otherwise.
*/
sal_Bool removeAdditionalPropertySet( sal_Bool bRecursive );
bool removeAdditionalPropertySet( bool bRecursive );
public:
/**

6
include/ucbhelper/contentinfo.hxx
View File

@ -58,7 +58,7 @@ class PropertySetInfo :
ContentImplHelper* m_pContent;
private:
sal_Bool queryProperty( const OUString& rName,
bool queryProperty( const OUString& rName,
com::sun::star::beans::Property& rProp );
public:
@ -114,9 +114,9 @@ class CommandProcessorInfo :
ContentImplHelper* m_pContent;
private:
sal_Bool queryCommand( const OUString& rName,
bool queryCommand( const OUString& rName,
com::sun::star::ucb::CommandInfo& rCommand );
sal_Bool queryCommand( sal_Int32 nHandle,
bool queryCommand( sal_Int32 nHandle,
com::sun::star::ucb::CommandInfo& rCommand );
public:

64
include/ucbhelper/interactionrequest.hxx
View File

@ -345,13 +345,13 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
com::sun::star::ucb::RememberAuthentication m_eDefaultRememberPasswordMode;
com::sun::star::ucb::RememberAuthentication m_eRememberAccountMode;
com::sun::star::ucb::RememberAuthentication m_eDefaultRememberAccountMode;
unsigned m_bCanSetRealm : 1;
unsigned m_bCanSetUserName : 1;
unsigned m_bCanSetPassword : 1;
unsigned m_bCanSetAccount : 1;
unsigned m_bCanUseSystemCredentials : 1;
unsigned m_bDefaultUseSystemCredentials : 1;
unsigned m_bUseSystemCredentials : 1;
bool m_bCanSetRealm : 1;
bool m_bCanSetUserName : 1;
bool m_bCanSetPassword : 1;
bool m_bCanSetAccount : 1;
bool m_bCanUseSystemCredentials : 1;
bool m_bDefaultUseSystemCredentials : 1;
bool m_bUseSystemCredentials : 1;
public:
/**
@ -371,10 +371,10 @@ public:
*/
inline InteractionSupplyAuthentication(
InteractionRequest * pRequest,
sal_Bool bCanSetRealm,
sal_Bool bCanSetUserName,
sal_Bool bCanSetPassword,
sal_Bool bCanSetAccount);
bool bCanSetRealm,
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount);
/**
* Constructor.
*
@ -411,10 +411,10 @@ public:
*/
inline InteractionSupplyAuthentication(
InteractionRequest * pRequest,
sal_Bool bCanSetRealm,
sal_Bool bCanSetUserName,
sal_Bool bCanSetPassword,
sal_Bool bCanSetAccount,
bool bCanSetRealm,
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount,
const com::sun::star::uno::Sequence<
com::sun::star::ucb::RememberAuthentication > &
rRememberPasswordModes,
@ -425,8 +425,8 @@ public:
rRememberAccountModes,
const com::sun::star::ucb::RememberAuthentication
eDefaultRememberAccountMode,
sal_Bool bCanUseSystemCredentials,
sal_Bool bDefaultUseSystemCredentials );
bool bCanUseSystemCredentials,
bool bDefaultUseSystemCredentials );
// XInterface
virtual com::sun::star::uno::Any SAL_CALL
@ -554,16 +554,16 @@ public:
const com::sun::star::ucb::RememberAuthentication &
getRememberAccountMode() const { return m_eRememberAccountMode; }
sal_Bool getUseSystemCredentials() const { return m_bUseSystemCredentials; }
bool getUseSystemCredentials() const { return m_bUseSystemCredentials; }
};
//============================================================================
inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
InteractionRequest * pRequest,
sal_Bool bCanSetRealm,
sal_Bool bCanSetUserName,
sal_Bool bCanSetPassword,
sal_Bool bCanSetAccount )
bool bCanSetRealm,
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount )
: InteractionContinuation( pRequest ),
m_aRememberPasswordModes( com::sun::star::uno::Sequence<
com::sun::star::ucb::RememberAuthentication >( 1 ) ),
@ -579,9 +579,9 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
m_bCanSetUserName( bCanSetUserName ),
m_bCanSetPassword( bCanSetPassword ),
m_bCanSetAccount( bCanSetAccount ),
m_bCanUseSystemCredentials( sal_False ),
m_bDefaultUseSystemCredentials( sal_False ),
m_bUseSystemCredentials( sal_False )
m_bCanUseSystemCredentials( false ),
m_bDefaultUseSystemCredentials( false ),
m_bUseSystemCredentials( false )
{
m_aRememberPasswordModes[ 0 ]
= com::sun::star::ucb::RememberAuthentication_NO;
@ -592,10 +592,10 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
//============================================================================
inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
InteractionRequest * pRequest,
sal_Bool bCanSetRealm,
sal_Bool bCanSetUserName,
sal_Bool bCanSetPassword,
sal_Bool bCanSetAccount,
bool bCanSetRealm,
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount,
const com::sun::star::uno::Sequence<
com::sun::star::ucb::RememberAuthentication > & rRememberPasswordModes,
const com::sun::star::ucb::RememberAuthentication
@ -604,8 +604,8 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
com::sun::star::ucb::RememberAuthentication > & rRememberAccountModes,
const com::sun::star::ucb::RememberAuthentication
eDefaultRememberAccountMode,
sal_Bool bCanUseSystemCredentials,
sal_Bool bDefaultUseSystemCredentials )
bool bCanUseSystemCredentials,
bool bDefaultUseSystemCredentials )
: InteractionContinuation( pRequest ),
m_aRememberPasswordModes( rRememberPasswordModes ),
m_aRememberAccountModes( rRememberAccountModes ),
@ -619,7 +619,7 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
m_bCanSetAccount( bCanSetAccount ),
m_bCanUseSystemCredentials( bCanUseSystemCredentials ),
m_bDefaultUseSystemCredentials( bDefaultUseSystemCredentials ),
m_bUseSystemCredentials( bDefaultUseSystemCredentials & bCanUseSystemCredentials )
m_bUseSystemCredentials( bDefaultUseSystemCredentials && bCanUseSystemCredentials )
{
}

6
include/ucbhelper/interceptedinteraction.hxx
View File

@ -78,7 +78,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@attention This parameter does not influence the check of the continuation
type! The continuation must be matched exactly every time ...
*/
sal_Bool MatchExact;
bool MatchExact;
//-----------------------------------
/** @short its an unique identifier, which must be managed by the outside code.
@ -98,7 +98,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
*/
InterceptedRequest()
{
MatchExact = sal_False;
MatchExact = false;
Handle = INVALID_HANDLE;
}
@ -124,7 +124,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
InterceptedRequest( sal_Int32 nHandle ,
const ::com::sun::star::uno::Any& aRequest ,
const ::com::sun::star::uno::Type& aContinuation,
sal_Bool bMatchExact )
bool bMatchExact )
{
Handle = nHandle;
Request = aRequest;

12
include/ucbhelper/propertyvalueset.hxx
View File

@ -64,8 +64,8 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet :
m_xTypeConverter;
osl::Mutex m_aMutex;
PropertyValues* m_pValues;
sal_Bool m_bWasNull;
sal_Bool m_bTriedToGetTypeConverter;
bool m_bWasNull;
bool m_bTriedToGetTypeConverter;
private:
UCBHELPER_DLLPRIVATE const com::sun::star::uno::Reference<
@ -194,12 +194,12 @@ public:
appendString( rProp.Name, rValue );
}
void appendBoolean( const OUString& rPropName, sal_Bool bValue );
void appendBoolean( const sal_Char* pAsciiPropName, sal_Bool bValue )
void appendBoolean( const OUString& rPropName, bool bValue );
void appendBoolean( const sal_Char* pAsciiPropName, bool bValue )
{
appendBoolean( OUString::createFromAscii( pAsciiPropName ), bValue );
}
void appendBoolean( const ::com::sun::star::beans::Property& rProp, sal_Bool bValue )
void appendBoolean( const ::com::sun::star::beans::Property& rProp, bool bValue )
{
appendBoolean( rProp.Name, bValue );
}
@ -262,7 +262,7 @@ public:
* @return False, if the property value cannot be obtained from the
* given property pet. True, otherwise.
*/
sal_Bool appendPropertySetValue(
bool appendPropertySetValue(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& rSet,
const ::com::sun::star::beans::Property& rProperty );

14
include/ucbhelper/providerhelper.hxx
View File

@ -226,7 +226,7 @@ public:
*/
::com::sun::star::uno::Reference<
com::sun::star::ucb::XPersistentPropertySet >
getAdditionalPropertySet( const OUString& rKey, sal_Bool bCreate );
getAdditionalPropertySet( const OUString& rKey, bool bCreate );
/**
* This method renames the propertyset containing the Additional Core
@ -238,9 +238,9 @@ public:
* children described by rOldKey shall be renamed, too.
* @return True, if the operation succeeded - False, otherwise.
*/
sal_Bool renameAdditionalPropertySet( const OUString& rOldKey,
bool renameAdditionalPropertySet( const OUString& rOldKey,
const OUString& rNewKey,
sal_Bool bRecursive );
bool bRecursive );
/**
* This method copies the propertyset containing the Additional Core
@ -252,9 +252,9 @@ public:
* children described by rSourceKey shall be copied, too.
* @return True, if the operation succeeded - False, otherwise.
*/
sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey,
bool copyAdditionalPropertySet( const OUString& rSourceKey,
const OUString& rTargetKey,
sal_Bool bRecursive );
bool bRecursive );
/**
* This method removes the propertyset containing the Additional Core
@ -265,8 +265,8 @@ public:
* children described by rOldKey shall be removed, too.
* @return True, if the operation succeeded - False, otherwise.
*/
sal_Bool removeAdditionalPropertySet( const OUString& rKey,
sal_Bool bRecursive );
bool removeAdditionalPropertySet( const OUString& rKey,
bool bRecursive );
};
} // namespace ucbhelper

4
include/ucbhelper/resultset.hxx
View File

@ -478,7 +478,7 @@ public:
* of the supplier; must be non-negative.
* @return true, if there is a content at the given index.
*/
virtual sal_Bool getResult( sal_uInt32 nIndex ) = 0;
virtual bool getResult( sal_uInt32 nIndex ) = 0;
/**
* This method returns the total count of objects in the logical data array
@ -515,7 +515,7 @@ public:
* @return true, if the value returned by currentCount() won't change
anymore.
*/
virtual sal_Bool isCountFinal() = 0;
virtual bool isCountFinal() = 0;
/**
* This method returns an object for accessing the property values at

8
include/ucbhelper/resultsethelper.hxx
View File

@ -59,8 +59,8 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
public com::sun::star::ucb::XDynamicResultSet
{
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
sal_Bool m_bStatic;
sal_Bool m_bInitDone;
bool m_bStatic;
bool m_bInitDone;
protected:
osl::Mutex m_aMutex;
@ -78,7 +78,7 @@ protected:
com::sun::star::ucb::XDynamicResultSetListener > m_xListener;
private:
UCBHELPER_DLLPRIVATE void init( sal_Bool bStatic );
UCBHELPER_DLLPRIVATE void init( bool bStatic );
/**
* Your implementation of this method has to fill the protected member
@ -194,7 +194,7 @@ public:
*
* @return true, if the resultset type is "static". False, otherwise.
*/
sal_Bool isStatic() const { return m_bStatic; }
bool isStatic() const { return m_bStatic; }
};
}

36
include/ucbhelper/resultsetmetadata.hxx
View File

@ -52,22 +52,22 @@ namespace ucbhelper
struct ResultSetColumnData
{
/** @see ResultSetMetaData::isAutoIncrement */
sal_Bool isAutoIncrement;
bool isAutoIncrement;
/** @see ResultSetMetaData::isCaseSensitive */
sal_Bool isCaseSensitive;
bool isCaseSensitive;
/** @see ResultSetMetaData::isSearchable */
sal_Bool isSearchable;
bool isSearchable;
/** @see ResultSetMetaData::isCurrency */
sal_Bool isCurrency;
bool isCurrency;
/** @see ResultSetMetaData::isNullable */
sal_Int32 isNullable;
/** @see ResultSetMetaData::isSigned */
sal_Bool isSigned;
bool isSigned;
/** @see ResultSetMetaData::getColumnDisplaySize */
sal_Int32 columnDisplaySize;
@ -94,13 +94,13 @@ struct ResultSetColumnData
OUString columnTypeName;
/** @see ResultSetMetaData::isReadOnly */
sal_Bool isReadOnly;
bool isReadOnly;
/** @see ResultSetMetaData::isWritable */
sal_Bool isWritable;
bool isWritable;
/** @see ResultSetMetaData::isDefinitelyWritable */
sal_Bool isDefinitelyWritable;
bool isDefinitelyWritable;
/** @see ResultSetMetaData::getColumnServiceName */
OUString columnServiceName;
@ -112,18 +112,18 @@ struct ResultSetColumnData
// may havily depend on the behaviour of the default constructor.
ResultSetColumnData::ResultSetColumnData()
: isAutoIncrement( sal_False ),
isCaseSensitive( sal_True ),
isSearchable( sal_False ),
isCurrency( sal_False ),
: isAutoIncrement( false ),
isCaseSensitive( true ),
isSearchable( false ),
isCurrency( false ),
isNullable( ::com::sun::star::sdbc::ColumnValue::NULLABLE ),
isSigned( sal_False ),
isSigned( false ),
columnDisplaySize( 16 ),
precision( -1 ),
scale( 0 ),
isReadOnly( sal_True ),
isWritable( sal_False ),
isDefinitelyWritable( sal_False )
isReadOnly( true ),
isWritable( false ),
isDefinitelyWritable( false )
{
}
@ -148,7 +148,7 @@ protected:
::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property > m_aProps;
sal_Bool m_bReadOnly;
bool m_bReadOnly;
public:
@ -166,7 +166,7 @@ public:
::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property >& rProps,
sal_Bool bReadOnly = sal_True );
bool bReadOnly = true );
/**
* Constructor.

16
include/ucbhelper/simpleauthenticationrequest.hxx
View File

@ -56,12 +56,12 @@ class UCBHELPER_DLLPUBLIC SimpleAuthenticationRequest : public ucbhelper::Intera
private:
void initialize( const ::com::sun::star::ucb::URLAuthenticationRequest & rRequest,
sal_Bool bCanSetRealm,
sal_Bool bCanSetUserName,
sal_Bool bCanSetPassword,
sal_Bool bCanSetAccount,
sal_Bool bAllowPersistentStoring,
sal_Bool bAllowUseSystemCredentials );
bool bCanSetRealm,
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount,
bool bAllowPersistentStoring,
bool bAllowUseSystemCredentials );
public:
/** Specification whether some entity (realm, username, password, account)
@ -96,8 +96,8 @@ public:
const OUString & rUserName,
const OUString & rPassword,
const OUString & rAccount,
sal_Bool bAllowPersistentStoring,
sal_Bool bAllowUseSystemCredentials );
bool bAllowPersistentStoring,
bool bAllowUseSystemCredentials );
/**

2
include/ucbhelper/simplenameclashresolverequest.hxx
View File

@ -58,7 +58,7 @@ public:
SimpleNameClashResolveRequest( const OUString & rTargetFolderURL,
const OUString & rClashingName,
const OUString & rProposedNewName,
sal_Bool bSupportsOverwriteData = sal_True );
bool bSupportsOverwriteData = true );
/**
* This method returns the new name that was supplied by the interaction
* handler.

2
package/source/zippackage/ZipPackage.cxx
View File

@ -1318,7 +1318,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
// just try to write an empty stream to it
uno::Reference< XInputStream > xTempIn = new DummyInputStream; //uno::Reference< XInputStream >( xTempOut, UNO_QUERY );
aOriginalContent.writeStream( xTempIn , sal_True );
aOriginalContent.writeStream( xTempIn , true );
}
OpenCommandArgument2 aArg;

12
svl/source/passwordcontainer/passwordcontainer.cxx
View File

@ -1419,16 +1419,16 @@ MasterPasswordRequest_Impl::MasterPasswordRequest_Impl( PasswordRequestMode Mode
m_xAuthSupplier
= new ::ucbhelper::InteractionSupplyAuthentication(
this,
sal_False, // bCanSetRealm
sal_False, // bCanSetUserName
sal_True, // bCanSetPassword
sal_False, // bCanSetAccount
false, // bCanSetRealm
false, // bCanSetUserName
true, // bCanSetPassword
false, // bCanSetAccount
aRememberModes, // rRememberPasswordModes
RememberAuthentication_NO, // eDefaultRememberPasswordMode
aRememberModes, // rRememberAccountModes
RememberAuthentication_NO, // eDefaultRememberAccountMode
sal_False, // bCanUseSystemCredentials
sal_False // bDefaultUseSystemCredentials
false, // bCanUseSystemCredentials
false // bDefaultUseSystemCredentials
);
Sequence<

2
ucb/source/core/FileAccess.cxx
View File

@ -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 & )
{

2
ucb/source/core/ucbcmds.cxx
View File

@ -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() )

18
ucb/source/ucp/cmis/cmis_content.cxx
View File

@ -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;

10
ucb/source/ucp/cmis/cmis_datasupplier.cxx
View File

@ -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;
}

4
ucb/source/ucp/cmis/cmis_datasupplier.hxx
View File

@ -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 );

10
ucb/source/ucp/cmis/cmis_repo_content.cxx
View File

@ -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;

8
ucb/source/ucp/ext/ucpext_content.cxx
View File

@ -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() );

10
ucb/source/ucp/ext/ucpext_datasupplier.cxx
View File

@ -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;
}
//------------------------------------------------------------------------------------------------------------------

4
ucb/source/ucp/ext/ucpext_datasupplier.hxx
View File

@ -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 );

8
ucb/source/ucp/gio/gio_content.cxx
View File

@ -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;

10
ucb/source/ucp/gio/gio_datasupplier.cxx
View File

@ -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;
}

4
ucb/source/ucp/gio/gio_datasupplier.hxx
View File

@ -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 );

12
ucb/source/ucp/hierarchy/hierarchycontent.cxx
View File

@ -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 );
}
}

12
ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
View File

@ -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;
}

4
ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
View File

@ -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 );

12
ucb/source/ucp/package/pkgcontent.cxx
View File

@ -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 );
}
}

12
ucb/source/ucp/package/pkgdatasupplier.cxx
View File

@ -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;
}

4
ucb/source/ucp/package/pkgdatasupplier.hxx
View File

@ -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 );

14
ucb/source/ucp/tdoc/tdoc_content.cxx
View File

@ -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(

8
ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
View File

@ -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;
}

4
ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
View File

@ -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 );

16
ucb/source/ucp/webdav-neon/webdavcontent.cxx
View File

@ -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;
}

10
ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
View File

@ -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;
}

4
ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
View File

@ -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 );

50
ucbhelper/source/client/content.cxx
View File

@ -328,7 +328,7 @@ Content::Content( const Content& rOther )
//=========================================================================
// static
sal_Bool Content::create( const OUString& rURL,
bool Content::create( const OUString& rURL,
const Reference< XCommandEnvironment >& rEnv,
const Reference< XComponentContext >& rCtx,
Content& rContent )
@ -339,16 +339,16 @@ sal_Bool Content::create( const OUString& rURL,
Reference< XContentIdentifier > xId
= getContentIdentifier( pBroker, rURL, false );
if ( !xId.is() )
return sal_False;
return false;
Reference< XContent > xContent = getContent( pBroker, xId, false );
if ( !xContent.is() )
return sal_False;
return false;
rContent.m_xImpl
= new Content_Impl( rCtx, xContent, rEnv );
return sal_True;
return true;
}
//=========================================================================
@ -791,11 +791,11 @@ Reference< XStream > Content::openWriteableStreamNoLock()
}
//=========================================================================
sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
bool Content::openStream( const Reference< XActiveDataSink >& rSink )
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
return sal_False;
return false;
OpenCommandArgument2 aArg;
aArg.Mode = OpenMode::DOCUMENT;
@ -810,15 +810,15 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
m_xImpl->executeCommand( aCommand );
return sal_True;
return true;
}
//=========================================================================
sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
bool Content::openStream( const Reference< XOutputStream >& rStream )
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
return sal_False;
return false;
OpenCommandArgument2 aArg;
aArg.Mode = OpenMode::DOCUMENT;
@ -833,12 +833,12 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
m_xImpl->executeCommand( aCommand );
return sal_True;
return true;
}
//=========================================================================
void Content::writeStream( const Reference< XInputStream >& rStream,
sal_Bool bReplaceExisting )
bool bReplaceExisting )
throw( CommandAbortedException, RuntimeException, Exception )
{
InsertCommandArgument aArg;
@ -876,7 +876,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo()
}
//=========================================================================
sal_Bool Content::insertNewContent( const OUString& rContentType,
bool Content::insertNewContent( const OUString& rContentType,
const Sequence< OUString >&
rPropertyNames,
const Sequence< Any >& rPropertyValues,
@ -891,7 +891,7 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
}
//=========================================================================
sal_Bool Content::insertNewContent( const OUString& rContentType,
bool Content::insertNewContent( const OUString& rContentType,
const Sequence< OUString >&
rPropertyNames,
const Sequence< Any >& rPropertyValues,
@ -900,7 +900,7 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( rContentType.isEmpty() )
return sal_False;
return false;
// First, try it using "createNewContent" command -> the "new" way.
ContentInfo aInfo;
@ -932,12 +932,12 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
if ( !xCreator.is() )
return sal_False;
return false;
xNew = xCreator->createNewContent( aInfo );
if ( !xNew.is() )
return sal_False;
return false;
}
Content aNewContent(
@ -951,11 +951,11 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
aNewContent.m_xImpl->inserted();
rNewContent = aNewContent;
return sal_True;
return true;
}
//=========================================================================
sal_Bool Content::transferContent( const Content& rSourceContent,
bool Content::transferContent( const Content& rSourceContent,
InsertOperation eOperation,
const OUString & rTitle,
const sal_Int32 nNameClashAction,
@ -1030,14 +1030,14 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
Any aRet = pBroker->execute( aCommand, 0, m_xImpl->getEnvironment() );
if ( pResultURL != NULL )
aRet >>= *pResultURL;
return sal_True;
return true;
}
//=========================================================================
sal_Bool Content::isFolder()
bool Content::isFolder()
throw( CommandAbortedException, RuntimeException, Exception )
{
sal_Bool bFolder = sal_False;
bool bFolder = false;
if ( getPropertyValue("IsFolder")
>>= bFolder )
return bFolder;
@ -1052,7 +1052,7 @@ sal_Bool Content::isFolder()
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
// Unreachable - cancelCommandExecution always throws an exception.
// But some compilers complain...
return sal_False;
return false;
#endif
}
@ -1060,10 +1060,10 @@ sal_Bool Content::isFolder()
SAL_WNOUNREACHABLE_CODE_PUSH
sal_Bool Content::isDocument()
bool Content::isDocument()
throw( CommandAbortedException, RuntimeException, Exception )
{
sal_Bool bDoc = sal_False;
bool bDoc = false;
if ( getPropertyValue("IsDocument")
>>= bDoc )
return bDoc;
@ -1077,7 +1077,7 @@ sal_Bool Content::isDocument()
// Unreachable - cancelCommandExecution always throws an exception,
// But some compilers complain...
return sal_False;
return false;
}
SAL_WNOUNREACHABLE_CODE_POP

2
ucbhelper/source/client/interceptedinteraction.cxx
View File

@ -114,7 +114,7 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep
css::uno::Type aInterceptedType = rInterception.Request.getValueType();
// check the request
sal_Bool bMatch = sal_False;
bool bMatch = false;
if (rInterception.MatchExact)
bMatch = aInterceptedType.equals(aRequestType);
else

26
ucbhelper/source/provider/contenthelper.cxx
View File

@ -433,7 +433,7 @@ void SAL_CALL ContentImplHelper::addProperty(
// Add a new dynamic property.
// Open/create persistent property set.
uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet(
getAdditionalPropertySet( sal_True ) );
getAdditionalPropertySet( true ) );
OSL_ENSURE( xSet.is(),
"ContentImplHelper::addProperty - No property set!" );
@ -528,7 +528,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
// Try to remove property from dynamic property set.
// Open persistent property set, if exists.
uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet(
getAdditionalPropertySet( sal_False ) );
getAdditionalPropertySet( false ) );
if ( xSet.is() )
{
uno::Reference< beans::XPropertyContainer > xContainer(
@ -651,32 +651,32 @@ void SAL_CALL ContentImplHelper::setParent(
}
uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
ContentImplHelper::getAdditionalPropertySet( sal_Bool bCreate )
ContentImplHelper::getAdditionalPropertySet( bool bCreate )
{
// Get propertyset from provider.
return m_xProvider->getAdditionalPropertySet(
m_xIdentifier->getContentIdentifier(), bCreate );
}
sal_Bool ContentImplHelper::renameAdditionalPropertySet(
bool ContentImplHelper::renameAdditionalPropertySet(
const OUString& rOldKey,
const OUString& rNewKey,
sal_Bool bRecursive )
bool bRecursive )
{
return m_xProvider->renameAdditionalPropertySet(
rOldKey, rNewKey, bRecursive );
}
sal_Bool ContentImplHelper::copyAdditionalPropertySet(
bool ContentImplHelper::copyAdditionalPropertySet(
const OUString& rSourceKey,
const OUString& rTargetKey,
sal_Bool bRecursive )
bool bRecursive )
{
return m_xProvider->copyAdditionalPropertySet(
rSourceKey, rTargetKey, bRecursive );
}
sal_Bool ContentImplHelper::removeAdditionalPropertySet( sal_Bool bRecursive )
bool ContentImplHelper::removeAdditionalPropertySet( bool bRecursive )
{
return m_xProvider->removeAdditionalPropertySet(
m_xIdentifier->getContentIdentifier(), bRecursive );
@ -855,7 +855,7 @@ void ContentImplHelper::deleted()
m_xProvider->removeContent( this );
}
sal_Bool ContentImplHelper::exchange(
bool ContentImplHelper::exchange(
const uno::Reference< com::sun::star::ucb::XContentIdentifier >& rNewId )
{
uno::Reference< com::sun::star::ucb::XContent > xThis = this;
@ -869,7 +869,7 @@ sal_Bool ContentImplHelper::exchange(
// @@@
// Big trouble. Another object with the new identity exists.
// How shall I mutate to / merge with the other object?
return sal_False;
return false;
}
uno::Reference< com::sun::star::ucb::XContentIdentifier > xOldId
@ -889,13 +889,13 @@ sal_Bool ContentImplHelper::exchange(
this,
xOldId );
notifyContentEvent( aEvt );
return sal_True;
return true;
}
uno::Reference< com::sun::star::ucb::XCommandInfo >
ContentImplHelper::getCommandInfo(
const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
sal_Bool bCache )
bool bCache )
{
osl::MutexGuard aGuard( m_aMutex );
@ -912,7 +912,7 @@ ContentImplHelper::getCommandInfo(
uno::Reference< beans::XPropertySetInfo >
ContentImplHelper::getPropertySetInfo(
const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
sal_Bool bCache )
bool bCache )
{
osl::MutexGuard aGuard( m_aMutex );

20
ucbhelper/source/provider/contentinfo.cxx
View File

@ -117,7 +117,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
//////////////////////////////////////////////////////////////
uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
xSet ( m_pContent->getAdditionalPropertySet( sal_False ) );
xSet ( m_pContent->getAdditionalPropertySet( false ) );
if ( xSet.is() )
{
@ -185,7 +185,7 @@ void PropertySetInfo::reset()
}
//=========================================================================
sal_Bool PropertySetInfo::queryProperty(
bool PropertySetInfo::queryProperty(
const OUString& rName, beans::Property& rProp )
{
osl::MutexGuard aGuard( m_aMutex );
@ -200,11 +200,11 @@ sal_Bool PropertySetInfo::queryProperty(
if ( rCurrProp.Name == rName )
{
rProp = rCurrProp;
return sal_True;
return true;
}
}
return sal_False;
return false;
}
//=========================================================================
@ -357,7 +357,7 @@ void CommandProcessorInfo::reset()
//=========================================================================
sal_Bool CommandProcessorInfo::queryCommand(
bool CommandProcessorInfo::queryCommand(
const OUString& rName,
com::sun::star::ucb::CommandInfo& rCommand )
{
@ -374,15 +374,15 @@ sal_Bool CommandProcessorInfo::queryCommand(
if ( rCurrCommand.Name == rName )
{
rCommand = rCurrCommand;
return sal_True;
return true;
}
}
return sal_False;
return false;
}
//=========================================================================
sal_Bool CommandProcessorInfo::queryCommand(
bool CommandProcessorInfo::queryCommand(
sal_Int32 nHandle,
com::sun::star::ucb::CommandInfo& rCommand )
{
@ -399,11 +399,11 @@ sal_Bool CommandProcessorInfo::queryCommand(
if ( rCurrCommand.Handle == nHandle )
{
rCommand = rCurrCommand;
return sal_True;
return true;
}
}
return sal_False;
return false;
}
} // namespace ucbhelper

32
ucbhelper/source/provider/propertyvalueset.cxx
View File

@ -83,7 +83,7 @@ struct PropertyValue
sal_uInt32 nOrigValue;
OUString aString; // getString
sal_Bool bBoolean; // getBoolean
bool bBoolean; // getBoolean
sal_Int8 nByte; // getByte
sal_Int16 nShort; // getShort
sal_Int32 nInt; // getInt
@ -145,7 +145,7 @@ class PropertyValues : public PropertyValuesVector {};
\
_type_ aValue = _type_(); /* default ctor */ \
\
m_bWasNull = sal_True; \
m_bWasNull = true; \
\
if ( ( columnIndex < 1 ) \
|| ( columnIndex > sal_Int32( m_pValues->size() ) ) ) \
@ -163,7 +163,7 @@ class PropertyValues : public PropertyValuesVector {};
{ \
/* Values is present natively... */ \
aValue = rValue._member_name_; \
m_bWasNull = sal_False; \
m_bWasNull = false; \
} \
else \
{ \
@ -184,7 +184,7 @@ class PropertyValues : public PropertyValuesVector {};
{ \
rValue._member_name_ = aValue; \
rValue.nPropsSet |= _type_name_; \
m_bWasNull = sal_False; \
m_bWasNull = false; \
} \
else \
{ \
@ -204,7 +204,7 @@ class PropertyValues : public PropertyValuesVector {};
{ \
rValue._member_name_ = aValue; \
rValue.nPropsSet |= _type_name_; \
m_bWasNull = sal_False; \
m_bWasNull = false; \
} \
} \
catch (const IllegalArgumentException&) \
@ -255,8 +255,8 @@ PropertyValueSet::PropertyValueSet(
const Reference< XComponentContext >& rxContext )
: m_xContext( rxContext ),
m_pValues( new PropertyValues ),
m_bWasNull( sal_False ),
m_bTriedToGetTypeConverter( sal_False )
m_bWasNull( false ),
m_bTriedToGetTypeConverter( false )
{
}
@ -320,7 +320,7 @@ sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex )
throw( SQLException, RuntimeException )
{
GETVALUE_IMPL_TYPE(
sal_Bool, BOOLEAN_VALUE_SET, bBoolean, getCppuBooleanType() );
bool, BOOLEAN_VALUE_SET, bBoolean, getCppuBooleanType() );
}
//=========================================================================
@ -435,7 +435,7 @@ Any SAL_CALL PropertyValueSet::getObject(
Any aValue;
m_bWasNull = sal_True;
m_bWasNull = true;
if ( ( columnIndex < 1 )
|| ( columnIndex > sal_Int32( m_pValues->size() ) ) )
@ -451,7 +451,7 @@ Any SAL_CALL PropertyValueSet::getObject(
{
// Values is present natively...
aValue = rValue.aObject;
m_bWasNull = sal_False;
m_bWasNull = false;
}
else
{
@ -546,7 +546,7 @@ Any SAL_CALL PropertyValueSet::getObject(
{
rValue.aObject = aValue;
rValue.nPropsSet |= OBJECT_VALUE_SET;
m_bWasNull = sal_False;
m_bWasNull = false;
}
}
}
@ -622,7 +622,7 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() )
{
m_bTriedToGetTypeConverter = sal_True;
m_bTriedToGetTypeConverter = true;
m_xTypeConverter = Converter::create(m_xContext);
OSL_ENSURE( m_xTypeConverter.is(),
@ -641,7 +641,7 @@ void PropertyValueSet::appendString( const OUString& rPropName,
//=========================================================================
void PropertyValueSet::appendBoolean( const OUString& rPropName,
sal_Bool bValue )
bool bValue )
{
SETVALUE_IMPL( rPropName, BOOLEAN_VALUE_SET, bBoolean, bValue );
}
@ -744,7 +744,7 @@ void PropertyValueSet::appendPropertySet(
}
//=========================================================================
sal_Bool PropertyValueSet::appendPropertySetValue(
bool PropertyValueSet::appendPropertySetValue(
const Reference< XPropertySet >& rxSet,
const Property& rProperty )
{
@ -756,7 +756,7 @@ sal_Bool PropertyValueSet::appendPropertySetValue(
if ( aValue.hasValue() )
{
appendObject( rProperty, aValue );
return sal_True;
return true;
}
}
catch (const UnknownPropertyException&)
@ -768,7 +768,7 @@ sal_Bool PropertyValueSet::appendPropertySetValue(
}
// Error.
return sal_False;
return false;
}
} // namespace ucbhelper

72
ucbhelper/source/provider/providerhelper.cxx
View File

@ -258,7 +258,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
ContentProviderImplHelper::getAdditionalPropertySet(
const OUString& rKey, sal_Bool bCreate )
const OUString& rKey, bool bCreate )
{
// Get propertyset registry.
getAdditionalPropertySetRegistry();
@ -274,13 +274,13 @@ ContentProviderImplHelper::getAdditionalPropertySet(
return uno::Reference< com::sun::star::ucb::XPersistentPropertySet >();
}
sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
bool ContentProviderImplHelper::renameAdditionalPropertySet(
const OUString& rOldKey,
const OUString& rNewKey,
sal_Bool bRecursive )
bool bRecursive )
{
if ( rOldKey == rNewKey )
return sal_True;
return true;
osl::MutexGuard aGuard( m_aMutex );
@ -324,23 +324,23 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
= rKey.replaceAt(
0, rOldKey.getLength(), rNewKey );
if ( !renameAdditionalPropertySet(
rKey, aNewKey, sal_False ) )
return sal_False;
rKey, aNewKey, false ) )
return false;
}
}
}
}
else
return sal_False;
return false;
}
else
return sal_False;
return false;
}
else
{
// Get old property set, if exists.
uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xOldSet
= getAdditionalPropertySet( rOldKey, sal_False );
= getAdditionalPropertySet( rOldKey, false );
if ( xOldSet.is() )
{
// Rename property set.
@ -352,19 +352,19 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
xNamed->setName( rNewKey );
}
else
return sal_False;
return false;
}
}
return sal_True;
return true;
}
sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
bool ContentProviderImplHelper::copyAdditionalPropertySet(
const OUString& rSourceKey,
const OUString& rTargetKey,
sal_Bool bRecursive )
bool bRecursive )
{
if ( rSourceKey == rTargetKey )
return sal_True;
return true;
osl::MutexGuard aGuard( m_aMutex );
@ -408,35 +408,35 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
= rKey.replaceAt(
0, rSourceKey.getLength(), rTargetKey );
if ( !copyAdditionalPropertySet(
rKey, aNewKey, sal_False ) )
return sal_False;
rKey, aNewKey, false ) )
return false;
}
}
}
}
else
return sal_False;
return false;
}
else
return sal_False;
return false;
}
else
{
// Get old property set, if exists.
uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
xOldPropSet = getAdditionalPropertySet( rSourceKey, sal_False );
xOldPropSet = getAdditionalPropertySet( rSourceKey, false );
if ( !xOldPropSet.is() )
return sal_False;
return false;
uno::Reference< beans::XPropertySetInfo > xPropSetInfo
= xOldPropSet->getPropertySetInfo();
if ( !xPropSetInfo.is() )
return sal_False;
return false;
uno::Reference< beans::XPropertyAccess > xOldPropAccess(
xOldPropSet, uno::UNO_QUERY );
if ( !xOldPropAccess.is() )
return sal_False;
return false;
// Obtain all values from old set.
uno::Sequence< beans::PropertyValue > aValues
@ -451,19 +451,19 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
// Fail, if property set with new key already exists.
uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
xNewPropSet
= getAdditionalPropertySet( rTargetKey, sal_False );
= getAdditionalPropertySet( rTargetKey, false );
if ( xNewPropSet.is() )
return sal_False;
return false;
// Create new, empty set.
xNewPropSet = getAdditionalPropertySet( rTargetKey, sal_True );
xNewPropSet = getAdditionalPropertySet( rTargetKey, true );
if ( !xNewPropSet.is() )
return sal_False;
return false;
uno::Reference< beans::XPropertyContainer > xNewPropContainer(
xNewPropSet, uno::UNO_QUERY );
if ( !xNewPropContainer.is() )
return sal_False;
return false;
for ( sal_Int32 n = 0; n < nCount; ++n )
{
@ -496,11 +496,11 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
}
}
}
return sal_True;
return true;
}
sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
const OUString& rKey, sal_Bool bRecursive )
bool ContentProviderImplHelper::removeAdditionalPropertySet(
const OUString& rKey, bool bRecursive )
{
osl::MutexGuard aGuard( m_aMutex );
@ -541,17 +541,17 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
|| rCurrKey.equals( aKeyWithoutSlash ) )
{
if ( !removeAdditionalPropertySet(
rCurrKey, sal_False ) )
return sal_False;
rCurrKey, false ) )
return false;
}
}
}
}
else
return sal_False;
return false;
}
else
return sal_False;
return false;
}
else
{
@ -561,9 +561,9 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
if ( m_pImpl->m_xPropertySetRegistry.is() )
m_pImpl->m_xPropertySetRegistry->removePropertySet( rKey );
else
return sal_False;
return false;
}
return sal_True;
return true;
}
} // namespace ucbhelper

120
ucbhelper/source/provider/resultset.cxx
View File

@ -89,7 +89,7 @@ class PropertySetInfo :
uno::Sequence< beans::Property >* m_pProps;
private:
sal_Bool queryProperty(
bool queryProperty(
const OUString& aName, beans::Property& rProp );
public:
@ -164,8 +164,8 @@ struct ResultSet_Impl
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
PropertyChangeListeners* m_pPropertyChangeListeners;
sal_Int32 m_nPos;
sal_Bool m_bWasNull;
sal_Bool m_bAfterLast;
bool m_bWasNull;
bool m_bAfterLast;
inline ResultSet_Impl(
const uno::Reference< uno::XComponentContext >& rxContext,
@ -188,8 +188,8 @@ inline ResultSet_Impl::ResultSet_Impl(
m_pDisposeEventListeners( 0 ),
m_pPropertyChangeListeners( 0 ),
m_nPos( 0 ), // Position is one-based. Zero means: before first element.
m_bWasNull( sal_False ),
m_bAfterLast( sal_False )
m_bWasNull( false ),
m_bAfterLast( false )
{
}
@ -383,7 +383,7 @@ sal_Bool SAL_CALL ResultSet::next()
// getResult works zero-based!
if ( !m_pImpl->m_xDataSupplier->getResult( m_pImpl->m_nPos ) )
{
m_pImpl->m_bAfterLast = sal_True;
m_pImpl->m_bAfterLast = true;
m_pImpl->m_xDataSupplier->validate();
return sal_False;
}
@ -467,7 +467,7 @@ void SAL_CALL ResultSet::beforeFirst()
throw( sdbc::SQLException, uno::RuntimeException )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = 0;
m_pImpl->m_xDataSupplier->validate();
}
@ -478,7 +478,7 @@ void SAL_CALL ResultSet::afterLast()
throw( sdbc::SQLException, uno::RuntimeException )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_True;
m_pImpl->m_bAfterLast = true;
m_pImpl->m_xDataSupplier->validate();
}
@ -491,7 +491,7 @@ sal_Bool SAL_CALL ResultSet::first()
if ( m_pImpl->m_xDataSupplier->getResult( 0 ) )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = 1;
m_pImpl->m_xDataSupplier->validate();
return sal_True;
@ -510,7 +510,7 @@ sal_Bool SAL_CALL ResultSet::last()
if ( nCount )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = nCount;
m_pImpl->m_xDataSupplier->validate();
return sal_True;
@ -564,7 +564,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
if ( ( row * -1 ) > nCount )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = 0;
m_pImpl->m_xDataSupplier->validate();
return sal_False;
@ -572,7 +572,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
else // |row| <= nCount
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = ( nCount + row + 1 );
m_pImpl->m_xDataSupplier->validate();
return sal_True;
@ -591,7 +591,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
if ( row <= nCount )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = row;
m_pImpl->m_xDataSupplier->validate();
return sal_True;
@ -599,7 +599,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
else // row > nCount
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_True;
m_pImpl->m_bAfterLast = true;
m_pImpl->m_xDataSupplier->validate();
return sal_False;
}
@ -635,7 +635,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
if ( ( m_pImpl->m_nPos + rows ) > 0 )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = ( m_pImpl->m_nPos + rows );
m_pImpl->m_xDataSupplier->validate();
return sal_True;
@ -643,7 +643,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
else
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = 0;
m_pImpl->m_xDataSupplier->validate();
return sal_False;
@ -661,7 +661,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
if ( ( m_pImpl->m_nPos + rows ) <= nCount )
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
m_pImpl->m_nPos = ( m_pImpl->m_nPos + rows );
m_pImpl->m_xDataSupplier->validate();
return sal_True;
@ -669,7 +669,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
else
{
osl::MutexGuard aGuard( m_pImpl->m_aMutex );
m_pImpl->m_bAfterLast = sal_True;
m_pImpl->m_bAfterLast = true;
m_pImpl->m_xDataSupplier->validate();
return sal_False;
}
@ -691,7 +691,7 @@ sal_Bool SAL_CALL ResultSet::previous()
if ( m_pImpl->m_bAfterLast )
{
m_pImpl->m_bAfterLast = sal_False;
m_pImpl->m_bAfterLast = false;
sal_Int32 nCount = m_pImpl->m_xDataSupplier->totalCount();
m_pImpl->m_nPos = nCount;
}
@ -803,13 +803,13 @@ OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getString( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return OUString();
}
@ -826,13 +826,13 @@ sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getBoolean( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return sal_False;
}
@ -849,13 +849,13 @@ sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getByte( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return 0;
}
@ -872,13 +872,13 @@ sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getShort( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return 0;
}
@ -895,13 +895,13 @@ sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getInt( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return 0;
}
@ -918,13 +918,13 @@ sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getLong( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return 0;
}
@ -941,13 +941,13 @@ float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getFloat( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return 0;
}
@ -964,13 +964,13 @@ double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getDouble( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return 0;
}
@ -988,13 +988,13 @@ ResultSet::getBytes( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getBytes( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Sequence< sal_Int8 >();
}
@ -1011,13 +1011,13 @@ util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getDate( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return util::Date();
}
@ -1034,13 +1034,13 @@ util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getTime( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return util::Time();
}
@ -1058,13 +1058,13 @@ ResultSet::getTimestamp( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getTimestamp( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return util::DateTime();
}
@ -1082,13 +1082,13 @@ ResultSet::getBinaryStream( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getBinaryStream( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Reference< io::XInputStream >();
}
@ -1106,13 +1106,13 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getCharacterStream( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Reference< io::XInputStream >();
}
@ -1131,13 +1131,13 @@ uno::Any SAL_CALL ResultSet::getObject(
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getObject( columnIndex, typeMap );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Any();
}
@ -1155,13 +1155,13 @@ ResultSet::getRef( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getRef( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Reference< sdbc::XRef >();
}
@ -1179,13 +1179,13 @@ ResultSet::getBlob( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getBlob( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Reference< sdbc::XBlob >();
}
@ -1203,13 +1203,13 @@ ResultSet::getClob( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getClob( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Reference< sdbc::XClob >();
}
@ -1227,13 +1227,13 @@ ResultSet::getArray( sal_Int32 columnIndex )
m_pImpl->m_nPos - 1 );
if ( xValues.is() )
{
m_pImpl->m_bWasNull = sal_False;
m_pImpl->m_bWasNull = false;
m_pImpl->m_xDataSupplier->validate();
return xValues->getArray( columnIndex );
}
}
m_pImpl->m_bWasNull = sal_True;
m_pImpl->m_bWasNull = true;
m_pImpl->m_xDataSupplier->validate();
return uno::Reference< sdbc::XArray >();
}
@ -1643,7 +1643,7 @@ sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
}
//=========================================================================
sal_Bool PropertySetInfo::queryProperty(
bool PropertySetInfo::queryProperty(
const OUString& aName, beans::Property& rProp )
{
sal_Int32 nCount = m_pProps->getLength();
@ -1654,11 +1654,11 @@ sal_Bool PropertySetInfo::queryProperty(
if ( rCurr.Name == aName )
{
rProp = rCurr;
return sal_True;
return true;
}
}
return sal_False;
return false;
}
} // namespace ucbhelper_impl

16
ucbhelper/source/provider/resultsethelper.cxx
View File

@ -53,8 +53,8 @@ ResultSetImplHelper::ResultSetImplHelper(
const uno::Reference< uno::XComponentContext >& rxContext,
const com::sun::star::ucb::OpenCommandArgument2& rCommand )
: m_pDisposeEventListeners( 0 ),
m_bStatic( sal_False ),
m_bInitDone( sal_False ),
m_bStatic( false ),
m_bInitDone( false ),
m_aCommand( rCommand ),
m_xContext( rxContext )
{
@ -166,7 +166,7 @@ ResultSetImplHelper::getStaticResultSet()
if ( m_xListener.is() )
throw com::sun::star::ucb::ListenerAlreadySetException();
init( sal_True );
init( true );
return m_xResultSet1;
}
@ -194,7 +194,7 @@ void SAL_CALL ResultSetImplHelper::setListener(
// are a fake. This implementation will never call "notify" at the
// listener to propagate any changes!!!
init( sal_False );
init( false );
uno::Any aInfo;
aInfo <<= com::sun::star::ucb::WelcomeDynamicResultSetStruct(
@ -273,7 +273,7 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
//
//=========================================================================
void ResultSetImplHelper::init( sal_Bool bStatic )
void ResultSetImplHelper::init( bool bStatic )
{
osl::MutexGuard aGuard( m_aMutex );
@ -286,7 +286,7 @@ void ResultSetImplHelper::init( sal_Bool bStatic )
OSL_ENSURE( m_xResultSet1.is(),
"ResultSetImplHelper::init - No 1st result set!" );
m_bStatic = sal_True;
m_bStatic = true;
}
else
{
@ -297,9 +297,9 @@ void ResultSetImplHelper::init( sal_Bool bStatic )
"ResultSetImplHelper::init - No 1st result set!" );
OSL_ENSURE( m_xResultSet2.is(),
"ResultSetImplHelper::init - No 2nd result set!" );
m_bStatic = sal_False;
m_bStatic = false;
}
m_bInitDone = sal_True;
m_bInitDone = true;
}
}

18
ucbhelper/source/provider/resultsetmetadata.cxx
View File

@ -55,17 +55,17 @@ struct ResultSetMetaData_Impl
{
osl::Mutex m_aMutex;
std::vector< ::ucbhelper::ResultSetColumnData > m_aColumnData;
sal_Bool m_bObtainedTypes;
sal_Bool m_bGlobalReadOnlyValue;
bool m_bObtainedTypes;
bool m_bGlobalReadOnlyValue;
ResultSetMetaData_Impl( sal_Int32 nSize )
: m_aColumnData( nSize ), m_bObtainedTypes( sal_False ),
m_bGlobalReadOnlyValue( sal_True ) {}
: m_aColumnData( nSize ), m_bObtainedTypes( false ),
m_bGlobalReadOnlyValue( true ) {}
ResultSetMetaData_Impl(
const std::vector< ::ucbhelper::ResultSetColumnData >& rColumnData )
: m_aColumnData( rColumnData ), m_bObtainedTypes( sal_False ),
m_bGlobalReadOnlyValue( sal_False ) {}
: m_aColumnData( rColumnData ), m_bObtainedTypes( false ),
m_bGlobalReadOnlyValue( false ) {}
};
}
@ -85,7 +85,7 @@ namespace ucbhelper {
ResultSetMetaData::ResultSetMetaData(
const Reference< XComponentContext >& rxContext,
const Sequence< Property >& rProps,
sal_Bool bReadOnly )
bool bReadOnly )
: m_pImpl( new ResultSetMetaData_Impl( rProps.getLength() ) ),
m_xContext( rxContext ),
m_aProps( rProps ),
@ -101,7 +101,7 @@ ResultSetMetaData::ResultSetMetaData(
: m_pImpl( new ResultSetMetaData_Impl( rColumnData ) ),
m_xContext( rxContext ),
m_aProps( rProps ),
m_bReadOnly( sal_True )
m_bReadOnly( true )
{
OSL_ENSURE( rColumnData.size() == sal_uInt32( rProps.getLength() ),
"ResultSetMetaData ctor - different array sizes!" );
@ -435,7 +435,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
// createInstance
}
m_pImpl->m_bObtainedTypes = sal_True;
m_pImpl->m_bObtainedTypes = true;
}
}

26
ucbhelper/source/provider/simpleauthenticationrequest.cxx
View File

@ -32,8 +32,8 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
const OUString & rUserName,
const OUString & rPassword,
const OUString & rAccount,
sal_Bool bAllowPersistentStoring,
sal_Bool bAllowUseSystemCredentials )
bool bAllowPersistentStoring,
bool bAllowUseSystemCredentials )
{
// Fill request...
@ -56,9 +56,9 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
aRequest.URL = rURL;
initialize(aRequest,
sal_False,
sal_True,
sal_True,
false,
true,
true,
aRequest.HasAccount,
bAllowPersistentStoring,
bAllowUseSystemCredentials );
@ -103,19 +103,19 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
eUserNameType == ENTITY_MODIFY,
ePasswordType == ENTITY_MODIFY,
eAccountType == ENTITY_MODIFY,
sal_True,
sal_False );
true,
false );
}
//=========================================================================
void SimpleAuthenticationRequest::initialize(
const ucb::URLAuthenticationRequest & rRequest,
sal_Bool bCanSetRealm,
sal_Bool bCanSetUserName,
sal_Bool bCanSetPassword,
sal_Bool bCanSetAccount,
sal_Bool bAllowPersistentStoring,
sal_Bool bAllowUseSystemCredentials )
bool bCanSetRealm,
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount,
bool bAllowPersistentStoring,
bool bAllowUseSystemCredentials )
{
setRequest( uno::makeAny( rRequest ) );

2
ucbhelper/source/provider/simplenameclashresolverequest.cxx
View File

@ -28,7 +28,7 @@ SimpleNameClashResolveRequest::SimpleNameClashResolveRequest(
const OUString & rTargetFolderURL,
const OUString & rClashingName,
const OUString & rProposedNewName,
sal_Bool bSupportsOverwriteData )
bool bSupportsOverwriteData )
{
// Fill request...
ucb::NameClashResolveRequest aRequest;