summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-10 08:12:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-10 08:12:16 +0100
commit4e1d0357313a9bf55e78b9228dcf96c829c56855 (patch)
tree9b31bc9fd8bd3471817a000718022ef794079ab7 /connectivity
parent1f145776d815a8669dbf68e4e9b2e2e9176bb034 (diff)
New loplugin:conststringvar: connectivity
Change-Id: I2c38bc842ee07d27a5a2ff084e8a608a858f4faa
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/calc/CConnection.cxx4
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Array.cxx16
-rw-r--r--connectivity/source/drivers/jdbc/Blob.cxx12
-rw-r--r--connectivity/source/drivers/jdbc/CallableStatement.cxx14
-rw-r--r--connectivity/source/drivers/jdbc/Clob.cxx12
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx24
-rw-r--r--connectivity/source/drivers/jdbc/InputStream.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/JBigDecimal.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/JConnection.cxx8
-rw-r--r--connectivity/source/drivers/jdbc/JStatement.cxx14
-rw-r--r--connectivity/source/drivers/jdbc/PreparedStatement.cxx30
-rw-r--r--connectivity/source/drivers/jdbc/Reader.cxx8
-rw-r--r--connectivity/source/drivers/jdbc/ResultSet.cxx24
-rw-r--r--connectivity/source/drivers/jdbc/Timestamp.cxx6
-rw-r--r--connectivity/source/drivers/jdbc/tools.cxx10
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.cxx2
18 files changed, 100 insertions, 100 deletions
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 97f8e333b1d8..c187256ecbda 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -84,13 +84,13 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu
m_aFileName = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
m_sPassword.clear();
- const char* pPwd = "password";
+ const char pPwd[] = "password";
const PropertyValue *pIter = info.getConstArray();
const PropertyValue *pEnd = pIter + info.getLength();
for(;pIter != pEnd;++pIter)
{
- if(pIter->Name.equalsAscii(pPwd))
+ if(pIter->Name == pPwd)
{
pIter->Value >>= m_sPassword;
break;
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 9d21a977d0af..a9975170727c 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -75,13 +75,13 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa
SAL_INFO("connectivity.evoab2", "OEvoabConnection::construct()::url = " << url );
OUString sPassword;
- const char* pPwd = "password";
+ const char pPwd[] = "password";
const PropertyValue *pIter = info.getConstArray();
const PropertyValue *pEnd = pIter + info.getLength();
for(;pIter != pEnd;++pIter)
{
- if(pIter->Name.equalsAscii(pPwd))
+ if(pIter->Name == pPwd)
{
pIter->Value >>= sPassword;
break;
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 03a9f48ddfc7..87928d901fe2 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -57,8 +57,8 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap);
- static const char * cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;";
- static const char * cMethodName = "getArray";
+ static const char * const cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;";
+ static const char * const cMethodName = "getArray";
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
// submit Java-Call
@@ -75,8 +75,8 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap);
- static const char * cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;";
- static const char * cMethodName = "getArray";
+ static const char * const cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;";
+ static const char * const cMethodName = "getArray";
// submit Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -95,8 +95,8 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS
// convert Parameter
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap);
// initialize temporary variable
- static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
- static const char * cMethodName = "getResultSet";
+ static const char * const cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
+ static const char * const cMethodName = "getResultSet";
// submit Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -115,8 +115,8 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS
// convert parameter
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap);
// initialize temporary variable
- static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
- static const char * cMethodName = "getResultSetAtIndex";
+ static const char * const cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
+ static const char * const cMethodName = "getResultSetAtIndex";
// submit Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index 7c972bc89aa6..9ec663127e77 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -55,8 +55,8 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(css::sdbc::SQLException, css:
{
// initialize temporary variable
- static const char * cSignature = "()J";
- static const char * cMethodName = "length";
+ static const char * const cSignature = "()J";
+ static const char * const cMethodName = "length";
// submit Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -72,8 +72,8 @@ css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos,
css::uno::Sequence< sal_Int8 > aSeq;
{
// initialize temporary variable
- static const char * cSignature = "(JI)[B";
- static const char * cMethodName = "getBytes";
+ static const char * const cSignature = "(JI)[B";
+ static const char * const cMethodName = "getBytes";
// submit Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -107,8 +107,8 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >
{
// initialize temporary variable
- static const char * cSignature = "([BI)J";
- static const char * cMethodName = "position";
+ static const char * const cSignature = "([BI)J";
+ static const char * const cMethodName = "position";
// submit Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 9a1aa1f5ce6c..c74ae7815552 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -212,8 +212,8 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame
createStatement(t.pEnv);
// initialize temporary variable
- static const char * cSignature = "(IILjava/lang/String;)V";
- static const char * cMethodName = "registerOutParameter";
+ static const char * const cSignature = "(IILjava/lang/String;)V";
+ static const char * const cMethodName = "registerOutParameter";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -232,8 +232,8 @@ void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32
{
createStatement(t.pEnv);
// initialize temporary variable
- static const char * cSignature = "(III)V";
- static const char * cMethodName = "registerOutParameter";
+ static const char * const cSignature = "(III)V";
+ static const char * const cMethodName = "registerOutParameter";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -321,7 +321,7 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/)
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
if( t.pEnv && !object ){
// initialize temporary variable
- static const char * cMethodName = "prepareCall";
+ static const char * const cMethodName = "prepareCall";
// execute Java-Call
jobject out = nullptr;
// convert Parameter
@@ -330,7 +330,7 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/)
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(Ljava/lang/String;II)Ljava/sql/CallableStatement;";
+ static const char * const cSignature = "(Ljava/lang/String;II)Ljava/sql/CallableStatement;";
mID = t.pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature );
}
if( mID ){
@@ -338,7 +338,7 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/)
} //mID
else
{
- static const char * cSignature2 = "(Ljava/lang/String;)Ljava/sql/CallableStatement;";
+ static const char * const cSignature2 = "(Ljava/lang/String;)Ljava/sql/CallableStatement;";
static jmethodID mID2 = t.pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature2 );OSL_ENSURE(mID2,"Unknown method id!");
if( mID2 ){
out = t.pEnv->CallObjectMethod( m_pConnection->getJavaObject(), mID2, str.get() );
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index 9bbbed12c6e3..44424c9084ae 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -54,8 +54,8 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(css::sdbc::SQLException, css:
{
// initialize temporary variable
- static const char * cSignature = "()J";
- static const char * cMethodName = "length";
+ static const char * const cSignature = "()J";
+ static const char * const cMethodName = "length";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -71,8 +71,8 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin
OUString aStr;
{
// initialize temporary variable
- static const char * cSignature = "(JI)Ljava/lang/String;";
- static const char * cMethodName = "getSubString";
+ static const char * const cSignature = "(JI)Ljava/lang/String;";
+ static const char * const cMethodName = "getSubString";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -104,8 +104,8 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32
// convert Parameter
args[0].l = convertwchar_tToJavaString(t.pEnv,searchstr);
// initialize temporary Variable
- static const char * cSignature = "(Ljava/lang/String;I)J";
- static const char * cMethodName = "position";
+ static const char * const cSignature = "(Ljava/lang/String;I)J";
+ static const char * const cMethodName = "position";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 741e4db463a2..acc09749faa9 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -105,7 +105,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns(
Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException, std::exception)
{
- static const char * cMethodName = "getTables";
+ static const char * const cMethodName = "getTables";
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName );
@@ -113,7 +113,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
- static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/sql/ResultSet;";
+ static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/sql/ResultSet;";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -334,7 +334,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
const Any& catalog, const OUString& schema, const OUString& table,
sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception)
{
- static const char * cMethodName = "getIndexInfo";
+ static const char * const cMethodName = "getIndexInfo";
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName );
@@ -342,7 +342,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
- static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Ljava/sql/ResultSet;";
+ static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Ljava/sql/ResultSet;";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -375,7 +375,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier
const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception)
{
- static const char * cMethodName = "getBestRowIdentifier";
+ static const char * const cMethodName = "getBestRowIdentifier";
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName );
@@ -383,7 +383,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
- static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Ljava/sql/ResultSet;";
+ static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Ljava/sql/ResultSet;";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -492,13 +492,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference(
const OUString& primaryTable, const Any& foreignCatalog,
const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception)
{
- static const char * cMethodName = "getCrossReference";
+ static const char * const cMethodName = "getCrossReference";
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName );
jobject out(nullptr);
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
- static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;";
+ static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -990,7 +990,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) t
sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception)
{
- static const char* pMethodName = "supportsConvert";
+ static const char* const pMethodName = "supportsConvert";
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, fromType, toType );
jboolean out( false );
@@ -1332,7 +1332,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 se
sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception)
{
- static const char* pMethodName = "supportsResultSetConcurrency";
+ static const char* const pMethodName = "supportsResultSetConcurrency";
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, setType, concurrency );
jboolean out( false );
@@ -1418,8 +1418,8 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs(
{
- static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[I)Ljava/sql/ResultSet;";
- static const char * cMethodName = "getUDTs";
+ static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[I)Ljava/sql/ResultSet;";
+ static const char * const cMethodName = "getUDTs";
// dismiss Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index d64870eb71f4..c63a1e491168 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -87,8 +87,8 @@ sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8
{
jbyteArray pByteArray = t.pEnv->NewByteArray(nBytesToRead);
- static const char * cSignature = "([BII)I";
- static const char * cMethodName = "read";
+ static const char * const cSignature = "([BII)I";
+ static const char * const cMethodName = "read";
// execute Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwRuntime(t.pEnv, cMethodName,cSignature, mID);
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index 24abdb8789db..8263225bcae4 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -45,7 +45,7 @@ java_math_BigDecimal::java_math_BigDecimal( const OUString& _par0 ): java_lang_O
return;
// Java-Call for the Constructor
// initialize temporary Variable
- static const char * cSignature = "(Ljava/lang/String;)V";
+ static const char * const cSignature = "(Ljava/lang/String;)V";
jobject tempObj;
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, "<init>",cSignature, mID);
@@ -66,7 +66,7 @@ java_math_BigDecimal::java_math_BigDecimal( const double& _par0 ): java_lang_Obj
return;
// Java-Call for the Constructor
// initialize temporary Variable
- static const char * cSignature = "(D)V";
+ static const char * const cSignature = "(D)V";
jobject tempObj;
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, "<init>",cSignature, mID);
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 76450d8a2d11..b311573fa8d3 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -536,8 +536,8 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQ
{
// initialize temporary Variable
- static const char * cSignature = "(Ljava/lang/String;)Ljava/lang/String;";
- static const char * cMethodName = "nativeSQL";
+ static const char * const cSignature = "(Ljava/lang/String;)Ljava/lang/String;";
+ static const char * const cMethodName = "nativeSQL";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -810,8 +810,8 @@ bool java_sql_Connection::construct(const OUString& url,
if ( t.pEnv && m_Driver_theClass && m_pDriverobject )
{
// Java-Call
- static const char * cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;";
- static const char * cMethodName = "connect";
+ static const char * const cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;";
+ static const char * const cMethodName = "connect";
jmethodID mID = t.pEnv->GetMethodID( m_Driver_theClass, cMethodName, cSignature );
if ( mID )
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index bf405a5c488e..9154c5c07efc 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -226,8 +226,8 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(
createStatement(t.pEnv);
m_sSqlStatement = sql;
// initialize temporary Variable
- static const char * cSignature = "(Ljava/lang/String;)Z";
- static const char * cMethodName = "execute";
+ static const char * const cSignature = "(Ljava/lang/String;)Z";
+ static const char * const cMethodName = "execute";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -261,8 +261,8 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU
createStatement(t.pEnv);
m_sSqlStatement = sql;
// initialize temporary variable
- static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/ResultSet;";
- static const char * cMethodName = "executeQuery";
+ static const char * const cSignature = "(Ljava/lang/String;)Ljava/sql/ResultSet;";
+ static const char * const cMethodName = "executeQuery";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -773,13 +773,13 @@ void java_sql_Statement::createStatement(JNIEnv* _pEnv)
if( _pEnv && !object ){
// initialize temporary variable
- static const char * cMethodName = "createStatement";
+ static const char * const cMethodName = "createStatement";
// Java-Call
jobject out = nullptr;
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(II)Ljava/sql/Statement;";
+ static const char * const cSignature = "(II)Ljava/sql/Statement;";
mID = _pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature );
}
if( mID ){
@@ -787,7 +787,7 @@ void java_sql_Statement::createStatement(JNIEnv* _pEnv)
} //mID
else
{
- static const char * cSignature2 = "()Ljava/sql/Statement;";
+ static const char * const cSignature2 = "()Ljava/sql/Statement;";
static jmethodID mID2 = _pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature2 );OSL_ENSURE(mID2,"Unknown method id!");
if( mID2 ){
out = _pEnv->CallObjectMethod( m_pConnection->getJavaObject(), mID2);
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 1762c6229528..526cda6c1c42 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -127,8 +127,8 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{ // initialize temporary Variable
createStatement(t.pEnv);
- static const char * cSignature = "(ILjava/lang/String;)V";
- static const char * cMethodName = "setString";
+ static const char * const cSignature = "(ILjava/lang/String;)V";
+ static const char * const cMethodName = "setString";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -328,8 +328,8 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
createStatement(t.pEnv);
// initialize temporary Variable
- static const char * cSignature = "(ILjava/lang/Object;II)V";
- static const char * cMethodName = "setObject";
+ static const char * const cSignature = "(ILjava/lang/Object;II)V";
+ static const char * const cMethodName = "setObject";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -427,8 +427,8 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co
createStatement(t.pEnv);
// initialize temporary Variable
- static const char * cSignature = "(I[B)V";
- static const char * cMethodName = "setBytes";
+ static const char * const cSignature = "(I[B)V";
+ static const char * const cMethodName = "setBytes";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -461,8 +461,8 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete
createStatement(t.pEnv);
// initialize temporary variable
- static const char * cSignature = "(ILjava/io/InputStream;I)V";
- static const char * cMethodName = "setCharacterStream";
+ static const char * const cSignature = "(ILjava/io/InputStream;I)V";
+ static const char * const cMethodName = "setCharacterStream";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -491,7 +491,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete
if ( !mID2 )
{
// initialize temporary variable
- const char * cSignatureStream = "([BII)V";
+ const char * const cSignatureStream = "([BII)V";
mID2 = t.pEnv->GetMethodID( aClass, "<init>", cSignatureStream );
}
jobject tempObj = nullptr;
@@ -518,8 +518,8 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn
{
createStatement(t.pEnv);
// initialize temporary variable
- static const char * cSignature = "(ILjava/io/InputStream;I)V";
- static const char * cMethodName = "setBinaryStream";
+ static const char * const cSignature = "(ILjava/io/InputStream;I)V";
+ static const char * const cMethodName = "setBinaryStream";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -550,7 +550,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn
if ( !mID2 )
{
// initialize temporary variable
- const char * cSignatureStream = "([BII)V";
+ const char * const cSignatureStream = "([BII)V";
mID2 = t.pEnv->GetMethodID( aClass, "<init>", cSignatureStream );
}
jobject tempObj = nullptr;
@@ -656,7 +656,7 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv)
if( !object && _pEnv ){
// initialize temporary variable
- static const char * cMethodName = "prepareStatement";
+ static const char * const cMethodName = "prepareStatement";
jvalue args[1];
// convert Parameter
@@ -666,7 +666,7 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv)
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(Ljava/lang/String;II)Ljava/sql/PreparedStatement;";
+ static const char * const cSignature = "(Ljava/lang/String;II)Ljava/sql/PreparedStatement;";
mID = _pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature );
}
if( mID )
@@ -678,7 +678,7 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv)
static jmethodID mID2 = nullptr;
if ( !mID2 )
{
- static const char * cSignature2 = "(Ljava/lang/String;)Ljava/sql/PreparedStatement;";
+ static const char * const cSignature2 = "(Ljava/lang/String;)Ljava/sql/PreparedStatement;";
mID2 = _pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature2 );
}
if ( mID2 )
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 2f391505fb87..13ab23892e1a 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -82,8 +82,8 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(css::io::NotConnectedExce
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
- static const char * cSignature = "()Z";
- static const char * cMethodName = "ready";
+ static const char * const cSignature = "()Z";
+ static const char * const cMethodName = "ready";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwRuntime(t.pEnv, cMethodName,cSignature, mID);
@@ -133,8 +133,8 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aD
{
jcharArray pCharArray = t.pEnv->NewCharArray(nCharsToRead);
- static const char * cSignature = "([CII)I";
- static const char * cMethodName = "read";
+ static const char * const cSignature = "([CII)I";
+ static const char * const cMethodName = "read";
// Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwRuntime(t.pEnv, cMethodName,cSignature, mID);
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index e8133d31a2ca..3550d736fbe1 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -301,8 +301,8 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(I)Ljava/lang/Object;";
- static const char * cMethodName = "getObject";
+ static const char * const cSignature = "(I)Ljava/lang/Object;";
+ static const char * const cMethodName = "getObject";
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
}
@@ -627,8 +627,8 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(ILjava/lang/String;)V";
- static const char * cMethodName = "updateString";
+ static const char * const cSignature = "(ILjava/lang/String;)V";
+ static const char * const cMethodName = "updateString";
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
}
@@ -653,8 +653,8 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css:
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(I[B)V";
- static const char * cMethodName = "updateBytes";
+ static const char * const cSignature = "(I[B)V";
+ static const char * const cMethodName = "updateBytes";
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
}
@@ -715,8 +715,8 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(ILjava/io/InputStream;I)V";
- static const char * cMethodName = "updateBinaryStream";
+ static const char * const cSignature = "(ILjava/io/InputStream;I)V";
+ static const char * const cMethodName = "updateBinaryStream";
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
}
@@ -746,8 +746,8 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex,
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(ILjava/io/Reader;I)V";
- static const char * cMethodName = "updateCharacterStream";
+ static const char * const cSignature = "(ILjava/io/Reader;I)V";
+ static const char * const cMethodName = "updateCharacterStream";
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
}
@@ -793,8 +793,8 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(ILjava/lang/Object;I)V";
- static const char * cMethodName = "updateObject";
+ static const char * const cSignature = "(ILjava/lang/Object;I)V";
+ static const char * const cMethodName = "updateObject";
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
}
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index e6a99e0fbc24..1c8039e08c6f 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -46,7 +46,7 @@ java_sql_Date::java_sql_Date( const css::util::Date& _rOut ) : java_util_Date( n
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/Date;";
+ static const char * const cSignature = "(Ljava/lang/String;)Ljava/sql/Date;";
mID = t.pEnv->GetStaticMethodID( getMyClass(), "valueOf", cSignature );
}
OSL_ENSURE(mID,"Unknown method id!");
@@ -115,7 +115,7 @@ java_sql_Time::java_sql_Time( const css::util::Time& _rOut ): java_util_Date( nu
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/Time;";
+ static const char * const cSignature = "(Ljava/lang/String;)Ljava/sql/Time;";
mID = t.pEnv->GetStaticMethodID( getMyClass(), "valueOf", cSignature );
}
OSL_ENSURE(mID,"Unknown method id!");
@@ -171,7 +171,7 @@ java_sql_Timestamp::java_sql_Timestamp(const css::util::DateTime& _rOut)
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/Timestamp;";
+ static const char * const cSignature = "(Ljava/lang/String;)Ljava/sql/Timestamp;";
mID = t.pEnv->GetStaticMethodID( getMyClass(), "valueOf", cSignature );
}
OSL_ENSURE(mID,"Unknown method id!");
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index 78e27dd5696e..f1759cd77eb4 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -46,8 +46,8 @@ void java_util_Properties::setProperty(const OUString& key, const OUString& valu
args[0].l = convertwchar_tToJavaString(t.pEnv,key);
args[1].l = convertwchar_tToJavaString(t.pEnv,value);
// Initialize temporary Variables
- static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;";
- static const char * cMethodName = "setProperty";
+ static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;";
+ static const char * const cMethodName = "setProperty";
// Turn off Java-Call
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
@@ -82,7 +82,7 @@ java_util_Properties::java_util_Properties( ): java_lang_Object( nullptr, nullpt
return;
// Turn off Java-Call for the constructor
// Initialize temperary Variables
- static const char * cSignature = "()V";
+ static const char * const cSignature = "()V";
jobject tempObj;
static jmethodID mID(nullptr);
obtainMethodId_throwSQL(t.pEnv, "<init>",cSignature, mID);
@@ -212,7 +212,7 @@ jobject connectivity::createByteInputStream(const css::uno::Reference< css::io::
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "([B)V";
+ static const char * const cSignature = "([B)V";
mID = t.pEnv->GetMethodID( clazz, "<init>", cSignature );
OSL_ENSURE( mID, cSignature );
if ( !mID )
@@ -239,7 +239,7 @@ jobject connectivity::createCharArrayReader(const css::uno::Reference< css::io::
static jmethodID mID(nullptr);
if ( !mID )
{
- static const char * cSignature = "([C)V";
+ static const char * const cSignature = "([C)V";
mID = t.pEnv->GetMethodID( clazz, "<init>", cSignature );
OSL_ENSURE( mID, cSignature );
if ( !mID )
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 65ba48c2ccd2..a363aa2d40c9 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -110,7 +110,7 @@ namespace
else
{
OUString sProductDirCandidate;
- const char* pProfileRegistry = "profiles.ini";
+ const char pProfileRegistry[] = "profiles.ini";
// check all possible candidates
for ( size_t i=0; i<NB_CANDIDATES; ++i )
@@ -123,7 +123,7 @@ namespace
// check existence
::osl::DirectoryItem aRegistryItem;
- ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + OUString::createFromAscii( pProfileRegistry ), aRegistryItem );
+ ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + pProfileRegistry, aRegistryItem );
if ( result == ::osl::FileBase::E_None )
{
::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index d809da7e3eb1..27a931da2919 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -135,7 +135,7 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper()
static bool isOperator( char c )
{
- static const char * operators = "<>=()!/&%.,;";
+ static const char * const operators = "<>=()!/&%.,;";
const char * w = operators;
while (*w && *w != c)