diff options
author | Noel Grandin <noel@peralex.com> | 2015-02-11 13:20:49 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-02-23 09:26:58 +0200 |
commit | ba233e87efddf0a6751b35784dca1c805364ff3b (patch) | |
tree | 9d7c8a4256e688c2d47cb6ecf580ac196c4da2c0 /mysqlc | |
parent | a2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072 (diff) |
remove unnecessary parenthesis in return statements
found with
$ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;'
Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e
Diffstat (limited to 'mysqlc')
-rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 11 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_preparedstatement.cxx | 2 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_resultset.cxx | 6 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_statement.cxx | 12 |
4 files changed, 14 insertions, 17 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index bf134e50aaf7..a47ad727ede0 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -364,7 +364,7 @@ sal_Bool SAL_CALL OConnection::isClosed() MutexGuard aGuard(m_aMutex); // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent) - return (OConnection_BASE::rBHelper.bDisposed); + return OConnection_BASE::rBHelper.bDisposed; } Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData() @@ -405,7 +405,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly() checkDisposed(OConnection_BASE::rBHelper.bDisposed); // return if your connection to readonly - return (m_settings.readOnly); + return m_settings.readOnly; } void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog) @@ -503,11 +503,8 @@ Reference<XNameAccess> SAL_CALL OConnection::getTypeMap() MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - Reference<XNameAccess > t; - { - t = m_typeMap; - } - return (t); + Reference<XNameAccess > t = m_typeMap; + return t; } void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap) diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 05257fadb295..99c1ab5e7670 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -118,7 +118,7 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type & rType) if (!aRet.hasValue()) { aRet = OPreparedStatement_BASE::queryInterface(rType); } - return (aRet); + return aRet; } Sequence< Type > SAL_CALL OPreparedStatement::getTypes() diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 57521ccc6d56..bc76f7d55990 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -63,7 +63,7 @@ Sequence< rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames() Sequence< rtl::OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return (aSupported); + return aSupported; } sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName) @@ -1120,7 +1120,7 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const IPropertyArrayHelper & OResultSet::getInfoHelper() { OSL_TRACE("OResultSet::getInfoHelper"); - return (*const_cast<OResultSet*>(this)->getArrayHelper()); + return *const_cast<OResultSet*>(this)->getArrayHelper(); } sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, @@ -1207,7 +1207,7 @@ void SAL_CALL OResultSet::release() ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) { OSL_TRACE("OResultSet::getPropertySetInfo"); - return (::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper())); + return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } void OResultSet::checkColumnIndex(sal_Int32 index) diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 7e42758c26a7..ebb84d401eb0 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -192,7 +192,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection() MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - // just return(our connection here + // just return our connection here return m_pConnection; } @@ -211,7 +211,7 @@ Any SAL_CALL OStatement::queryInterface(const Type & rType) if (!aRet.hasValue()) { aRet = OCommonStatement::queryInterface(rType); } - return (aRet); + return aRet; } void SAL_CALL OStatement::addBatch(const rtl::OUString& sql) @@ -278,8 +278,8 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults() checkDisposed(rBHelper.bDisposed); // if your driver supports more than only one resultset - // and has one more at this moment return(true - return (sal_False); + // and has one more at this moment return true + return sal_False; } Any SAL_CALL OCommonStatement::getWarnings() @@ -327,7 +327,7 @@ void SAL_CALL OCommonStatement::clearWarnings() ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper() { OSL_TRACE("OCommonStatement::getInfoHelper"); - return(*const_cast<OCommonStatement*>(this)->getArrayHelper()); + return *const_cast<OCommonStatement*>(this)->getArrayHelper(); } sal_Bool OCommonStatement::convertFastPropertyValue( @@ -435,7 +435,7 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement throw(RuntimeException, std::exception) { OSL_TRACE("OCommonStatement::getPropertySetInfo"); - return(::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper())); + return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } /* |