diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 19:59:45 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:20 +0100 |
commit | fbda6021550f4fe342ded19517b4aeaaeeec47e1 (patch) | |
tree | 2c77d7872c2c93c0f4cfa8a1ba08d66f1c79ade2 /ucb/source | |
parent | 2c907d21077ee6e5e68039842fcf8721bde5bef0 (diff) |
bool improvements
Change-Id: I9a3c7a425342373d02d2664a3444c50bfd629970
Diffstat (limited to 'ucb/source')
-rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_datasupplier.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/gio/gio_content.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/gio/gio_datasupplier.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/ContentProperties.cxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 53777bc3b1d2..f1e7f92b9090 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -299,7 +299,7 @@ namespace cmis m_pSession = libcmis::SessionFactory::createSession( OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ), - rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), sal_False, oauth2Data ); + rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), false, oauth2Data ); if ( m_pSession == NULL ) ucbhelper::cancelCommandExecution( ucb::IOErrorCode_INVALID_DEVICE, diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 4899a719a5a2..27f046525793 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -51,7 +51,7 @@ namespace cmis maResults.push_back( new ResultListEntry( *it ) ); } } - mbCountFinal = sal_True; + mbCountFinal = true; return true; } diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 88fefb5cb4c0..e0714a226419 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -161,7 +161,7 @@ namespace cmis libcmis::Session* session = libcmis::SessionFactory::createSession( OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ), - rUsername, rPassword, "", sal_False, oauth2Data ); + rUsername, rPassword, "", false, oauth2Data ); if (session == NULL ) ucbhelper::cancelCommandExecution( ucb::IOErrorCode_INVALID_DEVICE, diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 347ec40c7e5d..0dbeb0f7c0d3 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -147,7 +147,7 @@ OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) do { \ if (bThrow) throw aExcept;\ aRet = uno::makeAny( aExcept );\ -} while(0) +} while(false) uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterface >& rContext, bool bThrow) { @@ -1068,7 +1068,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream, if (mbTransient) { - mbTransient = sal_False; + mbTransient = false; inserted(); } } diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 9deda7f2e6c1..6a1197f65bec 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -56,7 +56,7 @@ bool DataSupplier::getData() G_FILE_QUERY_INFO_NONE, NULL, NULL); if (!pEnumerator) - return sal_False; + return false; GFileInfo *pInfo = NULL; while ((pInfo = g_file_enumerator_next_file (pEnumerator, NULL, NULL))) @@ -80,7 +80,7 @@ bool DataSupplier::getData() g_object_unref(pInfo); } - mbCountFinal = sal_True; + mbCountFinal = true; g_file_enumerator_close(pEnumerator, NULL, NULL); return true; diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index a9ed86730478..42f80af30bfe 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -262,7 +262,7 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex ) } if ( !bFound ) - m_pImpl->m_bCountFinal = sal_True; + m_pImpl->m_bCountFinal = true; rtl::Reference< ::ucbhelper::ResultSet > xResultSet = getResultSet().get(); if ( xResultSet.is() ) @@ -313,7 +313,7 @@ sal_uInt32 ResultSetDataSupplier::totalCount() } } - m_pImpl->m_bCountFinal = sal_True; + m_pImpl->m_bCountFinal = true; rtl::Reference< ::ucbhelper::ResultSet > xResultSet = getResultSet().get(); if ( xResultSet.is() ) @@ -409,7 +409,7 @@ bool ResultSetDataSupplier::queryNamesOfChildren() { OSL_FAIL( "Got no list of children!" ); delete pNamesOfChildren; - m_pImpl->m_bThrowException = sal_True; + m_pImpl->m_bThrowException = true; return false; } else diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index b19cd24c19be..69a1242fdf08 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -129,14 +129,14 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) } if ( rResource.uri.endsWith("/") ) - m_bTrailingSlash = sal_True; + m_bTrailingSlash = true; } //========================================================================= ContentProperties::ContentProperties( const OUString & rTitle, sal_Bool bFolder ) : m_xProps( new PropertyValueMap ), - m_bTrailingSlash( sal_False ) + m_bTrailingSlash( false ) { (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( rTitle ), true ); @@ -149,7 +149,7 @@ ContentProperties::ContentProperties( //========================================================================= 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 ); @@ -158,7 +158,7 @@ ContentProperties::ContentProperties( const OUString & rTitle ) //========================================================================= ContentProperties::ContentProperties() : m_xProps( new PropertyValueMap ), - m_bTrailingSlash( sal_False ) + m_bTrailingSlash( false ) { } diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index c493a7f945f2..a23a123ab299 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -442,7 +442,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, if ( xImCert.is() ) vecCerts.push_back( xImCert ); } - while ( 1 ); + while ( true ); sal_Int64 certValidity = xSecurityEnv->verifyCertificate( xEECert, ::comphelper::containerToSequence( vecCerts ) ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index ec4f694de00e..c6fbe4f80e23 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -2468,7 +2468,7 @@ void Content::insert( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - m_bTransient = sal_False; + m_bTransient = false; } } else |