include/connectivity/BlobHelper.hxx | 2 +-
include/connectivity/FValue.hxx | 4 ++--
include/connectivity/ParameterCont.hxx | 5 ++---
include/connectivity/TIndex.hxx | 2 +-
include/connectivity/TIndexColumns.hxx | 3 +--
include/connectivity/TKey.hxx | 2 +-
include/connectivity/TKeyColumns.hxx | 3 +--
include/connectivity/conncleanup.hxx | 5 ++---
include/connectivity/internalnode.hxx | 2 +-
include/connectivity/paramwrapper.hxx | 11 ++++-------
include/connectivity/sqlparse.hxx | 2 +-
11 files changed, 17 insertions(+), 24 deletions(-)
New commits:
commit 01b1442e2b866c975565cb6d585ae394e9b3cb9f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Oct 29 08:17:21 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 29 08:35:36 2019 +0100
loplugin:finalclasses in connectivity
Change-Id: I8f85331338247d4b144c5d5487c2fb59c5237dff
Reviewed-on: https://gerrit.libreoffice.org/81637
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/connectivity/BlobHelper.hxx
b/include/connectivity/BlobHelper.hxx
index a890e6bc9550..8a99eb30b948 100644
--- a/include/connectivity/BlobHelper.hxx
+++ b/include/connectivity/BlobHelper.hxx
@@ -25,7 +25,7 @@
namespace connectivity
{
- class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper<
css::sdbc::XBlob >
+ class OOO_DLLPUBLIC_DBTOOLS BlobHelper final : public
::cppu::WeakImplHelper< css::sdbc::XBlob >
{
css::uno::Sequence< sal_Int8 > m_aValue;
public:
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index c9f9c86cbb0b..44ec1e2393d6 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -439,7 +439,7 @@ namespace connectivity
};
/// ORowSetValueDecorator decorates an ORowSetValue so the value is
"refcounted"
- class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator : public
::salhelper::SimpleReferenceObject
+ class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator final : public
::salhelper::SimpleReferenceObject
{
ORowSetValue m_aValue; // my own value
public:
@@ -509,7 +509,7 @@ namespace connectivity
};
#define SQL_NO_PARAMETER (SAL_MAX_UINT32)
- class OAssignValues : public OValueRefVector
+ class OAssignValues final : public OValueRefVector
{
::std::vector<sal_Int32> m_nParameterIndexes;
public:
diff --git a/include/connectivity/ParameterCont.hxx
b/include/connectivity/ParameterCont.hxx
index 10ca6da0f214..a17fa6a75ade 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
@@ -28,7 +28,7 @@ namespace dbtools
//= OParameterContinuation
- class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation : public
comphelper::OInteraction< css::sdb::XInteractionSupplyParameters >
+ class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation final : public
comphelper::OInteraction< css::sdb::XInteractionSupplyParameters >
{
css::uno::Sequence< css::beans::PropertyValue > m_aValues;
@@ -40,9 +40,8 @@ namespace dbtools
// XInteractionSupplyParameters
virtual void SAL_CALL setParameters( const css::uno::Sequence<
css::beans::PropertyValue >& _rValues ) override;
- protected:
- virtual ~OParameterContinuation() override { }
private:
+ virtual ~OParameterContinuation() override { }
OParameterContinuation(const OParameterContinuation&) = delete;
void operator =(const OParameterContinuation&) = delete;
};
diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index 72241e3a316a..452828f27039 100644
--- a/include/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
@@ -26,7 +26,7 @@
namespace connectivity
{
class OTableHelper;
- class OOO_DLLPUBLIC_DBTOOLS OIndexHelper : public
connectivity::sdbcx::OIndex
+ class OOO_DLLPUBLIC_DBTOOLS OIndexHelper final : public
connectivity::sdbcx::OIndex
{
OTableHelper* m_pTable;
public:
diff --git a/include/connectivity/TIndexColumns.hxx
b/include/connectivity/TIndexColumns.hxx
index 08b04b6bfb71..8de56e7fc063 100644
--- a/include/connectivity/TIndexColumns.hxx
+++ b/include/connectivity/TIndexColumns.hxx
@@ -26,10 +26,9 @@
namespace connectivity
{
class OIndexHelper;
- class OOO_DLLPUBLIC_DBTOOLS OIndexColumns : public sdbcx::OCollection
+ class OOO_DLLPUBLIC_DBTOOLS OIndexColumns final : public sdbcx::OCollection
{
OIndexHelper* m_pIndex;
- protected:
virtual sdbcx::ObjectType createObject(const OUString& _rName)
override;
virtual css::uno::Reference< css::beans::XPropertySet >
createDescriptor() override;
virtual void impl_refresh() override;
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index 204a72e23e6e..aecd75525343 100644
--- a/include/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
@@ -26,7 +26,7 @@
namespace connectivity
{
class OTableHelper;
- class OOO_DLLPUBLIC_DBTOOLS OTableKeyHelper : public
connectivity::sdbcx::OKey
+ class OOO_DLLPUBLIC_DBTOOLS OTableKeyHelper final : public
connectivity::sdbcx::OKey
{
OTableHelper* m_pTable;
public:
diff --git a/include/connectivity/TKeyColumns.hxx
b/include/connectivity/TKeyColumns.hxx
index b2653a8a2be9..13039cbd39d9 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
@@ -26,10 +26,9 @@
namespace connectivity
{
class OTableKeyHelper;
- class OOO_DLLPUBLIC_DBTOOLS OKeyColumnsHelper : public
connectivity::sdbcx::OCollection
+ class OOO_DLLPUBLIC_DBTOOLS OKeyColumnsHelper final : public
connectivity::sdbcx::OCollection
{
OTableKeyHelper* m_pKey;
- protected:
virtual sdbcx::ObjectType createObject(const OUString& _rName)
override;
virtual css::uno::Reference< css::beans::XPropertySet >
createDescriptor() override;
virtual void impl_refresh() override;
diff --git a/include/connectivity/conncleanup.hxx
b/include/connectivity/conncleanup.hxx
index c7966e2fbd98..d243e384291b 100644
--- a/include/connectivity/conncleanup.hxx
+++ b/include/connectivity/conncleanup.hxx
@@ -40,7 +40,7 @@ namespace dbtools
css::sdbc::XRowSetListener
> OAutoConnectionDisposer_Base;
- class OOO_DLLPUBLIC_DBTOOLS OAutoConnectionDisposer : public
OAutoConnectionDisposer_Base
+ class OOO_DLLPUBLIC_DBTOOLS OAutoConnectionDisposer final : public
OAutoConnectionDisposer_Base
{
css::uno::Reference< css::sdbc::XConnection >
m_xOriginalConnection;
@@ -59,7 +59,7 @@ namespace dbtools
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
);
- protected:
+ private:
// XPropertyChangeListener
virtual void SAL_CALL propertyChange( const
css::beans::PropertyChangeEvent& _rEvent ) override;
@@ -71,7 +71,6 @@ namespace dbtools
virtual void SAL_CALL rowChanged( const css::lang::EventObject& event
) override;
virtual void SAL_CALL rowSetChanged( const css::lang::EventObject&
event ) override;
- private:
void clearConnection();
void startRowSetListening();
diff --git a/include/connectivity/internalnode.hxx
b/include/connectivity/internalnode.hxx
index 600cab490bb1..f09e3049e4d8 100644
--- a/include/connectivity/internalnode.hxx
+++ b/include/connectivity/internalnode.hxx
@@ -29,7 +29,7 @@ namespace connectivity
/** special node for avoiding memory leaks
*/
- class OOO_DLLPUBLIC_DBTOOLS OSQLInternalNode : public OSQLParseNode
+ class OOO_DLLPUBLIC_DBTOOLS OSQLInternalNode final : public OSQLParseNode
{
public:
OSQLInternalNode(const sal_Char* pNewValue,
diff --git a/include/connectivity/paramwrapper.hxx
b/include/connectivity/paramwrapper.hxx
index e6b27852e69b..3586fbac5e7a 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -50,7 +50,7 @@ namespace param
/** wraps a parameter column as got from an SQLQueryComposer, so that it
has an additional
property "Value", which is forwarded to an XParameters interface
*/
- class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper :public ::cppu::OWeakObject
+ class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper final : public
::cppu::OWeakObject
,public css::lang::XTypeProvider
,public ::comphelper::OMutexAndBroadcastHelper
,public ::cppu::OPropertySetHelper
@@ -107,13 +107,12 @@ namespace param
// pseudo-XComponent
void dispose();
- protected:
+ private:
virtual ~ParameterWrapper() override;
// disambiguations
using ::cppu::OPropertySetHelper::getFastPropertyValue;
- private:
OUString impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle )
const;
};
@@ -130,14 +129,13 @@ namespace param
>
ParameterWrapperContainer_Base;
/// class for the parameter event @see approveParameter
- class OOO_DLLPUBLIC_DBTOOLS ParameterWrapperContainer :
+ class OOO_DLLPUBLIC_DBTOOLS ParameterWrapperContainer final :
public ParameterWrapperContainer_Base
{
private:
::osl::Mutex m_aMutex;
Parameters m_aParameters;
- protected:
virtual ~ParameterWrapperContainer() override;
public:
@@ -178,11 +176,10 @@ namespace param
size_t size() const { return m_aParameters.size(); }
- protected:
+ private:
// XComponent
virtual void SAL_CALL disposing() override;
- private:
void impl_checkDisposed_throw();
};
diff --git a/include/connectivity/sqlparse.hxx
b/include/connectivity/sqlparse.hxx
index a16e876df7fd..0a0025644fc3 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -58,7 +58,7 @@ namespace connectivity
//= OParseContext
- class OOO_DLLPUBLIC_DBTOOLS OParseContext : public IParseContext
+ class OOO_DLLPUBLIC_DBTOOLS OParseContext final : public IParseContext
{
public:
OParseContext();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
