diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /connectivity/source/inc/java/sql | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'connectivity/source/inc/java/sql')
-rw-r--r-- | connectivity/source/inc/java/sql/Array.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/Blob.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/CallableStatement.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/Clob.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/Connection.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/DatabaseMetaData.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/Driver.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/DriverPropertyInfo.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/JStatement.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/PreparedStatement.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/Ref.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/ResultSet.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/ResultSetMetaData.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/SQLException.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/SQLWarning.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/Timestamp.hxx | 6 |
16 files changed, 19 insertions, 19 deletions
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx index 4beb463ef21f..70f4efeb8005 100644 --- a/connectivity/source/inc/java/sql/Array.hxx +++ b/connectivity/source/inc/java/sql/Array.hxx @@ -37,7 +37,7 @@ namespace connectivity static jclass theClass; public: virtual jclass getMyClass() const override; - virtual ~java_sql_Array(); + virtual ~java_sql_Array() override; // A ctor that is needed for returning the object java_sql_Array( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx index f3c3667c2eec..42547795ac29 100644 --- a/connectivity/source/inc/java/sql/Blob.hxx +++ b/connectivity/source/inc/java/sql/Blob.hxx @@ -36,7 +36,7 @@ namespace connectivity protected: // Static data for the class static jclass theClass; - virtual ~java_sql_Blob(); + virtual ~java_sql_Blob() override; public: virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx index d1ce5a7de665..fba2958853e7 100644 --- a/connectivity/source/inc/java/sql/CallableStatement.hxx +++ b/connectivity/source/inc/java/sql/CallableStatement.hxx @@ -39,7 +39,7 @@ namespace connectivity static jclass theClass; virtual void createStatement(JNIEnv* _pEnv) override; - virtual ~java_sql_CallableStatement(); + virtual ~java_sql_CallableStatement() override; public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx index 167b10bfe03d..9ccfd22866b0 100644 --- a/connectivity/source/inc/java/sql/Clob.hxx +++ b/connectivity/source/inc/java/sql/Clob.hxx @@ -36,7 +36,7 @@ namespace connectivity protected: // Static data for the class static jclass theClass; - virtual ~java_sql_Clob(); + virtual ~java_sql_Clob() override; public: virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index 8753069a7267..8b77b5831a8f 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -80,7 +80,7 @@ namespace connectivity // Static data for the class static jclass theClass; - virtual ~java_sql_Connection(); + virtual ~java_sql_Connection() override; public: virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx index 478dc88bb39e..5484be5c099d 100644 --- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx +++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx @@ -42,7 +42,7 @@ namespace connectivity public: virtual jclass getMyClass() const override; - virtual ~java_sql_DatabaseMetaData(); + virtual ~java_sql_DatabaseMetaData() override; // A ctor that is needed for returning the object java_sql_DatabaseMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rConnection ); diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index bb91e40b85a3..876f00f1eb20 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.hxx @@ -37,7 +37,7 @@ namespace connectivity ::comphelper::ResourceBasedEventLogger m_aLogger; protected: - virtual ~java_sql_Driver(); + virtual ~java_sql_Driver() override; public: java_sql_Driver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx index a745fefb62c1..6594b716dd7d 100644 --- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx +++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx @@ -36,7 +36,7 @@ namespace connectivity static jclass theClass; public: virtual jclass getMyClass() const override; - virtual ~java_sql_DriverPropertyInfo(); + virtual ~java_sql_DriverPropertyInfo() override; }; } diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index fe7ff029f349..7c53219b5fea 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -115,7 +115,7 @@ namespace connectivity virtual void createStatement(JNIEnv* _pEnv) = 0; - virtual ~java_sql_Statement_Base(); + virtual ~java_sql_Statement_Base() override; sal_Int32 impl_getProperty(const char* _pMethodName, jmethodID& _inout_MethodID); sal_Int32 impl_getProperty(const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nDefault); @@ -187,7 +187,7 @@ namespace connectivity virtual void createStatement(JNIEnv* _pEnv) override; - virtual ~java_sql_Statement(); + virtual ~java_sql_Statement() override; public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index 2a25a32c79ae..0a1721fd0c99 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx @@ -44,7 +44,7 @@ namespace connectivity static jclass theClass; virtual void createStatement(JNIEnv* _pEnv) override; - virtual ~java_sql_PreparedStatement(); + virtual ~java_sql_PreparedStatement() override; public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx index aa28c2c1a21b..7d2ea6a0aad6 100644 --- a/connectivity/source/inc/java/sql/Ref.hxx +++ b/connectivity/source/inc/java/sql/Ref.hxx @@ -35,7 +35,7 @@ namespace connectivity protected: // Static data for the class static jclass theClass; - virtual ~java_sql_Ref(); + virtual ~java_sql_Ref() override; public: virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 975352c53f1c..4ef232421530 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -97,7 +97,7 @@ namespace connectivity css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual ~java_sql_ResultSet(); + virtual ~java_sql_ResultSet() override; public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index 279e7f784d99..9e830c10ad41 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx @@ -39,7 +39,7 @@ namespace connectivity // Static data for the class static jclass theClass; - virtual ~java_sql_ResultSetMetaData(); + virtual ~java_sql_ResultSetMetaData() override; public: virtual jclass getMyClass() const override; diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx index cddf852997e6..e276f9873ab9 100644 --- a/connectivity/source/inc/java/sql/SQLException.hxx +++ b/connectivity/source/inc/java/sql/SQLException.hxx @@ -41,7 +41,7 @@ namespace connectivity static jclass theClass; public: virtual jclass getMyClass() const override; - virtual ~java_sql_SQLException_BASE(); + virtual ~java_sql_SQLException_BASE() override; // A ctor that is needed for returning the object java_sql_SQLException_BASE( JNIEnv * pEnv, jobject myObj ); diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx index ad30f7a6e884..f1840cedb26f 100644 --- a/connectivity/source/inc/java/sql/SQLWarning.hxx +++ b/connectivity/source/inc/java/sql/SQLWarning.hxx @@ -33,7 +33,7 @@ namespace connectivity static jclass theClass; public: virtual jclass getMyClass() const override; - virtual ~java_sql_SQLWarning_BASE(); + virtual ~java_sql_SQLWarning_BASE() override; // A ctor that is needed for returning the object java_sql_SQLWarning_BASE( JNIEnv * pEnv, jobject myObj ) : java_sql_SQLException_BASE( pEnv, myObj ){} diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx index d05505119888..968638ad079c 100644 --- a/connectivity/source/inc/java/sql/Timestamp.hxx +++ b/connectivity/source/inc/java/sql/Timestamp.hxx @@ -37,7 +37,7 @@ namespace connectivity static jclass theClass; public: virtual jclass getMyClass() const override; - virtual ~java_sql_Date(); + virtual ~java_sql_Date() override; // A ctor that is needed for returning the object java_sql_Date( JNIEnv * pEnv, jobject myObj ) : java_util_Date(pEnv,myObj){} java_sql_Date( const css::util::Date& _rOut ); @@ -57,7 +57,7 @@ namespace connectivity static jclass theClass; public: virtual jclass getMyClass() const override; - virtual ~java_sql_Time(); + virtual ~java_sql_Time() override; // A ctor that is needed for returning the object java_sql_Time( JNIEnv * pEnv, jobject myObj ) : java_util_Date( pEnv, myObj ){} java_sql_Time( const css::util::Time& _rOut ); @@ -75,7 +75,7 @@ namespace connectivity static jclass theClass; public: virtual jclass getMyClass() const override; - virtual ~java_sql_Timestamp(); + virtual ~java_sql_Timestamp() override; // A ctor that is needed for returning the object java_sql_Timestamp( JNIEnv * pEnv, jobject myObj ) : java_util_Date( pEnv, myObj ){} java_sql_Timestamp( const css::util::DateTime& _rOut); |