diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-07 10:08:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-07 10:35:19 +0100 |
| commit | ded02dafbce173f2f1a23e10deee8002f73317b2 (patch) | |
| tree | f4ef1b72f177ab53a313cfe8791e86d363c3c6e3 /include/connectivity | |
| parent | Fix memory leak for skipped Sal user events (diff) | |
| download | core-ded02dafbce173f2f1a23e10deee8002f73317b2.tar.gz core-ded02dafbce173f2f1a23e10deee8002f73317b2.zip | |
loplugin:finalclasses in connectivity
Change-Id: I0cd075efad83c0a8d6f05c91201a9aa86649590b
Reviewed-on: https://gerrit.libreoffice.org/44386
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/connectivity')
| -rw-r--r-- | include/connectivity/dbexception.hxx | 7 | ||||
| -rw-r--r-- | include/connectivity/sqliterator.hxx | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 16c499954ad2..3dcdde0cfcee 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -58,7 +58,7 @@ enum OOoBaseErrorCode //= SQLExceptionInfo - encapsulating the type info of an SQLException-derived class -class OOO_DLLPUBLIC_DBTOOLS SQLExceptionInfo +class OOO_DLLPUBLIC_DBTOOLS SQLExceptionInfo final { public: enum class TYPE { SQLException, SQLWarning, SQLContext, Undefined }; @@ -138,7 +138,7 @@ public: m_eType = TYPE::Undefined; } -protected: +private: void implDetermineType(); }; @@ -146,9 +146,8 @@ protected: //= SQLExceptionIteratorHelper - iterating through an SQLException chain -class OOO_DLLPUBLIC_DBTOOLS SQLExceptionIteratorHelper +class OOO_DLLPUBLIC_DBTOOLS SQLExceptionIteratorHelper final { -protected: const css::sdbc::SQLException* m_pCurrent; SQLExceptionInfo::TYPE m_eCurrentType; diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index e70e19129037..e9a0fc119768 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -77,7 +77,7 @@ namespace connectivity struct OSQLParseTreeIteratorImpl; - class OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator + class OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator final { private: css::sdbc::SQLException m_aErrors; // conatins the error while iterating through the statement @@ -142,7 +142,6 @@ namespace connectivity css::uno::Reference< css::beans::XPropertySet > findSelectColumn( const OUString & rColumnName ); - protected: void setSelectColumnName(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt=false, sal_Int32 _nType = css::sdbc::DataType::VARCHAR, bool bAggFkt=false); void appendColumns(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable); // Other member variables that should be available in the "set" functions @@ -150,8 +149,6 @@ namespace connectivity // in its constructor and, after the "traverse" routines have been used, // they can be queried using other functions. - - private: OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) = delete; public: @@ -297,7 +294,6 @@ namespace connectivity bool traverseSelectionCriteria(const OSQLParseNode* pSelectNode); - private: /** constructs a new iterator, which inherits some of the settings from a parent iterator */ OSQLParseTreeIterator( @@ -329,7 +325,6 @@ namespace connectivity void setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, bool bAscending); void setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange); - private: /** appends an SQLException corresponding to the given error code to our error collection @param _eError |