diff options
Diffstat (limited to 'connectivity')
10 files changed, 37 insertions, 37 deletions
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 5a1962b7c2b1..b8527d97d0ad 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -682,7 +682,7 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const return V_ARRAY(this); if(isNull()) - return (0); + return 0; OLEVariant varDest; varDest.ChangeType((VT_ARRAY|VT_UI1), this); diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 9ec723094465..e87e68dee571 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -179,7 +179,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, if ( logger ) logger->write( tmpInt ); #endif - return(tmpInt); + return tmpInt; } } return -1; diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 452b58b2d447..1a29491f5b36 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -98,7 +98,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearWarnings() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } + const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } static OUString getDriverImplementationName(); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index e472236a45c5..4a2c3eaec862 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -145,7 +145,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( } } } - return( aRows ); + return aRows; } OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 610ef54264fa..6398466f7b49 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -130,7 +130,7 @@ MQueryHelper::getByIndex(sal_uInt32 nRow) // Row numbers are from 1 to N, need to ensure this, and then // subtract 1 if ( nRow < 1 ) { - return( NULL ); + return NULL; } return m_aResults[nRow -1]; } @@ -156,11 +156,11 @@ bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow ) { if ( !m_aQueryHelper->waitForRow( nDBRow ) ) { m_aError = m_aQueryHelper->getError(); - return( sal_False ); + return sal_False; } } */ - return( getResultCount() > nDBRow ); + return getResultCount() > nDBRow; } diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 6241318578ff..112f97e85308 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -202,7 +202,7 @@ namespace connectivity SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} - const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } + const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } static OUString getDriverImplementationName(); diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 1b38325b0494..6a0b27ba069e 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -150,7 +150,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( } } } - return( aRows ); + return aRows; } OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 7f93b874645e..73b0c77d20d3 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -465,7 +465,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp rv = subDirectories -> Next(); } while ( rv == NS_OK); - return( NS_OK ); + return NS_OK; } sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, ::std::vector< OUString >& _rStrings, @@ -482,7 +482,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* if ( ! _pCon->getForceLoadTables() && m_aTableNames.size() > 0 ) { _rStrings = m_aTableNames; _rTypes = m_aTableTypes; - return( sal_True ); + return sal_True; } m_aTableNames.clear(); @@ -604,7 +604,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _rTypes = m_aTableTypes; _pCon->setForceLoadTables(sal_False); - return( sal_True ); + return sal_True; } sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, @@ -656,7 +656,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::getTables()" ); _rRows = aRows; - return(sal_True); + return sal_True; } @@ -761,7 +761,7 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const OUStri m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, OUString::number( sal_Int32(rv), 16 ) ); } OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()" ); - return( NS_SUCCEEDED(rv) ? sal_True : sal_False ); + return NS_SUCCEEDED(rv) ? sal_True : sal_False; } nsresult NewAddressBook(const OUString * aName) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 4fc486c9c038..8b24a4266d55 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -241,7 +241,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, else { // Should never see this... OSL_FAIL("Unknown Expression Type!"); - return( NS_ERROR_UNEXPECTED ); + return NS_ERROR_UNEXPECTED; } } @@ -251,7 +251,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, else queryExpression->SetOperation(nsIAbBooleanOperationTypes::OR); - return( NS_OK ); + return NS_OK; } sal_uInt32 MQuery::InsertLoginInfo(OConnection* _pCon) { @@ -422,14 +422,14 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) // Create a nsIAbDirectory object to initialise the nsIAbDirectoryQuery object. nsCOMPtr<nsIRDFService> rdfService(do_GetService(kRDFServiceCID, &rv)) ; if (NS_FAILED(rv)) - return(-1); + return -1; nsCOMPtr<nsIAbDirectory> directory; MNameMapper *nmap = _pCon->getNameMapper(); if ( nmap->getDir( m_aAddressbook, getter_AddRefs( directory ) ) == sal_False ) - return( -1 ); + return -1; //insert ldap bind info to mozilla profile(in memery,none saved),so we can use it in mozilla part codes @@ -550,7 +550,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) OSL_TRACE( "****** DoQuery failed"); OSL_TRACE("\tOUT MQuery::executeQueryProxied()\n"); m_aQueryHelper->notifyQueryError() ; - return(-1); + return -1; } #if OSL_DEBUG_LEVEL > 0 else { @@ -560,7 +560,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) OSL_TRACE("\tOUT MQuery::executeQueryProxied()"); - return(0); + return 0; } @@ -572,7 +572,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) sal_Int32 MQuery::getRowCount() { - return( m_aQueryHelper->getResultCount() ); + return m_aQueryHelper->getResultCount(); } @@ -584,7 +584,7 @@ MQuery::getRowCount() sal_uInt32 MQuery::getRealRowCount() { - return( m_aQueryHelper->getRealCount() ); + return m_aQueryHelper->getRealCount(); } @@ -594,7 +594,7 @@ MQuery::getRealRowCount() sal_Bool MQuery::queryComplete( void ) { - return( hadError() || m_aQueryHelper->queryComplete() ); + return hadError() || m_aQueryHelper->queryComplete(); } sal_Bool @@ -603,7 +603,7 @@ MQuery::waitForQueryComplete( void ) if( m_aQueryHelper->waitForQueryComplete( ) ) return sal_True; m_aError = m_aQueryHelper->getError(); - return( sal_False ); + return sal_False; } @@ -614,10 +614,10 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow ) while( !queryComplete() && m_aQueryHelper->getRealCount() <= (sal_uInt32)nDBRow ) if ( !m_aQueryHelper->waitForRow( nDBRow ) ) { m_aError = m_aQueryHelper->getError(); - return( sal_False ); + return sal_False; } - return( getRowCount() > nDBRow ); + return getRowCount() > nDBRow; } sal_Bool @@ -733,7 +733,7 @@ MQuery::createNewCard() MNameMapper* MQuery::CreateNameMapper() { - return( new MNameMapper() ); + return new MNameMapper(); } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 61f49650ed75..b71e880c9bb7 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -201,7 +201,7 @@ MQueryHelper::next( ) m_aMutex.release(); } - return( result ); + return result; } MQueryHelperResultEntry* @@ -210,7 +210,7 @@ MQueryHelper::getByIndex( sal_uInt32 nRow ) // Row numbers are from 1 to N, need to ensure this, and then // subtract 1 if ( nRow < 1 ) { - return( NULL ); + return NULL; } do { @@ -220,19 +220,19 @@ MQueryHelper::getByIndex( sal_uInt32 nRow ) if ( m_bQueryComplete ) { m_bAtEnd = sal_True; - return( NULL ); + return NULL; } else { clearResultOrComplete(); aGuard.clear(); if ( !waitForResultOrComplete( ) ) - return( NULL ); + return NULL; } } else { - return( m_aResults[ nRow -1 ] ); + return m_aResults[ nRow -1 ]; } } while ( true ); } @@ -261,7 +261,7 @@ MQueryHelper::waitForQueryComplete( ) m_aMutex.release(); clearResultOrComplete(); if ( !waitForResultOrComplete( ) ) - return( sal_False ); + return sal_False; m_aMutex.acquire(); } while ( !m_bQueryComplete ); @@ -269,7 +269,7 @@ MQueryHelper::waitForQueryComplete( ) m_aMutex.release(); OSL_TRACE("Out : waitForQueryComplete()"); - return( sal_True ); + return sal_True; } sal_Bool @@ -281,13 +281,13 @@ MQueryHelper::waitForRow( sal_Int32 rowNum ) m_aMutex.release(); clearResultOrComplete(); if ( !waitForResultOrComplete() ) - return( sal_False ); + return sal_False; m_aMutex.acquire(); } while ( !m_bQueryComplete && m_aResults.size() < (size_t)rowNum ); m_aMutex.release(); - return( sal_True ); + return sal_True; } @@ -395,7 +395,7 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result) notifyResultOrComplete(); - return(NS_OK); + return NS_OK; } |