[Libreoffice-commits] core.git: connectivity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Feb 8 12:40:01 UTC 2019
connectivity/source/commontools/DateConversion.cxx | 38 +++++-----
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 2
connectivity/source/commontools/TPrivilegesResultSet.cxx | 4 -
connectivity/source/commontools/dbtools2.cxx | 2
connectivity/source/commontools/parameters.cxx | 2
connectivity/source/cpool/ZConnectionPool.cxx | 4 -
connectivity/source/cpool/ZPoolCollection.cxx | 4 -
connectivity/source/cpool/ZPooledConnection.cxx | 2
connectivity/source/drivers/component/CResultSet.cxx | 4 -
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 2
connectivity/source/drivers/dbase/DResultSet.cxx | 4 -
connectivity/source/drivers/evoab2/NConnection.cxx | 36 ++++-----
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 2
connectivity/source/drivers/evoab2/NDriver.cxx | 4 -
connectivity/source/drivers/evoab2/NResultSet.cxx | 4 -
connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 2
connectivity/source/drivers/evoab2/NTables.cxx | 4 -
connectivity/source/drivers/file/FCatalog.cxx | 2
connectivity/source/drivers/file/FPreparedStatement.cxx | 6 -
connectivity/source/drivers/firebird/Connection.cxx | 4 -
connectivity/source/drivers/flat/EDriver.cxx | 4 -
connectivity/source/drivers/flat/EResultSet.cxx | 9 +-
connectivity/source/drivers/hsqldb/HTables.cxx | 2
connectivity/source/drivers/hsqldb/HViews.cxx | 2
connectivity/source/drivers/jdbc/JConnection.cxx | 2
connectivity/source/drivers/jdbc/Timestamp.cxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 4 -
connectivity/source/drivers/mork/MResultSet.cxx | 12 +--
connectivity/source/drivers/mork/MTables.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 2
connectivity/source/drivers/postgresql/pq_statics.cxx | 2
connectivity/source/drivers/postgresql/pq_xcolumns.cxx | 2
connectivity/source/sdbcx/VUser.cxx | 2
33 files changed, 89 insertions(+), 90 deletions(-)
New commits:
commit b45289e48e0f354b9996e2846dd041db4a9947ce
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:13:08 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 8 13:39:29 2019 +0100
loplugin:indentation in connectivity
Change-Id: I6619fcdd84a23aae975dcaa7315c7f229c63c4f1
Reviewed-on: https://gerrit.libreoffice.org/67535
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 95c3c0b2212d..510736cc6a3f 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -116,16 +116,16 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal,
if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
- _rVal >>= nValue;
- aDateTime = DBTypeConversion::toDateTime(nValue);
- bOk = true;
+ _rVal >>= nValue;
+ aDateTime = DBTypeConversion::toDateTime(nValue);
+ bOk = true;
}
else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING)
{
OUString sValue;
- _rVal >>= sValue;
- aDateTime = DBTypeConversion::toDateTime(sValue);
- bOk = true;
+ _rVal >>= sValue;
+ aDateTime = DBTypeConversion::toDateTime(sValue);
+ bOk = true;
}
else
bOk = _rVal >>= aDateTime;
@@ -148,16 +148,16 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal,
if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
- _rVal >>= nValue;
- aDate = DBTypeConversion::toDate(nValue);
- bOk = true;
+ _rVal >>= nValue;
+ aDate = DBTypeConversion::toDate(nValue);
+ bOk = true;
}
else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING)
{
OUString sValue;
- _rVal >>= sValue;
- aDate = DBTypeConversion::toDate(sValue);
- bOk = true;
+ _rVal >>= sValue;
+ aDate = DBTypeConversion::toDate(sValue);
+ bOk = true;
}
else
bOk = _rVal >>= aDate;
@@ -173,16 +173,16 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal,
if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
- _rVal >>= nValue;
- aTime = DBTypeConversion::toTime(nValue);
- bOk = true;
+ _rVal >>= nValue;
+ aTime = DBTypeConversion::toTime(nValue);
+ bOk = true;
}
else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING)
{
OUString sValue;
- _rVal >>= sValue;
- aTime = DBTypeConversion::toTime(sValue);
- bOk = true;
+ _rVal >>= sValue;
+ aTime = DBTypeConversion::toTime(sValue);
+ bOk = true;
}
else
bOk = _rVal >>= aTime;
@@ -487,7 +487,7 @@ OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
// get a value which represents the given date, relative to the null date of the formatter
fValue -= toDays( rNullDate, aFormatterNullDate );
// format this value
- aString = xFormatter->convertNumberToString( nKey, fValue );
+ aString = xFormatter->convertNumberToString( nKey, fValue );
}
}
break;
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index e8aafb3d78a2..68c71a299f4b 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -122,7 +122,7 @@ void ODatabaseMetaDataResultSet::disposing()
::osl::MutexGuard aGuard(m_aMutex);
m_aStatement = nullptr;
-m_xMetaData.clear();
+ m_xMetaData.clear();
m_aRowsIter = m_aRows.end();
m_aRows.clear();
m_aRowsIter = m_aRows.end();
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index bb4f92397056..6347e3e17d71 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -110,8 +110,8 @@ const ORowSetValue& OResultSetPrivileges::getValue(sal_Int32 columnIndex)
void SAL_CALL OResultSetPrivileges::disposing()
{
ODatabaseMetaDataResultSet::disposing();
-m_xTables.clear();
-m_xRow.clear();
+ m_xTables.clear();
+ m_xRow.clear();
}
sal_Bool SAL_CALL OResultSetPrivileges::next( )
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 9134f02df358..cd52c09ce6fe 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -939,7 +939,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour
);
}
- return nLen;
+ return nLen;
}
static OUString lcl_getReportEngines()
{
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index b3dfdd008c41..e03c6064c7cf 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -92,7 +92,7 @@ namespace dbtools
void ParameterManager::clearAllParameterInformation()
{
- m_xInnerParamColumns.clear();
+ m_xInnerParamColumns.clear();
if ( m_pOuterParameters.is() )
m_pOuterParameters->dispose();
m_pOuterParameters = nullptr;
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 0289e4e55a23..c1c3cf44322e 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -145,8 +145,8 @@ void OConnectionPool::clear(bool _bDispose)
if (xProp.is())
xProp->removePropertyChangeListener(TIMEOUT_NODENAME, this);
-m_xDriverNode.clear();
-m_xDriver.clear();
+ m_xDriverNode.clear();
+ m_xDriver.clear();
}
Reference< XConnection > OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index aa40d976f827..3318e89c7d91 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -417,7 +417,7 @@ void SAL_CALL OPoolCollection::disposing( const EventObject& Source )
{
if ( xProp.is() )
xProp->removePropertyChangeListener(getEnablePoolingNodeName(),this);
- m_xConfigNode.clear();
+ m_xConfigNode.clear();
}
else if ( xProp.is() )
xProp->removePropertyChangeListener(getEnableNodeName(),this);
@@ -484,7 +484,7 @@ void OPoolCollection::clearDesktop()
clearConnectionPools(true);
if ( m_xDesktop.is() )
m_xDesktop->removeTerminateListener(this);
-m_xDesktop.clear();
+ m_xDesktop.clear();
}
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 7d2559de2382..8bbde8889ec9 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -47,7 +47,7 @@ void SAL_CALL OPooledConnection::disposing()
MutexGuard aGuard(m_aMutex);
if (m_xComponent.is())
m_xComponent->removeEventListener(this);
-m_xComponent.clear();
+ m_xComponent.clear();
::comphelper::disposeComponent(m_xRealConnection);
}
diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx
index faa80e00a116..1036a97dcd58 100644
--- a/connectivity/source/drivers/component/CResultSet.cxx
+++ b/connectivity/source/drivers/component/CResultSet.cxx
@@ -50,7 +50,7 @@ OUString SAL_CALL OComponentResultSet::getImplementationName( )
Sequence< OUString > SAL_CALL OComponentResultSet::getSupportedServiceNames( )
{
- Sequence< OUString > aSupported(2);
+ Sequence< OUString > aSupported(2);
aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported;
@@ -76,7 +76,7 @@ Any SAL_CALL OComponentResultSet::queryInterface( const Type & rType )
// XRowLocate
Any SAL_CALL OComponentResultSet::getBookmark( )
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ ::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 6bfae6027588..d03440e6ce33 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -258,7 +258,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
{
::osl::MutexGuard aGuard( m_aMutex );
- Reference< XTablesSupplier > xTables = m_pConnection->createCatalog();
+ Reference< XTablesSupplier > xTables = m_pConnection->createCatalog();
if(!xTables.is())
throw SQLException();
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 5d5b7b3122e5..f635c98312f6 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -53,7 +53,7 @@ OUString SAL_CALL ODbaseResultSet::getImplementationName( )
Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( )
{
- Sequence< OUString > aSupported(2);
+ Sequence< OUString > aSupported(2);
aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported;
@@ -79,7 +79,7 @@ Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType )
// XRowLocate
Any SAL_CALL ODbaseResultSet::getBookmark( )
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ ::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
OSL_ENSURE((m_bShowDeleted || !m_aRow->isDeleted()),"getBookmark called for deleted row");
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 6b12d72fa8b1..5355a55b786d 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -65,19 +65,19 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa
osl_atomic_increment( &m_refCount );
SAL_INFO("connectivity.evoab2", "OEvoabConnection::construct()::url = " << url );
- OUString sPassword;
- const char pPwd[] = "password";
-
- const PropertyValue *pIter = info.getConstArray();
- const PropertyValue *pEnd = pIter + info.getLength();
- for(;pIter != pEnd;++pIter)
- {
- if(pIter->Name == pPwd)
- {
- pIter->Value >>= sPassword;
- break;
- }
- }
+ OUString sPassword;
+ const char pPwd[] = "password";
+
+ const PropertyValue *pIter = info.getConstArray();
+ const PropertyValue *pEnd = pIter + info.getLength();
+ for(;pIter != pEnd;++pIter)
+ {
+ if(pIter->Name == pPwd)
+ {
+ pIter->Value >>= sPassword;
+ break;
+ }
+ }
if ( url == "sdbc:address:evolution:groupwise" )
setSDBCAddressType(SDBCAddress::EVO_GWISE);
@@ -115,14 +115,14 @@ Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( )
css::uno::Reference< XTablesSupplier > OEvoabConnection::createCatalog()
{
::osl::MutexGuard aGuard( m_aMutex );
- Reference< XTablesSupplier > xTab = m_xCatalog;
- if(!xTab.is())
- {
+ Reference< XTablesSupplier > xTab = m_xCatalog;
+ if(!xTab.is())
+ {
OEvoabCatalog *pCat = new OEvoabCatalog(this);
xTab = pCat;
m_xCatalog = xTab;
- }
- return xTab;
+ }
+ return xTab;
}
Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( )
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 004b46245b4d..da3aa438a359 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -233,7 +233,7 @@ namespace connectivity
g_free(pFields[i]);
}
}
- if(pFields)
+ if(pFields)
{
g_free(pFields);
pFields=nullptr;
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 5025e2205bab..79a42103c01e 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -126,8 +126,8 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, co
OEvoabConnection* pCon = new OEvoabConnection( *this );
pCon->construct(url,info);
- Reference< XConnection > xCon = pCon;
- m_xConnections.push_back(WeakReferenceHelper(*pCon));
+ Reference< XConnection > xCon = pCon;
+ m_xConnections.push_back(WeakReferenceHelper(*pCon));
return xCon;
}
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index f071b4b66d51..7681ded2da34 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -71,7 +71,7 @@ OUString SAL_CALL OEvoabResultSet::getImplementationName( )
Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( )
{
- Sequence< OUString > aSupported { "com.sun.star.sdbc.ResultSet" };
+ Sequence< OUString > aSupported { "com.sun.star.sdbc.ResultSet" };
return aSupported;
}
@@ -1031,7 +1031,7 @@ Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( )
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-css::uno::WeakReferenceHelper aStatement(static_cast<OWeakObject*>(m_pStatement));
+ css::uno::WeakReferenceHelper aStatement(static_cast<OWeakObject*>(m_pStatement));
return aStatement.get();
}
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 7af9ebb81543..2d201c4be8cf 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -71,7 +71,7 @@ sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnDisplaySize( sal_Int32 /*nC
sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum )
{
- sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
+ sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
return evoab::getFieldType (nField);
}
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 8acf5507033b..757445866f40 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -64,7 +64,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
xRow->getString(5),
"",
"");
- xRet = pRet;
+ xRet = pRet;
}
}
@@ -80,7 +80,7 @@ void OEvoabTables::impl_refresh( )
void OEvoabTables::disposing()
{
-m_xMetaData.clear();
+ m_xMetaData.clear();
OCollection::disposing();
}
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index d617fdbfd774..eedda26efba2 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -42,7 +42,7 @@ void SAL_CALL OFileCatalog::disposing()
::osl::MutexGuard aGuard(m_aMutex);
typedef connectivity::sdbcx::OCatalog OFileCatalog_BASE;
-m_xMetaData.clear();
+ m_xMetaData.clear();
OFileCatalog_BASE::disposing();
}
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index ff71807d1bf4..2d72aa5b7330 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -119,9 +119,9 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType )
css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( )
{
- ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
- cppu::UnoType<XParameters>::get(),
- cppu::UnoType<XResultSetMetaDataSupplier>::get());
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
+ cppu::UnoType<XParameters>::get(),
+ cppu::UnoType<XResultSetMetaDataSupplier>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes());
}
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index ba2fba974d78..82e682c5a01d 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -636,9 +636,9 @@ void Connection::runBackupService(const short nAction)
}
isc_svc_handle aServiceHandle;
- aServiceHandle = attachServiceManager();
+ aServiceHandle = attachServiceManager();
- if (isc_service_start(aStatusVector,
+ if (isc_service_start(aStatusVector,
&aServiceHandle,
nullptr,
aRequest.getLength(),
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 97f35622ac8e..e6d9c87a07ee 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -66,8 +66,8 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
OFlatConnection* pCon = new OFlatConnection(this);
pCon->construct(url,info);
- Reference< XConnection > xCon = pCon;
- m_xConnections.push_back(WeakReferenceHelper(*pCon));
+ Reference< XConnection > xCon = pCon;
+ m_xConnections.push_back(WeakReferenceHelper(*pCon));
return xCon;
}
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 4fb5214d6301..be5c3c1230ae 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -51,7 +51,7 @@ OUString SAL_CALL OFlatResultSet::getImplementationName( )
Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( )
{
- Sequence< OUString > aSupported(2);
+ Sequence< OUString > aSupported(2);
aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported;
@@ -96,7 +96,7 @@ Sequence< Type > SAL_CALL OFlatResultSet::getTypes( )
// XRowLocate
Any SAL_CALL OFlatResultSet::getBookmark( )
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ ::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return makeAny(static_cast<sal_Int32>((m_aRow->get())[0]->getValue()));
@@ -105,7 +105,7 @@ Any SAL_CALL OFlatResultSet::getBookmark( )
sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark )
{
::osl::MutexGuard aGuard( m_aMutex );
- checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
m_bRowDeleted = m_bRowInserted = m_bRowUpdated = false;
@@ -116,8 +116,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark )
sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows )
{
::osl::MutexGuard aGuard( m_aMutex );
- checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
m_bRowDeleted = m_bRowInserted = m_bRowUpdated = false;
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 4f5b266b8201..f47166e989d3 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -94,7 +94,7 @@ void OTables::impl_refresh( )
void OTables::disposing()
{
-m_xMetaData.clear();
+ m_xMetaData.clear();
OCollection::disposing();
}
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 09e98f6d52af..8914d4e5b945 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -79,7 +79,7 @@ void HViews::impl_refresh( )
void HViews::disposing()
{
-m_xMetaData.clear();
+ m_xMetaData.clear();
OCollection::disposing();
}
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 2a1b153b9fd6..9a3dd6bf2955 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -810,7 +810,7 @@ bool java_sql_Connection::construct(const OUString& url,
m_aConnectionInfo = info;
} //mID
} //t.pEnv
- return object != nullptr;
+ return object != nullptr;
}
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 97f34155dc0d..7d13a5065734 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -154,7 +154,7 @@ jclass java_sql_Timestamp::st_getMyClass()
java_sql_Timestamp::java_sql_Timestamp(const css::util::DateTime& _rOut)
:java_util_Date( nullptr, nullptr )
{
- SDBThreadAttach t;
+ SDBThreadAttach t;
if( !t.pEnv )
return;
jvalue args[1];
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 77d70f7f9093..49103220a76a 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -930,9 +930,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
if(match(tableNamePattern, table,'\0'))
{
// TABLE_NAME
- aRow[2] = new ORowSetValueDecorator( table );
+ aRow[2] = new ORowSetValueDecorator( table );
- SAL_INFO("connectivity.mork", "\tTableName = : " << table);
+ SAL_INFO("connectivity.mork", "\tTableName = : " << table);
aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue();
aRows.push_back(aRow);
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index c88785246cee..9f3d2e38f33a 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1440,13 +1440,13 @@ sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno
{
ResultSetEntryGuard aGuard( *this );
SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
- sal_Int32 nFirst=0;
- sal_Int32 nSecond=0;
- sal_Int32 nResult=0;
+ sal_Int32 nFirst=0;
+ sal_Int32 nSecond=0;
+ sal_Int32 nResult=0;
- if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) {
- m_pStatement->getOwnConnection()->throwSQLException( STR_INVALID_BOOKMARK, *this );
- }
+ if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) {
+ m_pStatement->getOwnConnection()->throwSQLException( STR_INVALID_BOOKMARK, *this );
+ }
if(nFirst < nSecond)
nResult = CompareBookmark::LESS;
diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx
index 37a8771b0809..3823013457a8 100644
--- a/connectivity/source/drivers/mork/MTables.cxx
+++ b/connectivity/source/drivers/mork/MTables.cxx
@@ -60,7 +60,7 @@ void OTables::impl_refresh( )
void OTables::disposing()
{
-m_xMetaData.clear();
+ m_xMetaData.clear();
OCollection::disposing();
}
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 4c5de705124b..d343ed9fbee1 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -70,7 +70,7 @@ OUString SAL_CALL OResultSet::getImplementationName( )
Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( )
{
- Sequence< OUString > aSupported(2);
+ Sequence< OUString > aSupported(2);
aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported;
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 100c16c070f4..2065aa014737 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -239,7 +239,7 @@ Statics & getStatics()
statics.refl.columnDescriptor.implName =
"org.openoffice.comp.pq.sdbcx.ColumnDescriptor";
statics.refl.columnDescriptor.serviceNames = Sequence< OUString > ( 1 );
- statics.refl.columnDescriptor.serviceNames[0] =
+ statics.refl.columnDescriptor.serviceNames[0] =
"com.sun.star.sdbcx.ColumnDescriptor";
PropertyDef columnDescDef[] =
{
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 180ded29a0b8..043aea181a66 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -212,7 +212,7 @@ OUString columnMetaData2SDBCX(
// pBase->setPropertyValue_NoBroadcast_public(
// st.HELP_TEXT, makeAny( xRow->getString( DESCRIPTION ) ) );
// else // for key columns, etc. ...
- pBase->setPropertyValue_NoBroadcast_public(
+ pBase->setPropertyValue_NoBroadcast_public(
st.DESCRIPTION, makeAny( xRow->getString( DESCRIPTION ) ) );
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 396c3f65801e..87b450951121 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -74,7 +74,7 @@ Sequence< Type > SAL_CALL OUser::getTypes( )
::cppu::IPropertyArrayHelper* OUser::createArrayHelper( ) const
{
- Sequence< Property > aProps;
+ Sequence< Property > aProps;
describeProperties(aProps);
return new ::cppu::OPropertyArrayHelper(aProps);
More information about the Libreoffice-commits
mailing list