simplify ORefVector code

by making it extend std::vector - it wants to be a ref-counted vector,
so let it be, and we can simplify the usage sites

Change-Id: I93ff6ee1522da965e16223dca171401d36fd67b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90664
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

12 files changed, 166 insertions, 166 deletions

diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 974256ee2c90..5c9baa1846b1 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -83,14 +83,14 @@ void OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::
     {
         xUpd->moveToInsertRow();
         sal_Int32 i = 1;
-        connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end();
-        for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != aEnd;++aIter,++i)
+        connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->end();
+        for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->begin()+1;aIter != aEnd;++aIter,++i)
         {
             aIter->setSigned(m_aSignedFlags[i-1]);
             updateColumn(i,xUpdRow,*aIter);
         }
         xUpd->insertRow();
-        (*_rInsertRow->get().begin()) = m_xRowLocate->getBookmark();
+        (*_rInsertRow->begin()) = m_xRowLocate->getBookmark();
     }
     else
         ::dbtools::throwSQLException( DBA_RES( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
@@ -103,9 +103,9 @@ void OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _r
         ::dbtools::throwSQLException( DBA_RES( RID_STR_NO_XROWUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
 
     sal_Int32 i = 1;
-    connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1;
-    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end();
-    for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != aEnd;++aIter,++i,++aOrgIter)
+    connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->begin()+1;
+    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->end();
+    for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->begin()+1;aIter != aEnd;++aIter,++i,++aOrgIter)
     {
         aIter->setSigned(aOrgIter->isSigned());
         updateColumn(i,xUpdRow,*aIter);
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 3cf8c0f0858c..dde85cf95ccf 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -213,8 +213,8 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName)
     connectivity::sdbcx::ObjectType xNamed;
 
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
-    ::connectivity::OSQLColumns::Vector::const_iterator first =  ::connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),_rName,aCase);
-    if(first != m_aColumns->get().end())
+    ::connectivity::OSQLColumns::Vector::const_iterator first =  ::connectivity::find(m_aColumns->begin(),m_aColumns->end(),_rName,aCase);
+    if(first != m_aColumns->end())
         xNamed.set(*first,UNO_QUERY);
 
     return xNamed;
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 59a9669e4db3..63fb7f1e70c3 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -160,8 +160,8 @@ void OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQ
     OUStringBuffer aValues(" VALUES ( ");
     OUString aQuote = getIdentifierQuoteString();
     sal_Int32 i = 1;
-    ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1;
-    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end();
+    ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->begin()+1;
+    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->end();
     for(; aIter != aEnd;++aIter)
     {
         aSql.append(::dbtools::quoteName( aQuote,m_xSetMetaData->getColumnName(i++)) ).append(",");
@@ -177,7 +177,7 @@ void OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQ
         Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear()));
         Reference< XParameters > xParameter(xPrep,UNO_QUERY);
         i = 1;
-        for(aIter = _rInsertRow->get().begin()+1; aIter != aEnd;++aIter,++i)
+        for(aIter = _rInsertRow->begin()+1; aIter != aEnd;++aIter,++i)
         {
             if(aIter->isNull())
                 xParameter->setNull(i,aIter->getTypeKind());
@@ -233,8 +233,8 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
 
     OUString sIsNull(" IS NULL");
     OUString sParam(" = ?");
-    ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rRow->get().begin()+1;
-    ORowVector< ORowSetValue >::Vector::const_iterator aEnd = _rRow->get().end();
+    ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rRow->begin()+1;
+    ORowVector< ORowSetValue >::Vector::const_iterator aEnd = _rRow->end();
     for(; aIter != aEnd;++aIter,++nCheckCount,++i)
     {
         aColumnName = m_xSetMetaData->getColumnName(i);
@@ -296,8 +296,8 @@ void OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOri
     Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear()));
     Reference< XParameters > xParameter(xPrep,UNO_QUERY);
     sal_Int32 i = 1;
