[Libreoffice-commits] core.git: connectivity/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 30 21:18:51 UTC 2020
connectivity/source/commontools/conncleanup.cxx | 2 -
connectivity/source/commontools/dbconversion.cxx | 2 -
connectivity/source/cpool/ZConnectionPool.cxx | 2 -
connectivity/source/drivers/evoab2/EApi.cxx | 10 ++---
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 8 ++--
connectivity/source/drivers/file/FNumericFunctions.cxx | 2 -
connectivity/source/drivers/firebird/Connection.cxx | 4 +-
connectivity/source/drivers/firebird/Driver.hxx | 2 -
connectivity/source/drivers/mork/MConnection.cxx | 2 -
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 8 ++--
connectivity/source/drivers/mork/MResultSet.cxx | 2 -
connectivity/source/drivers/mork/MorkParser.cxx | 2 -
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 4 +-
connectivity/source/drivers/postgresql/pq_baseresultset.hxx | 14 +++----
connectivity/source/drivers/postgresql/pq_connection.cxx | 2 -
connectivity/source/drivers/postgresql/pq_driver.cxx | 2 -
connectivity/source/drivers/postgresql/pq_preparedstatement.hxx | 18 +++++-----
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 2 -
connectivity/source/drivers/postgresql/pq_statement.hxx | 18 +++++-----
connectivity/source/drivers/postgresql/pq_statics.hxx | 10 ++---
20 files changed, 58 insertions(+), 58 deletions(-)
New commits:
commit 57e8d6837c8bb72bb44930d78b9764789be80124
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jun 30 18:52:16 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jun 30 23:18:11 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: connectivity
Change-Id: I959a520f240faab062ecd4f6e2658d9fc9ce709f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97545
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index d0198df5f494..c33cc7289a65 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -35,7 +35,7 @@ namespace dbtools
using namespace css::sdbc;
using namespace css::lang;
- static const char ACTIVE_CONNECTION_PROPERTY_NAME[] = "ActiveConnection";
+ const char ACTIVE_CONNECTION_PROPERTY_NAME[] = "ActiveConnection";
OAutoConnectionDisposer::OAutoConnectionDisposer(const Reference< XRowSet >& _rxRowSet, const Reference< XConnection >& _rxConnection)
:m_xRowSet( _rxRowSet )
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 3dd42e9cadee..dbe942a3fd01 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -152,7 +152,7 @@ namespace dbtools
}
- static const sal_Int32 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
+ const sal_Int32 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
31, 31, 30, 31, 30, 31 };
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index d233599a4227..7d05b6e0236b 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -41,7 +41,7 @@ void SAL_CALL OPoolTimer::onShot()
m_pPool->invalidatePooledConnections();
}
-static const char TIMEOUT_NODENAME[] = "Timeout";
+const char TIMEOUT_NODENAME[] = "Timeout";
OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
const Reference< XInterface >& _xDriverNode,
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index 12096bdade87..56a957fabb63 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -49,7 +49,7 @@ struct ApiMap
}
-static const ApiMap aCommonApiMap[] =
+const ApiMap aCommonApiMap[] =
{
SYM_MAP( eds_check_version ),
SYM_MAP( e_contact_field_name ),
@@ -72,7 +72,7 @@ static const ApiMap aCommonApiMap[] =
};
//< 3.6 api
-static const ApiMap aOldApiMap[] =
+const ApiMap aOldApiMap[] =
{
SYM_MAP( e_book_get_addressbooks ),
SYM_MAP( e_book_get_uri ),
@@ -85,7 +85,7 @@ static const ApiMap aOldApiMap[] =
};
//>= 3.6 api
-static const ApiMap aNewApiMap[] =
+const ApiMap aNewApiMap[] =
{
SYM_MAP( e_source_registry_list_sources ),
SYM_MAP( e_source_registry_new_sync ),
@@ -102,13 +102,13 @@ static const ApiMap aNewApiMap[] =
};
//== indirect read access (3.6 only)
-static const ApiMap aClientApiMap36[] =
+const ApiMap aClientApiMap36[] =
{
SYM_MAP( e_book_client_new )
};
//>= direct read access API (>= 3.8)
-static const ApiMap aClientApiMap38[] =
+const ApiMap aClientApiMap38[] =
{
SYM_MAP( e_book_client_connect_direct_sync )
};
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 9eb6f1d34862..ef39382d058d 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -46,10 +46,10 @@ namespace
namespace connectivity::evoab
{
- static sal_Int32 const s_nCOLUMN_SIZE = 256;
- static sal_Int32 const s_nDECIMAL_DIGITS = 0;
- static sal_Int32 const s_nNULLABLE = 1;
- static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
+ sal_Int32 const s_nCOLUMN_SIZE = 256;
+ sal_Int32 const s_nDECIMAL_DIGITS = 0;
+ sal_Int32 const s_nNULLABLE = 1;
+ sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
static ColumnProperty **pFields=nullptr;
static guint nFields = 0;
diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index d2188cbbc4b9..a6784a55c140 100644
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -25,7 +25,7 @@
using namespace connectivity;
using namespace connectivity::file;
-static const double fPi = 3.14159265358979323846;
+const double fPi = 3.14159265358979323846;
ORowSetValue OOp_Abs::operate(const ORowSetValue& lhs) const
{
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index b5a3c4ce748a..6e42831f21d5 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -72,11 +72,11 @@ using namespace ::com::sun::star::uno;
* Location within the .odb that an embedded .fdb will be stored.
* Only relevant for embedded dbs.
*/
-static const OUStringLiteral our_sFDBLocation( "firebird.fdb" );
+const OUStringLiteral our_sFDBLocation( "firebird.fdb" );
/**
* Older version of LO may store the database in a .fdb file
*/
-static const OUStringLiteral our_sFBKLocation( "firebird.fbk" );
+const OUStringLiteral our_sFBKLocation( "firebird.fbk" );
Connection::Connection()
: Connection_BASE(m_aMutex)
diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx
index 8fcf17fa2665..39534c3a1c6d 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -36,7 +36,7 @@ namespace connectivity
// The SQL dialect in use
// Has to be used in various isc_* calls.
// 3: Is IB6 -- minimum required for delimited identifiers.
- static const int FIREBIRD_SQL_DIALECT = 3;
+ const int FIREBIRD_SQL_DIALECT = 3;
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index e6658b6dc4b3..2e1c08d0cdcf 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star::sdbcx;
namespace connectivity::mork {
-static const int defaultScope = 0x80;
+const int defaultScope = 0x80;
OConnection::OConnection(MorkDriver* _pDriver)
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 7858230b07f6..5155bf93c58a 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -26,10 +26,10 @@ using namespace com::sun::star::sdbc;
namespace connectivity::mork
{
- static sal_Int32 const s_nCOLUMN_SIZE = 256;
- static sal_Int32 const s_nDECIMAL_DIGITS = 0;
- static sal_Int32 const s_nNULLABLE = 1;
- static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
+ sal_Int32 const s_nCOLUMN_SIZE = 256;
+ sal_Int32 const s_nDECIMAL_DIGITS = 0;
+ sal_Int32 const s_nNULLABLE = 1;
+ sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
}
ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index ab6b11a9d490..6918479a86c0 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -665,7 +665,7 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchStr
#define WILDCARD "%"
#define ALT_WILDCARD "*"
-static const sal_Unicode MATCHCHAR = '_';
+const sal_Unicode MATCHCHAR = '_';
void OResultSet::analyseWhereClause( const OSQLParseNode* parseTree,
MQueryExpression &queryExpression)
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx
index 188f8e6fb492..3b8b38120b3b 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -44,7 +44,7 @@ std::string const g_Empty = "";
const char * const MorkDictColumnMeta = "<(a=c)>";
-static const int defaultScope_ = 0x80;
+const int defaultScope_ = 0x80;
MorkParser::MorkParser() :
columns_(),
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 2c92613d2196..71c70c641b30 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -66,7 +66,7 @@ namespace
// ProductRootEnvironmentVariable *must* match the constants
// (minus 1) in offapi/com/sun/star/mozilla/MozillaProductType.idl
// DO NOT CHANGE THE ORDER; ADD ONLY TO THE END
- static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
+ const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
{
#if defined(_WIN32)
{ "Mozilla/SeaMonkey/", nullptr, nullptr, nullptr },
@@ -83,7 +83,7 @@ namespace
#endif
};
- static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] =
+ const char* ProductRootEnvironmentVariable[NB_PRODUCTS] =
{
"MOZILLA_PROFILE_ROOT",
"MOZILLA_FIREFOX_PROFILE_ROOT",
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
index 27ec2e62a5f1..8b062ddf9ac0 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
@@ -49,13 +49,13 @@
namespace pq_sdbc_driver
{
-static const sal_Int32 BASERESULTSET_CURSOR_NAME = 0;
-static const sal_Int32 BASERESULTSET_ESCAPE_PROCESSING = 1;
-static const sal_Int32 BASERESULTSET_FETCH_DIRECTION = 2;
-static const sal_Int32 BASERESULTSET_FETCH_SIZE = 3;
-static const sal_Int32 BASERESULTSET_IS_BOOKMARKABLE = 4;
-static const sal_Int32 BASERESULTSET_RESULT_SET_CONCURRENCY = 5;
-static const sal_Int32 BASERESULTSET_RESULT_SET_TYPE = 6;
+const sal_Int32 BASERESULTSET_CURSOR_NAME = 0;
+const sal_Int32 BASERESULTSET_ESCAPE_PROCESSING = 1;
+const sal_Int32 BASERESULTSET_FETCH_DIRECTION = 2;
+const sal_Int32 BASERESULTSET_FETCH_SIZE = 3;
+const sal_Int32 BASERESULTSET_IS_BOOKMARKABLE = 4;
+const sal_Int32 BASERESULTSET_RESULT_SET_CONCURRENCY = 5;
+const sal_Int32 BASERESULTSET_RESULT_SET_TYPE = 6;
#define BASERESULTSET_SIZE 7
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 66c30c893aed..b87939813bad 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -584,7 +584,7 @@ static Reference< XInterface > ConnectionCreateInstance(
} // end namespace
-static const struct cppu::ImplementationEntry g_entries[] =
+const struct cppu::ImplementationEntry g_entries[] =
{
{
pq_sdbc_driver::ConnectionCreateInstance, pq_sdbc_driver::ConnectionGetImplementationName,
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 99571112cd90..08877c356c19 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -261,7 +261,7 @@ void OOneInstanceComponentFactory::disposing()
}
-static const struct cppu::ImplementationEntry g_entries[] =
+const struct cppu::ImplementationEntry g_entries[] =
{
{
pq_sdbc_driver::DriverCreateInstance, pq_sdbc_driver::DriverGetImplementationName,
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
index 01eb2441f120..eb0794f9efe0 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
@@ -52,15 +52,15 @@
namespace pq_sdbc_driver
{
-static const sal_Int32 PREPARED_STATEMENT_CURSOR_NAME = 0;
-static const sal_Int32 PREPARED_STATEMENT_ESCAPE_PROCESSING = 1;
-static const sal_Int32 PREPARED_STATEMENT_FETCH_DIRECTION = 2;
-static const sal_Int32 PREPARED_STATEMENT_FETCH_SIZE = 3;
-static const sal_Int32 PREPARED_STATEMENT_MAX_FIELD_SIZE = 4;
-static const sal_Int32 PREPARED_STATEMENT_MAX_ROWS = 5;
-static const sal_Int32 PREPARED_STATEMENT_QUERY_TIME_OUT = 6;
-static const sal_Int32 PREPARED_STATEMENT_RESULT_SET_CONCURRENCY = 7;
-static const sal_Int32 PREPARED_STATEMENT_RESULT_SET_TYPE = 8;
+const sal_Int32 PREPARED_STATEMENT_CURSOR_NAME = 0;
+const sal_Int32 PREPARED_STATEMENT_ESCAPE_PROCESSING = 1;
+const sal_Int32 PREPARED_STATEMENT_FETCH_DIRECTION = 2;
+const sal_Int32 PREPARED_STATEMENT_FETCH_SIZE = 3;
+const sal_Int32 PREPARED_STATEMENT_MAX_FIELD_SIZE = 4;
+const sal_Int32 PREPARED_STATEMENT_MAX_ROWS = 5;
+const sal_Int32 PREPARED_STATEMENT_QUERY_TIME_OUT = 6;
+const sal_Int32 PREPARED_STATEMENT_RESULT_SET_CONCURRENCY = 7;
+const sal_Int32 PREPARED_STATEMENT_RESULT_SET_TYPE = 8;
#define PREPARED_STATEMENT_SIZE 9
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 0452324a16cb..fbe10f82dacb 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -88,7 +88,7 @@ namespace pq_sdbc_driver
// };
// is not exported by the postgres header
-const static int PQ_VARHDRSZ = sizeof( sal_Int32 );
+const int PQ_VARHDRSZ = sizeof( sal_Int32 );
static void extractPrecisionAndScale( sal_Int32 atttypmod, sal_Int32 *precision, sal_Int32 *scale )
{
diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index e53c203af6d6..8e93c07b7125 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -50,15 +50,15 @@
namespace pq_sdbc_driver
{
-static const sal_Int32 STATEMENT_CURSOR_NAME = 0;
-static const sal_Int32 STATEMENT_ESCAPE_PROCESSING = 1;
-static const sal_Int32 STATEMENT_FETCH_DIRECTION = 2;
-static const sal_Int32 STATEMENT_FETCH_SIZE = 3;
-static const sal_Int32 STATEMENT_MAX_FIELD_SIZE = 4;
-static const sal_Int32 STATEMENT_MAX_ROWS = 5;
-static const sal_Int32 STATEMENT_QUERY_TIME_OUT = 6;
-static const sal_Int32 STATEMENT_RESULT_SET_CONCURRENCY = 7;
-static const sal_Int32 STATEMENT_RESULT_SET_TYPE = 8;
+const sal_Int32 STATEMENT_CURSOR_NAME = 0;
+const sal_Int32 STATEMENT_ESCAPE_PROCESSING = 1;
+const sal_Int32 STATEMENT_FETCH_DIRECTION = 2;
+const sal_Int32 STATEMENT_FETCH_SIZE = 3;
+const sal_Int32 STATEMENT_MAX_FIELD_SIZE = 4;
+const sal_Int32 STATEMENT_MAX_ROWS = 5;
+const sal_Int32 STATEMENT_QUERY_TIME_OUT = 6;
+const sal_Int32 STATEMENT_RESULT_SET_CONCURRENCY = 7;
+const sal_Int32 STATEMENT_RESULT_SET_TYPE = 8;
#define STATEMENT_SIZE 9
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index 78051cd69689..017f49b5a655 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -128,11 +128,11 @@ struct ReflectionImplementations
struct ImplementationStatics resultSet;
};
-static const sal_Int32 TABLE_INDEX_CATALOG = 0;
-static const sal_Int32 TABLE_INDEX_SCHEMA = 1;
-static const sal_Int32 TABLE_INDEX_NAME = 2;
-static const sal_Int32 TABLE_INDEX_TYPE = 3;
-static const sal_Int32 TABLE_INDEX_REMARKS = 4;
+const sal_Int32 TABLE_INDEX_CATALOG = 0;
+const sal_Int32 TABLE_INDEX_SCHEMA = 1;
+const sal_Int32 TABLE_INDEX_NAME = 2;
+const sal_Int32 TABLE_INDEX_TYPE = 3;
+const sal_Int32 TABLE_INDEX_REMARKS = 4;
struct Statics
{
More information about the Libreoffice-commits
mailing list