mysqlc/source/mysqlc_connection.hxx | 7 +------
mysqlc/source/mysqlc_databasemetadata.hxx | 4 +---
mysqlc/source/mysqlc_preparedstatement.hxx | 4 +---
mysqlc/source/mysqlc_resultset.hxx | 3 +--
mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 ++--
mysqlc/source/mysqlc_statement.hxx | 3 +--
6 files changed, 7 insertions(+), 18 deletions(-)
New commits:
commit 6084ca8a637abb57b3d7236c303e22afa6423b43
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Oct 31 14:42:47 2017 +0200
loplugin:finalclasses in mysqlc
Change-Id: I3f0ae04c30e863c123404c6e99f7ae27bc5715c7
Reviewed-on: https://gerrit.libreoffice.org/44134
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index b3fd5a78bfe9..63c121c99a2e 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -82,20 +82,15 @@ namespace connectivity
typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray;
- class OConnection : public OBase_Mutex,
+ class OConnection final : public OBase_Mutex,
public OConnection_BASE,
public
connectivity::mysqlc::OSubComponent<OConnection, OConnection_BASE>
{
friend class connectivity::mysqlc::OSubComponent<OConnection,
OConnection_BASE>;
- private:
ConnectionSettings m_settings;
-
- private:
css::uno::Reference< css::container::XNameAccess > m_typeMap;
css::uno::Reference< css::util::XStringSubstitution >
m_xParameterSubstitution;
- protected:
-
// Data attributes
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx
b/mysqlc/source/mysqlc_databasemetadata.hxx
index 172c5ee364bd..9f09e534215d 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -39,15 +39,13 @@ namespace connectivity
typedef ::cppu::WeakImplHelper1< css::sdbc::XDatabaseMetaData>
ODatabaseMetaData_BASE;
- class ODatabaseMetaData : public ODatabaseMetaData_BASE
+ class ODatabaseMetaData final : public ODatabaseMetaData_BASE
{
OConnection& m_rConnection;
- protected:
sql::DatabaseMetaData * meta;
rtl::OUString identifier_quote_string;
bool identifier_quote_string_set;
- private:
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName,
const sql::SQLString& (sql::DatabaseMetaData::*Method)() );
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName,
sql::SQLString (sql::DatabaseMetaData::*Method)() );
sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName,
unsigned int (sql::DatabaseMetaData::*Method)() );
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx
b/mysqlc/source/mysqlc_preparedstatement.hxx
index 652b3558f012..b82f88ecac38 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -47,16 +47,14 @@ namespace connectivity
css::sdbc::XResultSetMetaDataSupplier,
css::lang::XServiceInfo>
OPreparedStatement_BASE;
- class OPreparedStatement : public OCommonStatement,
+ class OPreparedStatement final : public OCommonStatement,
public OPreparedStatement_BASE
{
- protected:
unsigned int m_paramCount; // number of placeholders
Reference< XResultSetMetaData > m_xMetaData;
void checkParameterIndex(sal_Int32 parameter);
- protected:
void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
const Any& rValue) SAL_OVERRIDE;
virtual ~OPreparedStatement();
public:
diff --git a/mysqlc/source/mysqlc_resultset.hxx
b/mysqlc/source/mysqlc_resultset.hxx
index 5ed4f8c9d0d2..a05cbb88cef6 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -63,12 +63,11 @@ namespace connectivity
css::sdbc::XColumnLocate,
css::lang::XServiceInfo>
OResultSet_BASE;
- class OResultSet : public OBase_Mutex,
+ class OResultSet final : public OBase_Mutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public OPropertyArrayUsageHelper<OResultSet>
{
- protected:
css::uno::WeakReferenceHelper m_aStatement;
css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData;
sql::ResultSet *m_result;
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx
b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 4a5282643b32..d8ad1217e00b 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -38,11 +38,11 @@ namespace connectivity
typedef ::cppu::WeakImplHelper1< css::sdbc::XResultSetMetaData>
OResultSetMetaData_BASE;
- class OResultSetMetaData : public OResultSetMetaData_BASE
+ class OResultSetMetaData final : public OResultSetMetaData_BASE
{
sql::ResultSetMetaData * meta;
rtl_TextEncoding m_encoding;
- protected:
+
virtual ~OResultSetMetaData();
public:
OResultSetMetaData( sql::ResultSetMetaData * _meta,
rtl_TextEncoding _encoding )
diff --git a/mysqlc/source/mysqlc_statement.hxx
b/mysqlc/source/mysqlc_statement.hxx
index 4a9e754ce175..5e9c0be3b611 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -150,12 +150,11 @@ namespace connectivity
};
- class OStatement : public OCommonStatement,
+ class OStatement final : public OCommonStatement,
public css::sdbc::XBatchExecution,
public css::lang::XServiceInfo
{
- protected:
virtual ~OStatement(){}
public:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