-    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end();
-    for(ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1; aIter != aEnd;++aIter)
+    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->end();
+    for(ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->begin()+1; aIter != aEnd;++aIter)
     {
         if(aIter->isModified())
         {
@@ -307,7 +307,7 @@ void OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOri
     }
     for (auto const& orgValue : aOrgValues)
     {
-        setParameter(i,xParameter,(_rOriginalRow->get())[orgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
+        setParameter(i,xParameter,(*_rOriginalRow)[orgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
         ++i;
     }
 
@@ -358,7 +358,7 @@ void OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQ
     sal_Int32 i = 1;
     for (auto const& orgValue : aOrgValues)
     {
-        setParameter(i,xParameter,(_rDeleteRow->get())[orgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
+        setParameter(i,xParameter,(*_rDeleteRow)[orgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
         ++i;
     }
 
@@ -381,8 +381,8 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
     if(!aBookmark.hasValue())
         aBookmark <<= _nPosition;
 
-    connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rRow->get().begin();
-    connectivity::ORowVector< ORowSetValue >::Vector::iterator aEnd = _rRow->get().end();
+    connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rRow->begin();
+    connectivity::ORowVector< ORowSetValue >::Vector::iterator aEnd = _rRow->end();
     (*aIter) = aBookmark;
     ++aIter;
     for(sal_Int32 i=1;aIter != aEnd;++aIter,++i)
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index 195dd204754f..2d55e604d99e 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -54,10 +54,10 @@ namespace dbaccess
     std::unique_ptr<OPrivateColumns> OPrivateColumns::createWithIntrinsicNames( const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns,
         bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex )
     {
-        std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() );
+        std::vector< OUString > aNames; aNames.reserve( _rColumns->size() );
 
         OUString sColumName;
-        for (auto const& column : _rColumns->get())
+        for (auto const& column : *_rColumns)
         {
             Reference< XPropertySet > xColumn(column, UNO_SET_THROW);
             xColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumName;
@@ -79,11 +79,11 @@ namespace dbaccess
     {
         if ( m_aColumns.is() )
         {
-            ::connectivity::OSQLColumns::Vector::const_iterator aIter = find(m_aColumns->get().begin(),m_aColumns->get().end(),_rName,isCaseSensitive());
-            if(aIter == m_aColumns->get().end())
-                aIter = findRealName(m_aColumns->get().begin(),m_aColumns->get().end(),_rName,isCaseSensitive());
+            ::connectivity::OSQLColumns::Vector::const_iterator aIter = find(m_aColumns->begin(),m_aColumns->end(),_rName,isCaseSensitive());
+            if(aIter == m_aColumns->end())
+                aIter = findRealName(m_aColumns->begin(),m_aColumns->end(),_rName,isCaseSensitive());
 
-            if(aIter != m_aColumns->get().end())
+            if(aIter != m_aColumns->end())
                 return connectivity::sdbcx::ObjectType(*aIter,UNO_QUERY);
 
             OSL_FAIL("Column not found in collection!");
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index e050b23879db..bbde87c4d146 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -249,7 +249,7 @@ void OKeySet::setOneKeyColumnParameter( sal_Int32 &nPos, const Reference< XParam
 
 OUStringBuffer OKeySet::createKeyFilter()
 {
-    connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->get().begin();
+    connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->begin();
 
     static const char aAnd[] = " AND ";
     const OUString aQuote    = getIdentifierQuoteString();
@@ -337,8 +337,8 @@ void OKeySet::ensureStatement( )
     // do we already have a statement for the current combination of NULLness
     // of key & foreign columns?
     std::vector<bool> FilterColumnsNULL;
-    FilterColumnsNULL.reserve(m_aKeyIter->second.first->get().size());
-    for (auto const& elem : m_aKeyIter->second.first->get())
+    FilterColumnsNULL.reserve(m_aKeyIter->second.first->size());
+    for (auto const& elem : *m_aKeyIter->second.first)
         FilterColumnsNULL.push_back(elem.isNull());
     vStatements_t::const_iterator pNewStatement(m_vStatements.find(FilterColumnsNULL));
     if(pNewStatement == m_vStatements.end())
@@ -478,7 +478,7 @@ void OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrigi
         if ( m_pKeyColumnNames->find(columnName.first) != m_pKeyColumnNames->end() )
         {
             sKeyCondition.append(::dbtools::quoteName( aQuote,columnName.second.sRealName));
-            if((_rOriginalRow->get())[columnName.second.nPosition].isNull())
+            if((*_rOriginalRow)[columnName.second.nPosition].isNull())
                 sKeyCondition.append(sIsNull);
             else
                 sKeyCondition.append(sParam);
@@ -491,7 +491,7 @@ void OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrigi
                 if(indexColumn->hasByName(columnName.first))
                 {
                     sIndexCondition.append(::dbtools::quoteName( aQuote,columnName.second.sRealName));
-                    if((_rOriginalRow->get())[columnName.second.nPosition].isNull())
+                    if((*_rOriginalRow)[columnName.second.nPosition].isNull())
                         sIndexCondition.append(sIsNull);
                     else
                     {
@@ -503,7 +503,7 @@ void OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrigi
                 }
             }
         }
-        if((_rInsertRow->get())[columnName.second.nPosition].isModified())
+        if((*_rInsertRow)[columnName.second.nPosition].isModified())
         {
             aSql.append(::dbtools::quoteName( aQuote,columnName.second.sRealName)).append(aPara);
         }
@@ -556,15 +556,15 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
         if ( i_sTableName.isEmpty() || columnName.second.sTableName == i_sTableName )
         {
             sal_Int32 nPos = columnName.second.nPosition;
-            if((_rInsertRow->get())[nPos].isModified())
+            if((*_rInsertRow)[nPos].isModified())
             {
                 if ( bRefetch )
                 {
                     bRefetch = std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),columnName.second.sRealName) == m_aFilterColumns.end();
                 }
                 impl_convertValue_throw(_rInsertRow,columnName.second);
-                (_rInsertRow->get())[nPos].setSigned((_rOriginalRow->get())[nPos].isSigned());
-                setParameter(i++,xParameter,(_rInsertRow->get())[nPos],columnName.second.nType,columnName.second.nScale);
+                (*_rInsertRow)[nPos].setSigned((*_rOriginalRow)[nPos].isSigned());
+                setParameter(i++,xParameter,(*_rInsertRow)[nPos],columnName.second.nType,columnName.second.nScale);
             }
         }
     }
@@ -573,7 +573,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
     {
         if ( i_sTableName.isEmpty() || keyColumnName.second.sTableName == i_sTableName )
         {
-            setParameter(i++,xParameter,(_rOriginalRow->get())[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
+            setParameter(i++,xParameter,(*_rOriginalRow)[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
         }
     }
     if ( !_aIndexColumnPositions.empty() )
@@ -582,7 +582,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
         auto aIter = m_pColumnNames->begin();
         for (auto const& indexColumnPosition : _aIndexColumnPositions)
         {
-            setParameter(i++,xParameter,(_rOriginalRow->get())[indexColumnPosition],(_rOriginalRow->get())[indexColumnPosition].getTypeKind(),aIter->second.nScale);
+            setParameter(i++,xParameter,(*_rOriginalRow)[indexColumnPosition],(*_rOriginalRow)[indexColumnPosition].getTypeKind(),aIter->second.nScale);
             ++aIter;
         }
     }
@@ -590,7 +590,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
     m_bUpdated = nRowsUpdated > 0;
     if(m_bUpdated)
     {
-        const sal_Int32 nBookmark = ::comphelper::getINT32((_rInsertRow->get())[0].getAny());
+        const sal_Int32 nBookmark = ::comphelper::getINT32((*_rInsertRow)[0].getAny());
         m_aKeyIter = m_aKeyMap.find(nBookmark);
         m_aKeyIter->second.second.first = 2;
         m_aKeyIter->second.second.second = xRow;
@@ -614,7 +614,7 @@ void OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLT
     bool bModified = false;
     for (auto const& columnName : *m_pColumnNames)
     {
-        if((_rInsertRow->get())[columnName.second.nPosition].isModified())
+        if((*_rInsertRow)[columnName.second.nPosition].isModified())
         {
             if ( bRefetch )
             {
@@ -647,15 +647,15 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
         if ( i_sTableName.isEmpty() || columnName.second.sTableName == i_sTableName )
         {
             const sal_Int32 nPos = columnName.second.nPosition;
-            if((_rInsertRow->get())[nPos].isModified())
+            if((*_rInsertRow)[nPos].isModified())
             {
-                if((_rInsertRow->get())[nPos].isNull())
-                    xParameter->setNull(i++,(_rInsertRow->get())[nPos].getTypeKind());
+                if((*_rInsertRow)[nPos].isNull())
+                    xParameter->setNull(i++,(*_rInsertRow)[nPos].getTypeKind());
                 else
                 {
                     impl_convertValue_throw(_rInsertRow,columnName.second);
-                    (_rInsertRow->get())[nPos].setSigned(m_aSignedFlags[nPos-1]);
-                    setParameter(i++,xParameter,(_rInsertRow->get())[nPos],columnName.second.nType,columnName.second.nScale);
+                    (*_rInsertRow)[nPos].setSigned(m_aSignedFlags[nPos-1]);
+                    setParameter(i++,xParameter,(*_rInsertRow)[nPos],columnName.second.nType,columnName.second.nScale);
                 }
             }
         }
@@ -668,17 +668,17 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
         // first insert the default values into the insertrow
         for (auto const& columnName : *m_pColumnNames)
         {
-            if ( !(_rInsertRow->get())[columnName.second.nPosition].isModified() )
+            if ( !(*_rInsertRow)[columnName.second.nPosition].isModified() )
             {
                 if(columnName.second.bNullable && columnName.second.sDefaultValue.isEmpty())
                 {
-                    (_rInsertRow->get())[columnName.second.nPosition].setTypeKind(columnName.second.nType);
-                    (_rInsertRow->get())[columnName.second.nPosition].setNull();
+                    (*_rInsertRow)[columnName.second.nPosition].setTypeKind(columnName.second.nType);
+                    (*_rInsertRow)[columnName.second.nPosition].setNull();
                 }
                 else
                 {
-                    (_rInsertRow->get())[columnName.second.nPosition] = columnName.second.sDefaultValue;
-                    (_rInsertRow->get())[columnName.second.nPosition].setTypeKind(columnName.second.nType);
+                    (*_rInsertRow)[columnName.second.nPosition] = columnName.second.sDefaultValue;
+                    (*_rInsertRow)[columnName.second.nPosition].setTypeKind(columnName.second.nType);
                 }
             }
         }
@@ -700,7 +700,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
                     {
                         SelectColumnsMetaData::const_iterator aFind = m_pKeyColumnNames->find(*aAutoIter);
                         if ( aFind != m_pKeyColumnNames->end() )
-                            (_rInsertRow->get())[aFind->second.nPosition].fill(j, aFind->second.nType, xRow);
+                            (*_rInsertRow)[aFind->second.nPosition].fill(j, aFind->second.nType, xRow);
                     }
                     bAutoValuesFetched = true;
                 }
@@ -751,7 +751,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
                         // we will only fetch values which are keycolumns
                         SelectColumnsMetaData::const_iterator aFind = m_pKeyColumnNames->find(autoColumn);
                         if ( aFind != aEnd )
-                            (_rInsertRow->get())[aFind->second.nPosition].fill(j++, aFind->second.nType, xRow);
+                            (*_rInsertRow)[aFind->second.nPosition].fill(j++, aFind->second.nType, xRow);
                     }
                 }
                 ::comphelper::disposeComponent(xStatement);
@@ -771,7 +771,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
 
         m_aKeyIter = m_aKeyMap.emplace( aKeyIter->first + 1, OKeySetValue(aKeyRow,std::pair<sal_Int32,Reference<XRow> >(1,Reference<XRow>())) ).first;
         // now we set the bookmark for this row
-        (_rInsertRow->get())[0] = makeAny(static_cast<sal_Int32>(m_aKeyIter->first));
+        (*_rInsertRow)[0] = makeAny(static_cast<sal_Int32>(m_aKeyIter->first));
         tryRefetch(_rInsertRow,bRefetch);
     }
 }
@@ -791,17 +791,17 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
     }
     if ( !bRefetch )
     {
-        m_aKeyIter->second.second.second = new OPrivateRow(_rInsertRow->get());
+        m_aKeyIter->second.second.second = new OPrivateRow(*_rInsertRow);
     }
 }
 
 void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rKeyRow, sal_Int32 i_nBookmark)
 {
-    connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rKeyRow->get().begin();
+    connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rKeyRow->begin();
 
     // check the if the parameter values have been changed
-    OSL_ENSURE((m_aParameterValueForCache->get().size()-1) == m_pParameterNames->size(),"OKeySet::copyRowValue: Parameter values and names differ!");
-    connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaValuesIter = m_aParameterValueForCache->get().begin() +1;
+    OSL_ENSURE((m_aParameterValueForCache->size()-1) == m_pParameterNames->size(),"OKeySet::copyRowValue: Parameter values and names differ!");
+    connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaValuesIter = m_aParameterValueForCache->begin() +1;
 
     bool bChanged = false;
     sal_Int32 i = 1;
@@ -809,11 +809,11 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rK
     {
         ORowSetValue aValue(*aParaValuesIter);
         aValue.setSigned(m_aSignedFlags[parameterName.second.nPosition-1]);
-        if ( (_rInsertRow->get())[parameterName.second.nPosition] != aValue )
+        if ( (*_rInsertRow)[parameterName.second.nPosition] != aValue )
         {
             rtl::Reference aCopy(
                 new ORowSetValueVector(*m_aParameterValueForCache));
-            (aCopy->get())[i] = (_rInsertRow->get())[parameterName.second.nPosition];
+            (*aCopy)[i] = (*_rInsertRow)[parameterName.second.nPosition];
             m_aUpdatedParameter[i_nBookmark] = aCopy;
             bChanged = true;
         }
@@ -829,7 +829,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rK
     for (auto const& keyColumnName : *m_pKeyColumnNames)
     {
         impl_convertValue_throw(_rInsertRow,keyColumnName.second);
-        *aIter = (_rInsertRow->get())[keyColumnName.second.nPosition];
+        *aIter = (*_rInsertRow)[keyColumnName.second.nPosition];
         aIter->setTypeKind(keyColumnName.second.nType);
         ++aIter;
     }
@@ -866,7 +866,7 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTa
         if ( m_pKeyColumnNames->find(columnName.first) != m_pKeyColumnNames->end() )
         {
             aSql.append(::dbtools::quoteName( aQuote,columnName.second.sRealName));
-            if((_rDeleteRow->get())[columnName.second.nPosition].isNull())
+            if((*_rDeleteRow)[columnName.second.nPosition].isNull())
             {
                 SAL_WARN("dbaccess", "can a primary key be null");
                 aSql.append(" IS NULL");
@@ -882,7 +882,7 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTa
                 if(indexColumn->hasByName(columnName.first))
                 {
                     sIndexCondition.append(::dbtools::quoteName( aQuote,columnName.second.sRealName));
-                    if((_rDeleteRow->get())[columnName.second.nPosition].isNull())
+                    if((*_rDeleteRow)[columnName.second.nPosition].isNull())
                         sIndexCondition.append(" IS NULL");
                     else
                     {
@@ -906,14 +906,14 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTa
     sal_Int32 i = 1;
     for (auto const& keyColumnName : *m_pKeyColumnNames)
     {
-        setParameter(i++,xParameter,(_rDeleteRow->get())[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
+        setParameter(i++,xParameter,(*_rDeleteRow)[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
     }
 
     // now we have to set the index values
     auto aIter = m_pColumnNames->begin();
     for (auto const& indexColumnPosition : aIndexColumnPositions)
     {
-        setParameter(i++,xParameter,(_rDeleteRow->get())[indexColumnPosition],(_rDeleteRow->get())[indexColumnPosition].getTypeKind(),aIter->second.nScale);
+        setParameter(i++,xParameter,(*_rDeleteRow)[indexColumnPosition],(*_rDeleteRow)[indexColumnPosition].getTypeKind(),aIter->second.nScale);
         ++aIter;
     }
 
@@ -921,7 +921,7 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTa
 
     if(m_bDeleted)
     {
-        sal_Int32 nBookmark = ::comphelper::getINT32((_rDeleteRow->get())[0].getAny());
+        sal_Int32 nBookmark = ::comphelper::getINT32((*_rDeleteRow)[0].getAny());
         if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != m_aKeyMap.end())
             ++m_aKeyIter;
         m_aKeyMap.erase(nBookmark);
@@ -1144,13 +1144,13 @@ bool OKeySet::doTryRefetch_throw()
     OUpdatedParameter::const_iterator aUpdateFind = m_aUpdatedParameter.find(m_aKeyIter->first);
     if ( aUpdateFind == m_aUpdatedParameter.end() )
     {
-        aParaIter = m_aParameterValueForCache->get().begin();
-        aParaEnd = m_aParameterValueForCache->get().end();
+        aParaIter = m_aParameterValueForCache->begin();
+        aParaEnd = m_aParameterValueForCache->end();
     }
     else
     {
-        aParaIter = aUpdateFind->second->get().begin();
-        aParaEnd = aUpdateFind->second->get().end();
+        aParaIter = aUpdateFind->second->begin();
+        aParaEnd = aUpdateFind->second->end();
     }
 
     for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos)
@@ -1159,7 +1159,7 @@ bool OKeySet::doTryRefetch_throw()
     }
 
     // now set the primary key column values
-    connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->get().begin();
+    connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->begin();
     for (auto const& keyColumnName : *m_pKeyColumnNames)
         setOneKeyColumnParameter(nPos,xParameter,*aIter++,keyColumnName.second.nType,keyColumnName.second.nScale);
     for (auto const& foreignColumnName : *m_pForeignColumnNames)
@@ -1239,7 +1239,7 @@ bool OKeySet::fetchRow()
         ::comphelper::disposeComponent(m_xSet);
         m_xRow.set(m_xDriverRow, UNO_SET_THROW);
 
-        connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = aKeyRow->get().begin();
+        connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = aKeyRow->begin();
         // copy key columns
         for (auto const& keyColumnName : *m_pKeyColumnNames)
         {
@@ -1493,7 +1493,7 @@ void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns,
 
 void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData)
 {
-    ORowSetValue& aValue((_rInsertRow->get())[i_aMetaData.nPosition]);
+    ORowSetValue& aValue((*_rInsertRow)[i_aMetaData.nPosition]);
     switch(i_aMetaData.nType)
     {
         case DataType::DECIMAL:
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 614c540e115d..c306e9276c7a 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -187,9 +187,9 @@ void OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _
         if ( m_pKeyColumnNames->find(columnName.first) != m_pKeyColumnNames->end() )
         {
             aResultSetChanged[columnName.second.sTableName] = m_aJoinedKeyColumns.find(columnName.second.nPosition) != m_aJoinedKeyColumns.end();
-            lcl_fillKeyCondition(columnName.second.sTableName,sQuotedColumnName,(_rOriginalRow->get())[columnName.second.nPosition],aKeyConditions);
+            lcl_fillKeyCondition(columnName.second.sTableName,sQuotedColumnName,(*_rOriginalRow)[columnName.second.nPosition],aKeyConditions);
         }
-        if((_rInsertRow->get())[columnName.second.nPosition].isModified())
+        if((*_rInsertRow)[columnName.second.nPosition].isModified())
         {
             if ( m_aJoinedKeyColumns.find(columnName.second.nPosition) != m_aJoinedKeyColumns.end() )
                 throw SQLException();
@@ -197,7 +197,7 @@ void OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _
             std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(columnName.second.nPosition);
             if ( aJoinIter != m_aJoinedColumns.end() )
             {
-                (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[columnName.second.nPosition];
+                (*_rInsertRow)[aJoinIter->second] = (*_rInsertRow)[columnName.second.nPosition];
             }
             OUStringBuffer& rPart = aSql[columnName.second.sTableName];
             if ( !rPart.isEmpty() )
@@ -247,17 +247,17 @@ void OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity:
             aResultSetChanged[columnName.second.sTableName] = false;
 
         const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,columnName.second.sRealName);
-        if ( (_rInsertRow->get())[columnName.second.nPosition].isModified() )
+        if ( (*_rInsertRow)[columnName.second.nPosition].isModified() )
         {
             if ( m_aJoinedKeyColumns.find(columnName.second.nPosition) != m_aJoinedKeyColumns.end() )
             {
-                lcl_fillKeyCondition(columnName.second.sTableName,sQuotedColumnName,(_rInsertRow->get())[columnName.second.nPosition],aKeyConditions);
+                lcl_fillKeyCondition(columnName.second.sTableName,sQuotedColumnName,(*_rInsertRow)[columnName.second.nPosition],aKeyConditions);
                 aResultSetChanged[columnName.second.sTableName] = true;
             }
             std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(columnName.second.nPosition);
             if ( aJoinIter != m_aJoinedColumns.end() )
             {
-                (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[columnName.second.nPosition];
+                (*_rInsertRow)[aJoinIter->second] = (*_rInsertRow)[columnName.second.nPosition];
             }
             OUStringBuffer& rPart = aSql[columnName.second.sTableName];
             if ( !rPart.isEmpty() )
@@ -300,7 +300,7 @@ void OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity:
                     {
                         if ( keyColumnName.second.sTableName == elem.first )
                         {
-                            setParameter(i++,xParameter,(_rInsertRow->get())[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
+                            setParameter(i++,xParameter,(*_rInsertRow)[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
                         }
                     }
                     Reference<XResultSet> xRes = xPrep->executeQuery();
@@ -333,7 +333,7 @@ void OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::
         {
             // only delete rows which aren't the key in the join
             const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,columnName.second.sRealName);
-            lcl_fillKeyCondition(columnName.second.sTableName,sQuotedColumnName,(_rDeleteRow->get())[columnName.second.nPosition],aKeyConditions);
+            lcl_fillKeyCondition(columnName.second.sTableName,sQuotedColumnName,(*_rDeleteRow)[columnName.second.nPosition],aKeyConditions);
         }
     }
     Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
@@ -361,13 +361,13 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString&
     for (auto const& keyColumnName : *m_pKeyColumnNames)
     {
         if ( keyColumnName.second.sTableName == i_sTableName )
-            setParameter(i++,xParameter,(_rDeleteRow->get())[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
+            setParameter(i++,xParameter,(*_rDeleteRow)[keyColumnName.second.nPosition],keyColumnName.second.nType,keyColumnName.second.nScale);
     }
     m_bDeleted = xPrep->executeUpdate() > 0;
 
     if(m_bDeleted)
     {
-        sal_Int32 nBookmark = ::comphelper::getINT32((_rDeleteRow->get())[0].getAny());
+        sal_Int32 nBookmark = ::comphelper::getINT32((*_rDeleteRow)[0].getAny());
         if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != m_aKeyMap.end())
             ++m_aKeyIter;
         m_aKeyMap.erase(nBookmark);
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 65456a3bdf5d..ec37f9634486 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -165,7 +165,7 @@ ORowSet::ORowSet( const Reference< css::uno::XComponentContext >& _rxContext )
     sal_Int32 const nRT  = PropertyAttribute::READONLY   | PropertyAttribute::TRANSIENT;
     sal_Int32 const nBT  = PropertyAttribute::BOUND      | PropertyAttribute::TRANSIENT;
 
-    m_aPrematureParamValues->get().resize( 0 );
+    m_aPrematureParamValues->resize( 0 );
 
     // sdb.RowSet Properties
     registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection,   cppu::UnoType<XConnection>::get());
@@ -672,7 +672,7 @@ void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x)
     checkUpdateConditions(columnIndex);
     checkUpdateIterator();
 
-    ORowSetValueVector::Vector& rRow = (*m_aCurrentRow)->get();
+    ORowSetValueVector::Vector& rRow = **m_aCurrentRow;
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateValue(columnIndex,x,rRow,aNotify.getChangedColumns());
     m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
@@ -688,7 +688,7 @@ void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex )
     checkUpdateConditions(columnIndex);
     checkUpdateIterator();
 
-    ORowSetValueVector::Vector& rRow = (*m_aCurrentRow)->get();
+    ORowSetValueVector::Vector& rRow = **m_aCurrentRow;
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateNull(columnIndex,rRow,aNotify.getChangedColumns());
     m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
@@ -776,7 +776,7 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkUpdateConditions(columnIndex);
     checkUpdateIterator();
-    ORowSetValueVector::Vector& rRow = (*m_aCurrentRow)->get();
+    ORowSetValueVector::Vector& rRow = **m_aCurrentRow;
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateCharacterStream(columnIndex,x,length,rRow,aNotify.getChangedColumns());
     m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
@@ -820,7 +820,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x )
 
     if (!::dbtools::implUpdateObject(this, columnIndex, aNewValue))
     {   // there is no other updateXXX call which can handle the value in x
-        ORowSetValueVector::Vector& rRow = (*m_aCurrentRow)->get();
+        ORowSetValueVector::Vector& rRow = **m_aCurrentRow;
         ORowSetNotifier aNotify(this,rRow);
         m_pCache->updateObject(columnIndex,aNewValue,rRow,aNotify.getChangedColumns());
         m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
@@ -834,7 +834,7 @@ void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x,
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkUpdateConditions(columnIndex);
     checkUpdateIterator();
-    ORowSetValueVector::Vector& rRow = (*m_aCurrentRow)->get();
+    ORowSetValueVector::Vector& rRow = **m_aCurrentRow;
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateNumericObject(columnIndex,x,rRow,aNotify.getChangedColumns());
     m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
@@ -1285,7 +1285,7 @@ sal_Bool SAL_CALL ORowSet::wasNull(  )
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
 
-    return ( m_pCache && isInsertRow() ) ? ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex].isNull() : ORowSetBase::wasNull();
+    return ( m_pCache && isInsertRow() ) ? (**m_pCache->m_aInsertRow)[m_nLastColumnIndex].isNull() : ORowSetBase::wasNull();
 }
 
 const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex)
@@ -1293,7 +1293,7 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex)
     checkCache();
 
     if ( m_pCache && isInsertRow() )
-        return  ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex];
+        return  (**m_pCache->m_aInsertRow)[m_nLastColumnIndex = columnIndex];
 
     return getValue(columnIndex);
 }
@@ -1377,7 +1377,7 @@ Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32
     if ( m_pCache && isInsertRow() )
     {
         checkCache();
-        return new ::comphelper::SequenceInputStream(((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex].getSequence());
+        return new ::comphelper::SequenceInputStream((**m_pCache->m_aInsertRow)[m_nLastColumnIndex = columnIndex].getSequence());
     }
 
     return ORowSetBase::getBinaryStream(columnIndex);
@@ -1389,7 +1389,7 @@ Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int
     if(m_pCache && isInsertRow() )
     {
         checkCache();
-        return new ::comphelper::SequenceInputStream(((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex].getSequence());
+        return new ::comphelper::SequenceInputStream((**m_pCache->m_aInsertRow)[m_nLastColumnIndex = columnIndex].getSequence());
     }
 
     return ORowSetBase::getCharacterStream(columnIndex);
@@ -1411,7 +1411,7 @@ Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex )
     if ( m_pCache && isInsertRow() )
     {
         checkCache();
-        return new ::connectivity::BlobHelper(((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex].getSequence());
+        return new ::connectivity::BlobHelper((**m_pCache->m_aInsertRow)[m_nLastColumnIndex = columnIndex].getSequence());
     }
     return ORowSetBase::getBlob(columnIndex);
 }
@@ -1674,14 +1674,14 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
 {
     impl_ensureStatement_throw();
 
-    m_aParameterValueForCache->get().resize(1);
+    m_aParameterValueForCache->resize(1);
     Reference< XParameters > xParam( m_xStatement, UNO_QUERY_THROW );
-    size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues->get().size() );
+    size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues->size() );
     for ( size_t i=1; i<=nParamCount; ++i )
     {
         ORowSetValue& rParamValue( getParameterStorage( static_cast<sal_Int32>(i) ) );
         ::dbtools::setObjectWithInfo( xParam, i, rParamValue.makeAny(), rParamValue.getTypeKind() );
-        m_aParameterValueForCache->get().push_back(rParamValue);
+        m_aParameterValueForCache->push_back(rParamValue);
     }
     m_bParametersDirty = false;
 
@@ -1840,7 +1840,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                 {
                     sal_Int32 nCount = xMetaData->getColumnCount();
                     m_aDataColumns.reserve(nCount+1);
-                    aColumns->get().reserve(nCount+1);
+                    aColumns->reserve(nCount+1);
                     std::map< OUString, int > aColumnMap;
                     for (sal_Int32 i = 0 ; i < nCount; ++i)
                     {
@@ -1868,7 +1868,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                                 return this->getInsertValue(column);
                             });
                         aColumnMap.insert(std::make_pair(sName,0));
-                        aColumns->get().emplace_back(pColumn);
+                        aColumns->emplace_back(pColumn);
                         pColumn->setName(sName);
                         aNames.push_back(sName);
                         m_aDataColumns.push_back(pColumn);
@@ -1904,7 +1904,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
             Reference< XResultSetMetaData > xMeta( getMetaData(), UNO_SET_THROW );
             sal_Int32 nCount = xMeta->getColumnCount();
             m_aDataColumns.reserve(nCount+1);
-            aColumns->get().reserve(nCount+1);
+            aColumns->reserve(nCount+1);
             std::set< Reference< XPropertySet > > aAllColumns;
 
             for(sal_Int32 i=1; i <= nCount ;++i)
@@ -1971,7 +1971,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                         [this] (sal_Int32 const column) -> ORowSetValue const& {
                             return this->getInsertValue(column);
                         });
-                    aColumns->get().emplace_back(pColumn);
+                    aColumns->emplace_back(pColumn);
 
                     pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ISREADONLY,makeAny(rKeyColumns.find(i) != rKeyColumns.end()));
 
@@ -2410,10 +2410,10 @@ void ORowSet::impl_initParametersContainer_nothrow()
 
     m_pParameters = new param::ParameterWrapperContainer( m_xComposer.get() );
     // copy the premature parameters into the final ones
-    size_t nParamCount( std::min( m_pParameters->size(), m_aPrematureParamValues->get().size() ) );
+    size_t nParamCount( std::min( m_pParameters->size(), m_aPrematureParamValues->size() ) );
     for ( size_t i=0; i<nParamCount; ++i )
     {
-        (*m_pParameters)[i] = m_aPrematureParamValues->get()[i];
+        (*m_pParameters)[i] = (*m_aPrematureParamValues)[i];
     }
 }
 
@@ -2424,10 +2424,10 @@ void ORowSet::impl_disposeParametersContainer_nothrow()
 
     // copy the actual values to our "premature" ones, to preserve them for later use
     size_t nParamCount( m_pParameters->size() );
-    m_aPrematureParamValues->get().resize( nParamCount );
+    m_aPrematureParamValues->resize( nParamCount );
     for ( size_t i=0; i<nParamCount; ++i )
     {
-        m_aPrematureParamValues->get()[i] = (*m_pParameters)[i];
+        (*m_aPrematureParamValues)[i] = (*m_pParameters)[i];
     }
 
     m_pParameters->dispose();
@@ -2458,9 +2458,9 @@ ORowSetValue& ORowSet::getParameterStorage(sal_Int32 parameterIndex)
         }
     }
 
-    if ( m_aPrematureParamValues->get().size() < o3tl::make_unsigned(parameterIndex) )
-        m_aPrematureParamValues->get().resize( parameterIndex );
-    return m_aPrematureParamValues->get()[ parameterIndex - 1 ];
+    if ( m_aPrematureParamValues->size() < o3tl::make_unsigned(parameterIndex) )
+        m_aPrematureParamValues->resize( parameterIndex );
+    return (*m_aPrematureParamValues)[ parameterIndex - 1 ];
 }
 
 // XParameters
@@ -2632,7 +2632,7 @@ void SAL_CALL ORowSet::clearParameters(  )
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
 
-    size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues->get().size() );
+    size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues->size() );
     for ( size_t i=1; i<=nParamCount; ++i )
         getParameterStorage( static_cast<sal_Int32>(i) ).setNull();
     m_aParametersSet.clear();
@@ -2702,7 +2702,7 @@ void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
     if ( m_aCurrentRow.isNull() )
         ::dbtools::throwSQLException( DBA_RES( RID_STR_INVALID_CURSOR_STATE ), StandardSQLState::INVALID_CURSOR_STATE, *this );
 
-    if ( columnIndex <= 0 || sal_Int32((*m_aCurrentRow)->get().size()) <= columnIndex )
+    if ( columnIndex <= 0 || sal_Int32((*m_aCurrentRow)->size()) <= columnIndex )
         ::dbtools::throwSQLException( DBA_RES( RID_STR_INVALID_INDEX ), StandardSQLState::INVALID_DESCRIPTOR_INDEX, *this );
 }
 
@@ -2769,7 +2769,7 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
         Sequence< OUString> aSeq = rParent.m_pColumns->getElementNames();
         const OUString* pIter    = aSeq.getConstArray();
         const OUString* pEnd     = pIter + aSeq.getLength();
-        aColumns->get().reserve(aSeq.getLength()+1);
+        aColumns->reserve(aSeq.getLength()+1);
         for(sal_Int32 i=1;pIter != pEnd ;++pIter,++i)
         {
             Reference<XPropertySet> xColumn;
@@ -2788,7 +2788,7 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
                 [this] (sal_Int32 const column) -> ORowSetValue const& {
                     return this->getValue(column);
                 });
-            aColumns->get().emplace_back(pColumn);
+            aColumns->emplace_back(pColumn);
             pColumn->setName(*pIter);
             aNames.push_back(*pIter);
             m_aDataColumns.push_back(pColumn);
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 62c0c41723e9..ce28f49d96a8 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -184,7 +184,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(  )
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return !((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is())
-           || ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull();
+           || (**m_aCurrentRow)[m_nLastColumnIndex].isNull();
 }
 
 const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
@@ -235,9 +235,9 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
         }
         OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!");
         ORowSetRow rRow = *m_aCurrentRow;
-        OSL_ENSURE(rRow.is() && o3tl::make_unsigned(columnIndex) < (rRow->get()).size(),"Invalid size of vector!");
+        OSL_ENSURE(rRow.is() && o3tl::make_unsigned(columnIndex) < rRow->size(),"Invalid size of vector!");
 #endif
-        return ((*m_aCurrentRow)->get())[m_nLastColumnIndex = columnIndex];
+        return (**m_aCurrentRow)[m_nLastColumnIndex = columnIndex];
     }
 
     // we should normally never reach this
@@ -344,7 +344,7 @@ Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_In
     }
 
     if ( bValidCurrentRow )
-        return new ::comphelper::SequenceInputStream(((*m_aCurrentRow)->get())[m_nLastColumnIndex = columnIndex].getSequence());
+        return new ::comphelper::SequenceInputStream((**m_aCurrentRow)[m_nLastColumnIndex = columnIndex].getSequence());
 
     // we should normally never reach this
     return Reference< css::io::XInputStream >();
@@ -1170,7 +1170,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
     {
         try
         {
-            dataColumn->fireValueChange(_rOldRow.is() ? (_rOldRow->get())[i+1] : ::connectivity::ORowSetValue());
+            dataColumn->fireValueChange(_rOldRow.is() ? (*_rOldRow)[i+1] : ::connectivity::ORowSetValue());
         }
         catch (const Exception&)
         {
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index e13a79226335..e84c89aff20b 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -484,7 +484,7 @@ Any ORowSetCache::getBookmark(  )
         return Any(); // this is allowed here because the rowset knows what it is doing
     }
 
-    return lcl_getBookmark(((*m_aMatrixIter)->get())[0],m_xCacheSet.get());
+    return lcl_getBookmark((**m_aMatrixIter)[0],m_xCacheSet.get());
 }
 
 bool ORowSetCache::moveToBookmark( const Any& bookmark )
@@ -553,7 +553,7 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector&
 {
     checkUpdateConditions(columnIndex);
 
-    ORowSetValueVector::Vector& rInsert = (*m_aInsertRow)->get();
+    ORowSetValueVector::Vector& rInsert = **m_aInsertRow;
     if ( !rInsert[columnIndex].isNull() )
     {
         rInsert[columnIndex].setBound(true);
@@ -573,7 +573,7 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
 {
     checkUpdateConditions(columnIndex);
 
-    ORowSetValueVector::Vector& rInsert = (*m_aInsertRow)->get();
+    ORowSetValueVector::Vector& rInsert = **m_aInsertRow;
     if ( rInsert[columnIndex] != x )
     {
         rInsert[columnIndex].setBound(true);
@@ -597,7 +597,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference
     if(x.is())
         x->readBytes(aSeq,length);
 
-    ORowSetValueVector::Vector& rInsert = (*m_aInsertRow)->get();
+    ORowSetValueVector::Vector& rInsert = **m_aInsertRow;
     rInsert[columnIndex].setBound(true);
     rInsert[columnIndex] = aSeq;
     rInsert[columnIndex].setModified(true);
@@ -614,7 +614,7 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
 {
     checkUpdateConditions(columnIndex);
 
-    ORowSetValueVector::Vector& rInsert = (*m_aInsertRow)->get();
+    ORowSetValueVector::Vector& rInsert = **m_aInsertRow;
     ORowSetValue aTemp;
     aTemp.fill(x);
     if ( rInsert[columnIndex] != aTemp )
@@ -636,7 +636,7 @@ void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x
 {
     checkUpdateConditions(columnIndex);
 
-    ORowSetValueVector::Vector& rInsert = (*m_aInsertRow)->get();
+    ORowSetValueVector::Vector& rInsert = **m_aInsertRow;
     ORowSetValue aTemp;
     aTemp.fill(x);
     if ( rInsert[columnIndex] != aTemp )
@@ -1277,19 +1277,19 @@ bool ORowSetCache::insertRow(std::vector< Any >& o_aBookmarks)
     if ( bRet )
     {
         ++m_nRowCount;
-        Any aBookmark = ((*m_aInsertRow)->get())[0].makeAny();
+        Any aBookmark = (**m_aInsertRow)[0].makeAny();
         m_bAfterLast = m_bBeforeFirst = false;
         if(aBookmark.hasValue())
         {
             moveToBookmark(aBookmark);
             // update the cached values
-            ORowSetValueVector::Vector& rCurrentRow = (*m_aMatrixIter)->get();
+            ORowSetValueVector::Vector& rCurrentRow = **m_aMatrixIter;
             ORowSetMatrix::const_iterator aIter = m_pMatrix->begin();
             for(;aIter != m_pMatrix->end();++aIter)
             {
-                if ( m_aMatrixIter != aIter && aIter->is() && m_xCacheSet->columnValuesUpdated((*aIter)->get(),rCurrentRow) )
+                if ( m_aMatrixIter != aIter && aIter->is() && m_xCacheSet->columnValuesUpdated(**aIter,rCurrentRow) )
                 {
-                    o_aBookmarks.push_back(lcl_getBookmark((*aIter)->get()[0], m_xCacheSet.get()));
+                    o_aBookmarks.push_back(lcl_getBookmark((**aIter)[0], m_xCacheSet.get()));
                 }
             }
         }
@@ -1325,7 +1325,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator const & _rUpdateRow, std::
     if(isAfterLast() || isBeforeFirst())
         throw SQLException(DBA_RES(RID_STR_NO_UPDATEROW),nullptr,SQLSTATE_GENERAL,1000,Any() );
 
-    Any aBookmark = ((*_rUpdateRow)->get())[0].makeAny();
+    Any aBookmark = (**_rUpdateRow)[0].makeAny();
     OSL_ENSURE(aBookmark.hasValue(),"Bookmark must have a value!");
     // here we don't have to reposition our CacheSet, when we try to update a row,
     // the row was already fetched
@@ -1337,13 +1337,13 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator const & _rUpdateRow, std::
     if ( moveToBookmark(aBookmark) )
     {
         // update the cached values
-        ORowSetValueVector::Vector& rCurrentRow = (*m_aMatrixIter)->get();
+        ORowSetValueVector::Vector& rCurrentRow = **m_aMatrixIter;
         ORowSetMatrix::const_iterator aIter = m_pMatrix->begin();
         for(;aIter != m_pMatrix->end();++aIter)
         {
-            if ( m_aMatrixIter != aIter && aIter->is() && m_xCacheSet->columnValuesUpdated((*aIter)->get(),rCurrentRow) )
+            if ( m_aMatrixIter != aIter && aIter->is() && m_xCacheSet->columnValuesUpdated(**aIter,rCurrentRow) )
             {
-                o_aBookmarks.push_back(lcl_getBookmark((*aIter)->get()[0], m_xCacheSet.get()));
+                o_aBookmarks.push_back(lcl_getBookmark((**aIter)[0], m_xCacheSet.get()));
             }
         }
     }
@@ -1405,8 +1405,8 @@ void ORowSetCache::moveToInsertRow(  )
         *m_aInsertRow = new ORowSetValueVector(m_xMetaData->getColumnCount());
 
     // we don't unbound the bookmark column
-    ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin()+1;
-    ORowSetValueVector::Vector::const_iterator aEnd = (*m_aInsertRow)->get().end();
+    ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->begin()+1;
+    ORowSetValueVector::Vector::const_iterator aEnd = (*m_aInsertRow)->end();
     for(sal_Int32 i = 1;aIter != aEnd;++aIter,++i)
     {
         aIter->setBound(false);
@@ -1491,7 +1491,7 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo
 
     (*(*m_aInsertRow)) = *(*_rOriginalRow);
     // we don't unbound the bookmark column
-    for(auto& rItem : (*m_aInsertRow)->get())
+    for(auto& rItem : **m_aInsertRow)
         rItem.setModified(false);
 }
 
@@ -1507,7 +1507,7 @@ void ORowSetCache::checkPositionFlags()
 
 void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex)
 {
-    if(m_bAfterLast || columnIndex >= static_cast<sal_Int32>((*m_aInsertRow)->get().size()))
+    if(m_bAfterLast || columnIndex >= static_cast<sal_Int32>((*m_aInsertRow)->size()))
         throwFunctionSequenceException(m_xSet.get());
 }
 
@@ -1618,8 +1618,8 @@ void ORowSetCache::clearInsertRow()
     // we don't unbound the bookmark column
     if ( m_aInsertRow != m_pInsertMatrix->end() && m_aInsertRow->is() )
     {
-        ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin()+1;
-        ORowSetValueVector::Vector::const_iterator aEnd = (*m_aInsertRow)->get().end();
+        ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->begin()+1;
+        ORowSetValueVector::Vector::const_iterator aEnd = (*m_aInsertRow)->end();
         for(;aIter != aEnd;++aIter)
         {
             aIter->setBound(false);
@@ -1710,7 +1710,7 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_
     {
         for (auto const& elem : *m_pMatrix)
         {
-            if ( elem.is() && m_xCacheSet->updateColumnValues(elem->get(),io_aRow,o_ChangedColumns))
+            if ( elem.is() && m_xCacheSet->updateColumnValues(*elem,io_aRow,o_ChangedColumns))
             {
                 return;
             }
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index e6c5831c51b6..e269aca6290e 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -824,7 +824,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
             }
         }
 
-        if ( aSelectColumns->get().empty() )
+        if ( aSelectColumns->empty() )
         {
             // This is a valid case. If we can syntactically parse the query, but not semantically
             // (e.g. because it is based on a table we do not know), then there will be no SelectColumns
@@ -837,7 +837,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
         ::connectivity::parse::OParseColumn::StringMap aColumnNames;
 
         sal_Int32 nCount = xResultSetMeta->getColumnCount();
-        OSL_ENSURE( static_cast<size_t>(nCount) == aSelectColumns->get().size(), "OSingleSelectQueryComposer::getColumns: inconsistent column counts, this might result in wrong columns!" );
+        OSL_ENSURE( static_cast<size_t>(nCount) == aSelectColumns->size(), "OSingleSelectQueryComposer::getColumns: inconsistent column counts, this might result in wrong columns!" );
         for(sal_Int32 i=1;i<=nCount;++i)
         {
             OUString sColumnName = xResultSetMeta->getColumnName(i);
@@ -850,23 +850,23 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
             else
                 sColumnLabel = xResultSetMeta->getColumnLabel(i);
             bool bFound = false;
-            OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),sColumnLabel,aCaseCompare);
-            size_t nFoundSelectColumnPos = aFind - aSelectColumns->get().begin();
-            if ( aFind != aSelectColumns->get().end() )
+            OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->begin(),aSelectColumns->end(),sColumnLabel,aCaseCompare);
+            size_t nFoundSelectColumnPos = aFind - aSelectColumns->begin();
+            if ( aFind != aSelectColumns->end() )
             {
                 if ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() )
                 {   // we found a column name which exists twice
                     // so we start after the first found
                     do
                     {
-                        aFind = ::connectivity::findRealName(++aFind,aSelectColumns->get().end(),sColumnName,aCaseCompare);
-                        nFoundSelectColumnPos = aFind - aSelectColumns->get().begin();
+                        aFind = ::connectivity::findRealName(++aFind,aSelectColumns->end(),sColumnName,aCaseCompare);
+                        nFoundSelectColumnPos = aFind - aSelectColumns->begin();
                     }
                     while   (   ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() )
-                                &&  ( aFind != aSelectColumns->get().end() )
+                                &&  ( aFind != aSelectColumns->end() )
                             );
                 }
-                if ( aFind != aSelectColumns->get().end() )
+                if ( aFind != aSelectColumns->end() )
                 {
                     (*aFind)->getPropertyValue(PROPERTY_NAME) >>= sColumnName;
                     aUsedSelectColumns.insert( nFoundSelectColumnPos );
@@ -879,19 +879,19 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
                 continue;
 
             OSQLColumns::Vector::const_iterator aRealFind = ::connectivity::findRealName(
-                aSelectColumns->get().begin(), aSelectColumns->get().end(), sColumnName, aCaseCompare );
+                aSelectColumns->begin(), aSelectColumns->end(), sColumnName, aCaseCompare );
 
-            if ( i > static_cast< sal_Int32>( aSelectColumns->get().size() ) )
+            if ( i > static_cast< sal_Int32>( aSelectColumns->size() ) )
             {
-                aSelectColumns->get().emplace_back(::connectivity::parse::OParseColumn::createColumnForResultSet( xResultSetMeta, m_xMetaData, i ,aColumnNames)
+                aSelectColumns->emplace_back(::connectivity::parse::OParseColumn::createColumnForResultSet( xResultSetMeta, m_xMetaData, i ,aColumnNames)
                 );
-                OSL_ENSURE( aSelectColumns->get().size() == static_cast<size_t>(i), "OSingleSelectQueryComposer::getColumns: inconsistency!" );
+                OSL_ENSURE( aSelectColumns->size() == static_cast<size_t>(i), "OSingleSelectQueryComposer::getColumns: inconsistency!" );
             }
-            else if ( aRealFind == aSelectColumns->get().end() )
+            else if ( aRealFind == aSelectColumns->end() )
             {
                 // we can now only look if we found it under the realname property
                 // here we have to make the assumption that the position is correct
-                OSQLColumns::Vector::const_iterator aFind2 = aSelectColumns->get().begin() + i-1;
+                OSQLColumns::Vector::const_iterator aFind2 = aSelectColumns->begin() + i-1;
                 Reference<XPropertySet> xProp(*aFind2,UNO_QUERY);
                 if ( !xProp.is() || !xProp->getPropertySetInfo()->hasPropertyByName( PROPERTY_REALNAME ) )
                     continue;
@@ -917,7 +917,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
                 pColumn->setRealName(sRealName);
                 pColumn->setTableName(::comphelper::getString(xProp->getPropertyValue(PROPERTY_TABLENAME)));
 
-                (aSelectColumns->get())[i-1] = pColumn;
+                (*aSelectColumns)[i-1] = pColumn;
             }
             else
                 continue;
@@ -932,7 +932,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
 
     } while ( false );
 
-    bool bMissingSomeColumnLabels = !aNames.empty() && aNames.size() != aSelectColumns->get().size();
+    bool bMissingSomeColumnLabels = !aNames.empty() && aNames.size() != aSelectColumns->size();
     SAL_WARN_IF(bMissingSomeColumnLabels, "dbaccess", "We have column labels for *some* columns but not all");
     //^^this happens in the evolution address book where we have real column names of e.g.
     //first_name, second_name and city. On parsing via
@@ -1395,7 +1395,7 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters(  )
     {
         ::rtl::Reference< OSQLColumns> aCols = m_aSqlIterator.getParameters();
         std::vector< OUString> aNames;
-        for (auto const& elem : aCols->get())
+        for (auto const& elem : *aCols)
             aNames.push_back(getString(elem->getPropertyValue(PROPERTY_NAME)));
         m_aCurrentColumns[ParameterColumns].reset( new OPrivateColumns(aCols,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames,true) );
     }
@@ -1441,7 +1441,7 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn
     if ( !m_aCurrentColumns[_eType] )
     {
         std::vector< OUString> aNames;
-        for (auto const& elem : _rCols->get())
+        for (auto const& elem : *_rCols)
             aNames.push_back(getString(elem->getPropertyValue(PROPERTY_NAME)));
         m_aCurrentColumns[_eType].reset( new OPrivateColumns(_rCols,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames,true) );
     }
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 6836ceec97c2..b76b406d6002 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -82,8 +82,8 @@ bool OStaticSet::fetchRow()
     {
         m_aSet.push_back(new connectivity::ORowVector< connectivity::ORowSetValue >(m_xSetMetaData->getColumnCount()));
         m_aSetIter = m_aSet.end() - 1;
-        ((*m_aSetIter)->get())[0] = getRow();
-        OCacheSet::fillValueRow(*m_aSetIter,((*m_aSetIter)->get())[0]);
+        (**m_aSetIter)[0] = getRow();
+        OCacheSet::fillValueRow(*m_aSetIter,(**m_aSetIter)[0]);
     }
     else
         m_bEnd = true;
@@ -100,8 +100,8 @@ void OStaticSet::fillAllRows()
             ORowSetRow pRow = new connectivity::ORowVector< connectivity::ORowSetValue >(nColumnCount);
             m_aSet.push_back(pRow);
             m_aSetIter = m_aSet.end() - 1;
-            (pRow->get())[0] = getRow();
-            OCacheSet::fillValueRow(pRow,(pRow->get())[0]);
+            (*pRow)[0] = getRow();
+            OCacheSet::fillValueRow(pRow,(*pRow)[0]);
         }
         m_bEnd = true;
     }
@@ -253,7 +253,7 @@ void OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OS
     {
         m_aSet.push_back(new ORowVector< ORowSetValue >(*_rInsertRow)); // we don't know where the new row is so we append it to the current rows
         m_aSetIter = m_aSet.end() - 1;
-        ((*m_aSetIter)->get())[0] = (_rInsertRow->get())[0] = getBookmark();
+        (**m_aSetIter)[0] = (*_rInsertRow)[0] = getBookmark();
         m_bEnd = false;
     }
 }
@@ -263,7 +263,7 @@ void OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OS
     OCacheSet::deleteRow(_rDeleteRow,_xTable);
     if(m_bDeleted)
     {
-        ORowSetMatrix::iterator aPos = m_aSet.begin()+(_rDeleteRow->get())[0].getInt32();
+        ORowSetMatrix::iterator aPos = m_aSet.begin()+(*_rDeleteRow)[0].getInt32();
         if(aPos == (m_aSet.end()-1))
             m_aSetIter = m_aSet.end();
         m_aSet.erase(aPos);
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index af325eea88c3..b05a20c4b466 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -80,22 +80,22 @@ void WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
 {
     m_xUpd->moveToInsertRow();
     sal_Int32 i = 1;
-    connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aEnd = _rInsertRow->get().end();
-    for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != aEnd;++aIter,++i)
+    connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aEnd = _rInsertRow->end();
+    for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->begin()+1;aIter != aEnd;++aIter,++i)
     {
         aIter->setSigned(m_aSignedFlags[i-1]);
         updateColumn(i,m_xUpdRow,*aIter);
     }
     m_xUpd->insertRow();
-    (*_rInsertRow->get().begin()) = getBookmark();
+    (*_rInsertRow->begin()) = getBookmark();
 }
 
 void WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
 {
     sal_Int32 i = 1;
-    connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1;
-    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end();
-    for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != aEnd;++aIter,++i,++aOrgIter)
+    connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->begin()+1;
+    connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->end();
+    for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->begin()+1;aIter != aEnd;++aIter,++i,++aOrgIter)
     {
         aIter->setSigned(aOrgIter->isSigned());
         updateColumn(i,m_xUpdRow,*aIter);