diff options
Diffstat (limited to 'dbaccess/source/core/api')
| -rw-r--r-- | dbaccess/source/core/api/RowSet.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/core/api/RowSetCacheIterator.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/core/api/resultset.hxx | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 2e6b3fc3dcff..261864096bae 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -70,7 +70,7 @@ namespace dbaccess > ORowSet_BASE1; class OTableContainer; - class ORowSet : public cppu::BaseMutex + class ORowSet final : public cppu::BaseMutex , public ORowSet_BASE1 , public ORowSetBase , public ::comphelper::OPropertyArrayUsageHelper<ORowSet> @@ -144,7 +144,6 @@ namespace dbaccess bool m_bOwnConnection; bool m_bPropChangeNotifyEnabled; - private: /** builds m_aActiveCommand from our settings @return @@ -226,7 +225,6 @@ namespace dbaccess // restore the old state of the data column read-only state void impl_restoreDataColumnsWriteable_throw(); - protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const override; virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const override; @@ -394,7 +392,6 @@ namespace dbaccess virtual css::uno::Any SAL_CALL getWarnings( ) override; virtual void SAL_CALL clearWarnings( ) override; - protected: /** implement the <method>execute</method>, without calling the approve listeners and without building a new connection @param _rClearForNotification mutex to clear before doing the final notifications @@ -441,7 +438,6 @@ namespace dbaccess */ void impl_disposeParametersContainer_nothrow(); - protected: using ORowSetBase::getFastPropertyValue; using ORowSetBase::firePropertyChange; using ORowSetBase::doCancelModification; diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index 6c4a63367961..6e844e29422f 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -38,13 +38,13 @@ namespace dbaccess typedef std::map<sal_Int32, ORowSetCacheIterator_Helper> ORowSetCacheMap; class ORowSetCache; - class ORowSetCacheIterator + class ORowSetCacheIterator final { friend class ORowSetCache; ORowSetCacheMap::iterator m_aIter; ORowSetCache* m_pCache; ORowSetBase* m_pRowSet; - protected: + ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet) : m_aIter(_rIter) ,m_pCache(_pCache) diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index 10306d7d95dd..9d498584c012 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -58,12 +58,11 @@ namespace dbaccess // OResultSet - class OResultSet : public cppu::BaseMutex, + class OResultSet final : public cppu::BaseMutex, public OResultSetBase, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper < OResultSet > { - protected: css::uno::Reference< css::uno::XInterface> m_aStatement; css::uno::Reference< css::sdbc::XResultSet > m_xDelegatorResultSet; @@ -213,11 +212,10 @@ namespace dbaccess virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; - protected: + private: void checkReadOnly() const; void checkBookmarkable() const; - private: using ::cppu::OPropertySetHelper::getFastPropertyValue; }; } |