summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/mozab/mozillasrc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-02-11 13:20:49 +0200
committerNoel Grandin <noel@peralex.com>2015-02-23 09:26:58 +0200
commitba233e87efddf0a6751b35784dca1c805364ff3b (patch)
tree9d7c8a4256e688c2d47cb6ecf580ac196c4da2c0 /connectivity/source/drivers/mozab/mozillasrc
parenta2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072 (diff)
remove unnecessary parenthesis in return statements
found with $ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;' Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e
Diffstat (limited to 'connectivity/source/drivers/mozab/mozillasrc')
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx10
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx26
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx20
3 files changed, 28 insertions, 28 deletions
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;
}