diff options
Diffstat (limited to 'include/connectivity')
| -rw-r--r-- | include/connectivity/PColumn.hxx | 6 | ||||
| -rw-r--r-- | include/connectivity/dbcharset.hxx | 1 | ||||
| -rw-r--r-- | include/connectivity/sqlscan.hxx | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index 8cb089324a79..46ceaa1bb099 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -40,7 +40,7 @@ namespace connectivity::parse typedef sdbcx::OColumn OParseColumn_BASE; typedef ::comphelper::OPropertyArrayUsageHelper<OParseColumn> OParseColumn_PROP; - class OOO_DLLPUBLIC_DBTOOLS OParseColumn : + class OOO_DLLPUBLIC_DBTOOLS OParseColumn final : public OParseColumn_BASE, public OParseColumn_PROP { OUString m_aRealName; @@ -50,7 +50,6 @@ namespace connectivity::parse bool m_bAggregateFunction; bool m_bIsSearchable; - protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -112,12 +111,11 @@ namespace connectivity::parse typedef sdbcx::OColumn OOrderColumn_BASE; typedef ::comphelper::OPropertyArrayUsageHelper<OOrderColumn> OOrderColumn_PROP; - class OOrderColumn : + class OOrderColumn final : public OOrderColumn_BASE, public OOrderColumn_PROP { const bool m_bAscending; - protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index 79e8c8ec48cf..3ee993243d25 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -121,7 +121,6 @@ namespace dbtools // friend sal_Int32 operator-(const CharsetIterator& lhs, const CharsetIterator& rhs); - protected: const OCharsetMap* m_pContainer; OCharsetMap::TextEncBag::const_iterator m_aPos; diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index be6d4178f0a8..fe463f50606b 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -39,7 +39,7 @@ namespace connectivity public: OSQLScanner(); - virtual ~OSQLScanner(); + ~OSQLScanner(); sal_Int32 SQLyygetc(); void SQLyyerror(char const *fmt); |