diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2020-03-17 21:34:21 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-18 09:49:50 +0100 |
commit | e5230535877e30c3b874495e8794faa3a42d8017 (patch) | |
tree | 6678613797f3cfa80a08455a4080ce9e653f9781 | |
parent | 673728c9caf7b3199dd684f48a32a0f5cafd6285 (diff) |
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>
50 files changed, 561 insertions, 552 deletions
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 76bbafaeb13a..6b94216a3719 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -85,10 +85,10 @@ struct TKeyValueFunc Freeze(); ::rtl::Reference<OKeySet> pKeySet = new OKeySet(); - pKeySet->get().reserve(m_aKeyValues.size()); + pKeySet->reserve(m_aKeyValues.size()); std::transform(m_aKeyValues.begin() ,m_aKeyValues.end() - ,std::back_inserter(pKeySet->get()) + ,std::back_inserter(*pKeySet) ,::o3tl::select1st<TIntValuePairVector::value_type>()); pKeySet->setFrozen(); return pKeySet; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 9398a50a7bc0..c0b88f1c7ba1 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1965,8 +1965,8 @@ void checkDisposed(bool _bThrow) } -OSQLColumns::Vector::const_iterator find(const OSQLColumns::Vector::const_iterator& first, - const OSQLColumns::Vector::const_iterator& last, +OSQLColumns::const_iterator find(const OSQLColumns::const_iterator& first, + const OSQLColumns::const_iterator& last, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { @@ -1974,8 +1974,8 @@ OSQLColumns::Vector::const_iterator find(const OSQLColumns::Vector::const_iterat return find(first,last,sName,_rVal,_rCase); } -OSQLColumns::Vector::const_iterator findRealName(const OSQLColumns::Vector::const_iterator& first, - const OSQLColumns::Vector::const_iterator& last, +OSQLColumns::const_iterator findRealName(const OSQLColumns::const_iterator& first, + const OSQLColumns::const_iterator& last, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { @@ -1983,8 +1983,8 @@ OSQLColumns::Vector::const_iterator findRealName(const OSQLColumns::Vector::cons return find(first,last,sRealName,_rVal,_rCase); } -OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator first, - const OSQLColumns::Vector::const_iterator& last, +OSQLColumns::const_iterator find(OSQLColumns::const_iterator first, + const OSQLColumns::const_iterator& last, const OUString& _rProp, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index f22db852d77d..1d905aa73ea8 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -478,12 +478,12 @@ void OCalcTable::fillColumns() // check if the column name already exists OUString aAlias = aColumnName; - OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); + OSQLColumns::const_iterator aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); sal_Int32 nExprCnt = 0; - while(aFind != m_aColumns->get().end()) + while(aFind != m_aColumns->end()) { aAlias = aColumnName + OUString::number(++nExprCnt); - aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); + aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); } sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, OUString(),OUString(), @@ -492,7 +492,7 @@ void OCalcTable::fillColumns() bStoresMixedCaseQuotedIdentifiers, m_CatalogName, getSchema(), getName()); Reference< XPropertySet> xCol = pColumn; - m_aColumns->get().push_back(xCol); + m_aColumns->push_back(xCol); m_aTypes.push_back(eType); } } @@ -633,21 +633,21 @@ bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols, // read the bookmark _rRow->setDeleted(false); - *(_rRow->get())[0] = m_nFilePos; + *(*_rRow)[0] = m_nFilePos; if (!bRetrieveData) return true; // fields - const OValueRefVector::Vector::size_type nCount = std::min(_rRow->get().size(), _rCols.get().size() + 1); - for (OValueRefVector::Vector::size_type i = 1; i < nCount; i++) + const OValueRefVector::size_type nCount = std::min(_rRow->size(), _rCols.size() + 1); + for (OValueRefVector::size_type i = 1; i < nCount; i++) { - if ( (_rRow->get())[i]->isBound() ) + if ( (*_rRow)[i]->isBound() ) { sal_Int32 nType = m_aTypes[i-1]; - lcl_SetValue( (_rRow->get())[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders, + lcl_SetValue( (*_rRow)[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders, m_aNullDate, m_nFilePos, i, nType ); } } diff --git a/connectivity/source/drivers/component/CColumns.cxx b/connectivity/source/drivers/component/CColumns.cxx index 244b6623d460..9f802b6e4c57 100644 --- a/connectivity/source/drivers/component/CColumns.cxx +++ b/connectivity/source/drivers/component/CColumns.cxx @@ -33,9 +33,9 @@ sdbcx::ObjectType OComponentColumns::createObject(const OUString& _rName) { ::rtl::Reference<OSQLColumns> aCols = m_pTable->getTableColumns(); - OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; - if(aIter != aCols->get().end()) + if(aIter != aCols->end()) xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx index 9ff212a8911e..050b4034da45 100644 --- a/connectivity/source/drivers/component/CResultSet.cxx +++ b/connectivity/source/drivers/component/CResultSet.cxx @@ -77,7 +77,7 @@ Any SAL_CALL OComponentResultSet::getBookmark( ) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return makeAny(static_cast<sal_Int32>((m_aRow->get())[0]->getValue())); + return makeAny(static_cast<sal_Int32>((*m_aRow)[0]->getValue())); } sal_Bool SAL_CALL OComponentResultSet::moveToBookmark( const Any& bookmark ) diff --git a/connectivity/source/drivers/component/CTable.cxx b/connectivity/source/drivers/component/CTable.cxx index 14b167347d09..9b5354d266d1 100644 --- a/connectivity/source/drivers/component/CTable.cxx +++ b/connectivity/source/drivers/component/CTable.cxx @@ -57,7 +57,7 @@ void OComponentTable::refreshColumns() ::std::vector< OUString> aVector; - for(const auto& rxColumn : m_aColumns->get()) + for(const auto& rxColumn : *m_aColumns) aVector.push_back(Reference< XNamed>(rxColumn,UNO_QUERY_THROW)->getName()); if(m_xColumns) diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index 6f884dca8572..b997ec8d9087 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -35,10 +35,10 @@ sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName) ODbaseTable* pTable = static_cast<ODbaseTable*>(m_pTable); const ::rtl::Reference<OSQLColumns>& aCols = pTable->getTableColumns(); - OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; - if(aIter != aCols->get().end()) + if(aIter != aCols->end()) xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 0dae008f981f..fdb782174412 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -533,7 +533,7 @@ void ODbaseIndex::CreateImpl() memset(&m_aHeader,0,sizeof(m_aHeader)); sal_Int32 nType = 0; ::rtl::Reference<OSQLColumns> aCols = m_pTable->getTableColumns(); - const Reference< XPropertySet > xTableCol(*find(aCols->get().begin(),aCols->get().end(),aName,::comphelper::UStringMixEqual(isCaseSensitive()))); + const Reference< XPropertySet > xTableCol(*find(aCols->begin(),aCols->end(),aName,::comphelper::UStringMixEqual(isCaseSensitive()))); xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 12f0fc2e0e49..886c7273db31 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -38,10 +38,10 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName) const ODbaseTable* pTable = m_pIndex->getTable(); const ::rtl::Reference<OSQLColumns>& aCols = pTable->getTableColumns(); - OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); Reference< XPropertySet > xCol; - if(aIter != aCols->get().end()) + if(aIter != aCols->end()) xCol = *aIter; if(!xCol.is()) diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index 2ca942fecdc8..f9395a359465 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -81,7 +81,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark( ) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); OSL_ENSURE((m_bShowDeleted || !m_aRow->isDeleted()),"getBookmark called for deleted row"); - return makeAny(static_cast<sal_Int32>((m_aRow->get())[0]->getValue())); + return makeAny(static_cast<sal_Int32>((*m_aRow)[0]->getValue())); } sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) @@ -165,7 +165,7 @@ bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_xInde sal_uInt32 nRec = pIter->First(); while (nRec != NODE_NOTFOUND) { - m_pFileSet->get().push_back(nRec); + m_pFileSet->push_back(nRec); nRec = pIter->Next(); } m_pFileSet->setFrozen(); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 6566e165a9cc..bf2036b2ca19 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -277,7 +277,7 @@ void ODbaseTable::fillColumns() if(!m_aColumns.is()) m_aColumns = new OSQLColumns(); else - m_aColumns->get().clear(); + m_aColumns->clear(); m_aTypes.clear(); m_aPrecisions.clear(); @@ -287,7 +287,7 @@ void ODbaseTable::fillColumns() const sal_Int32 nFieldCount = (m_aHeader.headerLength - 1) / 32 - 1; OSL_ENSURE(nFieldCount,"No columns in table!"); - m_aColumns->get().reserve(nFieldCount); + m_aColumns->reserve(nFieldCount); m_aTypes.reserve(nFieldCount); m_aPrecisions.reserve(nFieldCount); m_aScales.reserve(nFieldCount); @@ -426,7 +426,7 @@ void ODbaseTable::fillColumns() bIsCurrency, bCase, m_CatalogName, getSchema(), getName()); - m_aColumns->get().push_back(xCol); + m_aColumns->push_back(xCol); } // for (; i < nFieldCount; i++) OSL_ENSURE(i,"No columns in table!"); } @@ -636,9 +636,9 @@ void ODbaseTable::refreshColumns() ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString> aVector; - aVector.reserve(m_aColumns->get().size()); + aVector.reserve(m_aColumns->size()); - for (auto const& column : m_aColumns->get()) + for (auto const& column : *m_aColumns) aVector.push_back(Reference< XNamed>(column,UNO_QUERY_THROW)->getName()); if(m_xColumns) @@ -758,16 +758,16 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool // Mark record as deleted _rRow->setDeleted(bIsCurRecordDeleted); - *(_rRow->get())[0] = m_nFilePos; + *(*_rRow)[0] = m_nFilePos; if (!bRetrieveData) return true; std::size_t nByteOffset = 1; // Fields: - OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); - OSQLColumns::Vector::const_iterator aEnd = _rCols.get().end(); - const std::size_t nCount = _rRow->get().size(); + OSQLColumns::const_iterator aIter = _rCols.begin(); + OSQLColumns::const_iterator aEnd = _rCols.end(); + const std::size_t nCount = _rRow->size(); for (std::size_t i = 1; aIter != aEnd && nByteOffset <= m_nBufferSize && i < nCount;++aIter, i++) { // Lengths depending on data type: @@ -798,7 +798,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool } // Is the variable bound? - if ( !(_rRow->get())[i]->isBound() ) + if ( !(*_rRow)[i]->isBound() ) { // No - next field. nByteOffset += nLen; @@ -822,12 +822,12 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool if (nLastPos < 0) { // Empty string. Skip it. - (_rRow->get())[i]->setNull(); + (*_rRow)[i]->setNull(); } else { // Commit the string. Use intern() to ref-count it. - *(_rRow->get())[i] = OUString::intern(pData, static_cast<sal_Int32>(nLastPos+1), m_eEncoding); + *(*_rRow)[i] = OUString::intern(pData, static_cast<sal_Int32>(nLastPos+1), m_eEncoding); } } // if (nType == DataType::CHAR || nType == DataType::VARCHAR) else if ( DataType::TIMESTAMP == nType ) @@ -837,13 +837,13 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool memcpy(&nTime, pData+ 4, 4); if ( !nDate && !nTime ) { - (_rRow->get())[i]->setNull(); + (*_rRow)[i]->setNull(); } else { css::util::DateTime aDateTime; lcl_CalDate(nDate,nTime,aDateTime); - *(_rRow->get())[i] = aDateTime; + *(*_rRow)[i] = aDateTime; } } else if ( DataType::INTEGER == nType ) @@ -852,7 +852,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool if (o3tl::make_unsigned(nLen) > sizeof(nValue)) return false; memcpy(&nValue, pData, nLen); - *(_rRow->get())[i] = nValue; + *(*_rRow)[i] = nValue; } else if ( DataType::DOUBLE == nType ) { @@ -876,7 +876,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool memcpy(&d, pData, nLen); } - *(_rRow->get())[i] = d; + *(*_rRow)[i] = d; } else { @@ -902,7 +902,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool { // Empty string. Skip it. nByteOffset += nLen; - (_rRow->get())[i]->setNull(); // no values -> done + (*_rRow)[i]->setNull(); // no values -> done continue; } @@ -914,7 +914,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool { if (aStr.getLength() != nLen) { - (_rRow->get())[i]->setNull(); + (*_rRow)[i]->setNull(); break; } const sal_uInt16 nYear = static_cast<sal_uInt16>(aStr.copy( 0, 4 ).toInt32()); @@ -922,11 +922,11 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool const sal_uInt16 nDay = static_cast<sal_uInt16>(aStr.copy( 6, 2 ).toInt32()); const css::util::Date aDate(nDay,nMonth,nYear); - *(_rRow->get())[i] = aDate; + *(*_rRow)[i] = aDate; } break; case DataType::DECIMAL: - *(_rRow->get())[i] = ORowSetValue(aStr); + *(*_rRow)[i] = ORowSetValue(aStr); break; case DataType::BIT: { @@ -938,7 +938,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool case 'J': b = true; break; default: b = false; break; } - *(_rRow->get())[i] = b; + *(*_rRow)[i] = b; } break; case DataType::LONGVARBINARY: @@ -948,16 +948,16 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool const long nBlockNo = aStr.toInt32(); // read blocknumber if (nBlockNo > 0 && m_pMemoStream) // Read data from memo-file, only if { - if ( !ReadMemo(nBlockNo, (_rRow->get())[i]->get()) ) + if ( !ReadMemo(nBlockNo, (*_rRow)[i]->get()) ) break; } else - (_rRow->get())[i]->setNull(); + (*_rRow)[i]->setNull(); } break; default: SAL_WARN( "connectivity.drivers","Wrong type"); } - (_rRow->get())[i]->setTypeKind(nType); + (*_rRow)[i]->setTypeKind(nType); } nByteOffset += nLen; @@ -1494,7 +1494,7 @@ bool ODbaseTable::InsertRow(OValueRefVector& rRow, const Reference<XIndexAccess> // raise number if successfully m_aHeader.nbRecords++; - *rRow.get()[0] = m_nFilePos; // set bookmark + *rRow[0] = m_nFilePos; // set bookmark m_nFilePos = nTempPos; } } @@ -1542,7 +1542,7 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols) std::size_t nFilePos = m_aHeader.headerLength + static_cast<long>(m_nFilePos-1) * m_aHeader.recordLength; m_pFileStream->Seek(nFilePos); - OValueRefRow aRow = new OValueRefVector(_rCols.get().size()); + OValueRefRow aRow = new OValueRefVector(_rCols.size()); if (!fetchRow(aRow,_rCols,true)) return false; @@ -1566,14 +1566,14 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols) ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelId()) ); OSL_ENSURE(pIndex,"ODbaseTable::DeleteRow: No Index returned!"); - OSQLColumns::Vector::const_iterator aIter = std::find_if(_rCols.get().begin(), _rCols.get().end(), - [&aCase, &aColName](const OSQLColumns::Vector::value_type& rxCol) { + OSQLColumns::const_iterator aIter = std::find_if(_rCols.begin(), _rCols.end(), + [&aCase, &aColName](const OSQLColumns::value_type& rxCol) { return aCase(getString(rxCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME))), aColName); }); - if (aIter == _rCols.get().end()) + if (aIter == _rCols.end()) continue; - auto nPos = static_cast<sal_Int32>(std::distance(_rCols.get().begin(), aIter)) + 1; - pIndex->Delete(m_nFilePos,*(aRow->get())[nPos]); + auto nPos = static_cast<sal_Int32>(std::distance(_rCols.begin(), aIter)) + 1; + pIndex->Delete(m_nFilePos,*(*aRow)[nPos]); } } } @@ -1663,7 +1663,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo if (xIndex.is()) { // first check if the value is different to the old one and when if it conform to the index - if(pOrgRow.is() && (rRow.get()[nPos]->getValue().isNull() || rRow.get()[nPos] == (pOrgRow->get())[nPos])) + if(pOrgRow.is() && (rRow[nPos]->getValue().isNull() || rRow[nPos] == (*pOrgRow)[nPos])) continue; else { @@ -1672,7 +1672,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelId()) ); OSL_ENSURE(pIndex,"ODbaseTable::UpdateBuffer: No Index returned!"); - if (pIndex->Find(0,*rRow.get()[nPos])) + if (pIndex->Find(0,*rRow[nPos])) { // There is no unique value if ( aColName.isEmpty() ) @@ -1763,7 +1763,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo ++nPos; // the row values start at 1 - const ORowSetValue &thisColVal = rRow.get()[nPos]->get(); + const ORowSetValue &thisColVal = rRow[nPos]->get(); const bool thisColIsBound = thisColVal.isBound(); const bool thisColIsNull = !thisColIsBound || thisColVal.isNull(); // don't overwrite non-bound columns @@ -1781,7 +1781,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo OSL_ENSURE(pIndex,"ODbaseTable::UpdateBuffer: No Index returned!"); // Update !! if (pOrgRow.is() && !thisColIsNull) - pIndex->Update(m_nFilePos, *(pOrgRow->get())[nPos], thisColVal); + pIndex->Update(m_nFilePos, *(*pOrgRow)[nPos], thisColVal); else pIndex->Insert(m_nFilePos, thisColVal); } @@ -1877,7 +1877,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo // Write value right-justified, padded with blanks to the left. memcpy(pData+nLen-nValueLen,aDefaultValue.getStr(),nValueLen); // write the resulting double back - *rRow.get()[nPos] = toDouble(aDefaultValue); + *rRow[nPos] = toDouble(aDefaultValue); } else { @@ -2464,19 +2464,19 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) if(_nPos) { aInsertRow = new OValueRefVector(_pNewTable->m_xColumns->getCount()); - std::for_each(aInsertRow->get().begin(),aInsertRow->get().end(),TSetRefBound(true)); + std::for_each(aInsertRow->begin(),aInsertRow->end(),TSetRefBound(true)); } else aInsertRow = aRow; // we only have to bind the values which we need to copy into the new table - std::for_each(aRow->get().begin(),aRow->get().end(),TSetRefBound(true)); - if(_nPos && (_nPos < static_cast<sal_Int32>(aRow->get().size()))) - (aRow->get())[nPos]->setBound(false); + std::for_each(aRow->begin(),aRow->end(),TSetRefBound(true)); + if(_nPos && (_nPos < static_cast<sal_Int32>(aRow->size()))) + (*aRow)[nPos]->setBound(false); sal_Int32 nCurPos; - OValueRefVector::Vector::const_iterator aIter; + OValueRefVector::const_iterator aIter; for(sal_uInt32 nRowPos = 0; nRowPos < m_aHeader.nbRecords;++nRowPos) { bool bOk = seekRow( IResultSetHelper::BOOKMARK, nRowPos+1, nCurPos ); @@ -2488,9 +2488,9 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) // special handling when pos == 0 then we don't have to distinguish between the two rows if(_nPos) { - aIter = aRow->get().begin()+1; + aIter = aRow->begin()+1; sal_Int32 nCount = 1; - for(OValueRefVector::Vector::iterator aInsertIter = aInsertRow->get().begin()+1; aIter != aRow->get().end() && aInsertIter != aInsertRow->get().end();++aIter,++nCount) + for(OValueRefVector::iterator aInsertIter = aInsertRow->begin()+1; aIter != aRow->end() && aInsertIter != aInsertRow->end();++aIter,++nCount) { if(nPos != nCount) { diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 9bbff49ccc7b..4982cc455665 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -42,7 +42,7 @@ void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity { static const char aName[] = "Name"; - for (const auto& rxColumn : xColumns->get()) + for (const auto& rxColumn : *xColumns) { OUString aFieldName; diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx index bd17c4fc85ba..7c26081da12e 100644 --- a/connectivity/source/drivers/file/FNoException.cxx +++ b/connectivity/source/drivers/file/FNoException.cxx @@ -85,14 +85,14 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,std::vector< OS std::unique_ptr<OKeyValue> OResultSet::GetOrderbyKeyValue(OValueRefRow const & _rRow) { - sal_uInt32 nBookmarkValue = std::abs(static_cast<sal_Int32>((_rRow->get())[0]->getValue())); + sal_uInt32 nBookmarkValue = std::abs(static_cast<sal_Int32>((*_rRow)[0]->getValue())); std::unique_ptr<OKeyValue> pKeyValue = OKeyValue::createKeyValue(nBookmarkValue); for (auto const& elem : m_aOrderbyColumnNumber) { - OSL_ENSURE(elem < static_cast<sal_Int32>(_rRow->get().size()),"Invalid index for orderkey values!"); - pKeyValue->pushKey(new ORowSetValueDecorator((_rRow->get())[elem]->getValue())); + OSL_ENSURE(elem < static_cast<sal_Int32>(_rRow->size()),"Invalid index for orderkey values!"); + pKeyValue->pushKey(new ORowSetValueDecorator((*_rRow)[elem]->getValue())); } return pKeyValue; diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 9cf70d452c10..6d74583935ca 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -68,7 +68,7 @@ void OPreparedStatement::disposing() m_xMetaData.clear(); if(m_aParameterRow.is()) { - m_aParameterRow->get().clear(); + m_aParameterRow->clear(); m_aParameterRow = nullptr; } } @@ -78,7 +78,7 @@ void OPreparedStatement::construct(const OUString& sql) OStatement_Base::construct(sql); m_aParameterRow = new OValueRefVector(); - m_aParameterRow->get().push_back(new ORowSetValueDecorator(sal_Int32(0)) ); + m_aParameterRow->push_back(new ORowSetValueDecorator(sal_Int32(0)) ); Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); @@ -260,9 +260,9 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / checkAndResizeParameters(parameterIndex); if ( m_aAssignValues.is() ) - (m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]]->setNull(); + (*m_aAssignValues)[m_aParameterIndexes[parameterIndex]]->setNull(); else - (m_aParameterRow->get())[parameterIndex]->setNull(); + (*m_aParameterRow)[parameterIndex]->setNull(); } @@ -359,8 +359,8 @@ void SAL_CALL OPreparedStatement::clearParameters( ) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - m_aParameterRow->get().clear(); - m_aParameterRow->get().push_back(new ORowSetValueDecorator(sal_Int32(0)) ); + m_aParameterRow->clear(); + m_aParameterRow->push_back(new ORowSetValueDecorator(sal_Int32(0)) ); } OResultSet* OPreparedStatement::createResultSet() @@ -371,8 +371,8 @@ OResultSet* OPreparedStatement::createResultSet() void OPreparedStatement::initResultSet(OResultSet *pResultSet) { // check if we got enough parameters - if ( (m_aParameterRow.is() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) || - (m_xParamColumns.is() && !m_aParameterRow.is() && !m_aParameterRow->get().empty()) ) + if ( (m_aParameterRow.is() && ( m_aParameterRow->size() -1 ) < m_xParamColumns->size()) || + (m_xParamColumns.is() && !m_aParameterRow.is() && !m_aParameterRow->empty()) ) m_pConnection->throwGenericSQLException(STR_INVALID_PARA_COUNT,*this); pResultSet->OpenImpl(); @@ -394,14 +394,14 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) ::connectivity::checkDisposed(OStatement_BASE::rBHelper.bDisposed); if ( m_aAssignValues.is() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) ) throwInvalidIndexException(*this); - else if ( static_cast<sal_Int32>(m_aParameterRow->get().size()) <= parameterIndex ) + else if ( static_cast<sal_Int32>(m_aParameterRow->size()) <= parameterIndex ) { - sal_Int32 i = m_aParameterRow->get().size(); - m_aParameterRow->get().resize(parameterIndex+1); + sal_Int32 i = m_aParameterRow->size(); + m_aParameterRow->resize(parameterIndex+1); for ( ; i <= parameterIndex; ++i) { - if ( !(m_aParameterRow->get())[i].is() ) - (m_aParameterRow->get())[i] = new ORowSetValueDecorator; + if ( !(*m_aParameterRow)[i].is() ) + (*m_aParameterRow)[i] = new ORowSetValueDecorator; } } } @@ -412,9 +412,9 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal checkAndResizeParameters(parameterIndex); if(m_aAssignValues.is()) - *(m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]] = x; + *(*m_aAssignValues)[m_aParameterIndexes[parameterIndex]] = x; else - *((m_aParameterRow->get())[parameterIndex]) = x; + *((*m_aParameterRow)[parameterIndex]) = x; } sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode const * pParameter, const Reference<XPropertySet>& _xCol) @@ -455,8 +455,8 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode const * pParameter, co ,OUString() ,OUString() ,OUString()); - m_xParamColumns->get().push_back(xParaColumn); - return m_xParamColumns->get().size(); + m_xParamColumns->push_back(xParaColumn); + return m_xParamColumns->size(); } void OPreparedStatement::describeColumn(OSQLParseNode const * _pParameter, OSQLParseNode const * _pNode,const OSQLTable& _xTable) @@ -501,13 +501,13 @@ void OPreparedStatement::initializeResultSet(OResultSet* pRS) OStatement_Base::initializeResultSet(pRS); // Substitute parameter (AssignValues and criteria): - if (!m_xParamColumns->get().empty()) + if (!m_xParamColumns->empty()) { // begin with AssignValues sal_uInt16 nParaCount=0; // gives the current number of previously set Parameters // search for parameters to be substituted: - size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 is important for the Criteria + size_t nCount = m_aAssignValues.is() ? m_aAssignValues->size() : 1; // 1 is important for the Criteria for (size_t j = 1; j < nCount; j++) { sal_uInt32 nParameter = (*m_aAssignValues).getParameterIndex(j); @@ -517,18 +517,18 @@ void OPreparedStatement::initializeResultSet(OResultSet* pRS) ++nParaCount; // now the Parameter is valid } - if (m_aParameterRow.is() && (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() ) + if (m_aParameterRow.is() && (m_xParamColumns->size()+1) != m_aParameterRow->size() ) { - sal_Int32 i = m_aParameterRow->get().size(); - sal_Int32 nParamColumns = m_xParamColumns->get().size()+1; - m_aParameterRow->get().resize(nParamColumns); + sal_Int32 i = m_aParameterRow->size(); + sal_Int32 nParamColumns = m_xParamColumns->size()+1; + m_aParameterRow->resize(nParamColumns); for ( ;i < nParamColumns; ++i ) { - if ( !(m_aParameterRow->get())[i].is() ) - (m_aParameterRow->get())[i] = new ORowSetValueDecorator; + if ( !(*m_aParameterRow)[i].is() ) + (*m_aParameterRow)[i] = new ORowSetValueDecorator; } } - if (m_aParameterRow.is() && nParaCount < m_aParameterRow->get().size() ) + if (m_aParameterRow.is() && nParaCount < m_aParameterRow->size() ) m_pSQLAnalyzer->bindParameterRow(m_aParameterRow); } } @@ -540,9 +540,9 @@ void OPreparedStatement::parseParamterElem(const OUString& _sColumnName, OSQLPar sal_Int32 nParameter = -1; if(m_xParamColumns.is()) { - OSQLColumns::Vector::const_iterator aIter = find(m_xParamColumns->get().begin(),m_xParamColumns->get().end(),_sColumnName,::comphelper::UStringMixEqual(m_pTable->isCaseSensitive())); - if(aIter != m_xParamColumns->get().end()) - nParameter = m_xParamColumns->get().size() - (m_xParamColumns->get().end() - aIter) + 1;// +1 because the rows start at 1 + OSQLColumns::const_iterator aIter = find(m_xParamColumns->begin(),m_xParamColumns->end(),_sColumnName,::comphelper::UStringMixEqual(m_pTable->isCaseSensitive())); + if(aIter != m_xParamColumns->end()) + nParameter = m_xParamColumns->size() - (m_xParamColumns->end() - aIter) + 1;// +1 because the rows start at 1 } if(nParameter == -1) nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index adcbb0897197..3b8f69d6ab6e 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -141,7 +141,7 @@ void OResultSet::disposing() m_pSortIndex.reset(); if(m_aInsertRow.is()) - m_aInsertRow->get().clear(); + m_aInsertRow->clear(); m_aSkipDeletedSet.clear(); } @@ -193,8 +193,8 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex) checkIndex(columnIndex ); - m_bWasNull = (m_aSelectRow->get())[columnIndex]->getValue().isNull(); - return *(m_aSelectRow->get())[columnIndex]; + m_bWasNull = (*m_aSelectRow)[columnIndex]->getValue().isNull(); + return *(*m_aSelectRow)[columnIndex]; } void OResultSet::checkIndex(sal_Int32 columnIndex ) @@ -264,7 +264,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) OSL_ENSURE((m_bShowDeleted || !m_aRow->isDeleted()),"getRow called for deleted row"); - return m_aSkipDeletedSet.getMappedPosition((m_aRow->get())[0]->getValue()); + return m_aSkipDeletedSet.getMappedPosition((*m_aRow)[0]->getValue()); } @@ -341,7 +341,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_nRowPos == sal_Int32(m_pFileSet->get().size()); + return m_nRowPos == sal_Int32(m_pFileSet->size()); } sal_Bool SAL_CALL OResultSet::isFirst( ) @@ -359,7 +359,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_nRowPos == sal_Int32(m_pFileSet->get().size() - 1); + return m_nRowPos == sal_Int32(m_pFileSet->size() - 1); } void SAL_CALL OResultSet::beforeFirst( ) @@ -518,12 +518,12 @@ void SAL_CALL OResultSet::insertRow( ) m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, m_xColsIdx); if(m_bRowInserted && m_pFileSet.is()) { - sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue(); - m_pFileSet->get().push_back(nPos); - *(m_aInsertRow->get())[0] = sal_Int32(m_pFileSet->get().size()); + sal_Int32 nPos = (*m_aInsertRow)[0]->getValue(); + m_pFileSet->push_back(nPos); + *(*m_aInsertRow)[0] = sal_Int32(m_pFileSet->size()); clearInsertRow(); - m_aSkipDeletedSet.insertNewPosition((m_aRow->get())[0]->getValue()); + m_aSkipDeletedSet.insertNewPosition((*m_aRow)[0]->getValue()); } } @@ -536,7 +536,7 @@ void SAL_CALL OResultSet::updateRow( ) lcl_throwError(STR_TABLE_READONLY,*this); m_bRowUpdated = m_pTable->UpdateRow(*m_aInsertRow, m_aRow,m_xColsIdx); - *(m_aInsertRow->get())[0] = static_cast<sal_Int32>((m_aRow->get())[0]->getValue()); + *(*m_aInsertRow)[0] = static_cast<sal_Int32>((*m_aRow)[0]->getValue()); clearInsertRow(); } @@ -553,7 +553,7 @@ void SAL_CALL OResultSet::deleteRow() if(m_aRow->isDeleted()) lcl_throwError(STR_ROW_ALREADY_DELETED,*this); - sal_Int32 nPos = static_cast<sal_Int32>((m_aRow->get())[0]->getValue()); + sal_Int32 nPos = static_cast<sal_Int32>((*m_aRow)[0]->getValue()); m_bRowDeleted = m_pTable->DeleteRow(*m_xColumns); if(m_bRowDeleted && m_pFileSet.is()) { @@ -576,8 +576,8 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) if(m_aInsertRow.is()) { - OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1; - for(;aIter != m_aInsertRow->get().end();++aIter) + OValueRefVector::iterator aIter = m_aInsertRow->begin()+1; + for(;aIter != m_aInsertRow->end();++aIter) { (*aIter)->setBound(false); (*aIter)->setNull(); @@ -596,8 +596,8 @@ void SAL_CALL OResultSet::moveToInsertRow( ) m_bInserted = true; - OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1; - for(;aIter != m_aInsertRow->get().end();++aIter) + OValueRefVector::iterator aIter = m_aInsertRow->begin()+1; + for(;aIter != m_aInsertRow->end();++aIter) { (*aIter)->setBound(false); (*aIter)->setNull(); @@ -617,8 +617,8 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) checkIndex(columnIndex ); columnIndex = mapColumn(columnIndex); - (m_aInsertRow->get())[columnIndex]->setBound(true); - *(m_aInsertRow->get())[columnIndex] = x; + (*m_aInsertRow)[columnIndex]->setBound(true); + *(*m_aInsertRow)[columnIndex] = x; } @@ -837,8 +837,8 @@ again: } else if (m_pFileSet.is()) { - sal_uInt32 nBookmarkValue = std::abs(static_cast<sal_Int32>((m_aEvaluateRow->get())[0]->getValue())); - m_pFileSet->get().push_back(nBookmarkValue); + sal_uInt32 nBookmarkValue = std::abs(static_cast<sal_Int32>((*m_aEvaluateRow)[0]->getValue())); + m_pFileSet->push_back(nBookmarkValue); } } else if (m_aSQLIterator.getStatementType() == OSQLStatementType::Update) @@ -887,7 +887,7 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff ExecuteRow(eCursorPosition,nOffset,false,bRetrieveData); // now set the bookmark for outside this is the logical pos and not the file pos - *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); + *(*m_aRow->begin()) = sal_Int32(m_nRowPos + 1); } else { @@ -904,7 +904,7 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff m_nRowPos = 0; break; case IResultSetHelper::LAST: - m_nRowPos = m_pFileSet->get().size() - 1; + m_nRowPos = m_pFileSet->size() - 1; break; case IResultSetHelper::RELATIVE1: m_nRowPos += nOffset; @@ -921,21 +921,21 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff // The FileCursor is outside of the valid range, if: // a.) m_nRowPos < 1 // b.) a KeySet exists and m_nRowPos > m_pFileSet->size() - if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= static_cast<sal_Int32>(m_pFileSet->get().size()) )) // && m_pFileSet->IsFrozen() + if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= static_cast<sal_Int32>(m_pFileSet->size()) )) // && m_pFileSet->IsFrozen() { goto Error; } else { - if (m_nRowPos < static_cast<sal_Int32>(m_pFileSet->get().size())) + if (m_nRowPos < static_cast<sal_Int32>(m_pFileSet->size())) { // Fetch via Index - bool bOK = ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],false,bRetrieveData); + bool bOK = ExecuteRow(IResultSetHelper::BOOKMARK,(*m_pFileSet)[m_nRowPos],false,bRetrieveData); if (!bOK) goto Error; // now set the bookmark for outside - *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); + *(*m_aRow->begin()) = sal_Int32(m_nRowPos + 1); if ( (bRetrieveData || m_pSQLAnalyzer->hasRestriction()) && m_pSQLAnalyzer->hasFunctions() ) { m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); @@ -944,18 +944,18 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff else // Index must be further constructed { // set first on the last known row - if (m_pFileSet->get().empty()) + if (m_pFileSet->empty()) { m_pTable->seekRow(IResultSetHelper::ABSOLUTE1, 0, m_nFilePos); } else { - m_aFileSetIter = m_pFileSet->get().end()-1; + m_aFileSetIter = m_pFileSet->end()-1; m_pTable->seekRow(IResultSetHelper::BOOKMARK, *m_aFileSetIter, m_nFilePos); } bool bOK = true; // Determine the number of further Fetches - while (bOK && m_nRowPos >= static_cast<sal_Int32>(m_pFileSet->get().size())) + while (bOK && m_nRowPos >= static_cast<sal_Int32>(m_pFileSet->size())) { bOK = ExecuteRow(IResultSetHelper::NEXT,1,true, false);//bRetrieveData); } @@ -966,7 +966,7 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), bRetrieveData); // now set the bookmark for outside - *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); + *(*m_aRow->begin()) = sal_Int32(m_nRowPos + 1); if ( (bRetrieveData || m_pSQLAnalyzer->hasRestriction()) && m_pSQLAnalyzer->hasFunctions() ) { @@ -1014,12 +1014,12 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff { // put COUNT(*) in result-row // (must be the first and only variable in the row) - if (m_aRow->get().size() >= 2) + if (m_aRow->size() >= 2) { - *(m_aRow->get())[1] = m_nRowCountResult; - *(m_aRow->get())[0] = sal_Int32(1); - (m_aRow->get())[1]->setBound(true); - (m_aSelectRow->get())[1] = (m_aRow->get())[1]; + *(*m_aRow)[1] = m_nRowCountResult; + *(*m_aRow)[0] = sal_Int32(1); + (*m_aRow)[1]->setBound(true); + (*m_aSelectRow)[1] = (*m_aRow)[1]; } } else @@ -1052,7 +1052,7 @@ Error: case IResultSetHelper::ABSOLUTE1: case IResultSetHelper::RELATIVE1: if (nOffset > 0) - m_nRowPos = m_pFileSet.is() ? static_cast<sal_Int32>(m_pFileSet->get().size()) : -1; + m_nRowPos = m_pFileSet.is() ? static_cast<sal_Int32>(m_pFileSet->size()) : -1; else if (nOffset < 0) m_nRowPos = -1; break; @@ -1102,8 +1102,8 @@ void OResultSet::sortRows() size_t i = 0; for (auto const& elem : m_aOrderbyColumnNumber) { - OSL_ENSURE(static_cast<sal_Int32>(m_aSelectRow->get().size()) > elem,"Invalid Index"); - switch ((*(m_aSelectRow->get().begin()+elem))->getValue().getTypeKind()) + OSL_ENSURE(static_cast<sal_Int32>(m_aSelectRow->size()) > elem,"Invalid Index"); + switch ((*(m_aSelectRow->begin()+elem))->getValue().getTypeKind()) { case DataType::CHAR: case DataType::VARCHAR: @@ -1132,7 +1132,7 @@ void OResultSet::sortRows() SAL_WARN( "connectivity.drivers","OFILECursor::Execute: Data type not implemented"); break; } - (m_aSelectRow->get())[elem]->setBound(true); + (*m_aSelectRow)[elem]->setBound(true); ++i; } @@ -1140,10 +1140,10 @@ void OResultSet::sortRows() while ( ExecuteRow( IResultSetHelper::NEXT, 1, false ) ) { - m_aSelectRow->get()[0]->setValue( m_aRow->get()[0]->getValue() ); + (*m_aSelectRow)[0]->setValue( (*m_aRow)[0]->getValue() ); if ( m_pSQLAnalyzer->hasFunctions() ) m_pSQLAnalyzer->setSelectionEvaluationResult( m_aSelectRow, m_aColMapping ); - const sal_Int32 nBookmark = (*m_aRow->get().begin())->getValue(); + const sal_Int32 nBookmark = (*m_aRow->begin())->getValue(); ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, true, false ); } @@ -1206,7 +1206,7 @@ void OResultSet::OpenImpl() { if(isCount()) { - if(m_xColumns->get().size() > 1) + if(m_xColumns->size() > 1) lcl_throwError(STR_QUERY_COMPLEX_COUNT,*this); m_nRowCountResult = 0; @@ -1271,24 +1271,24 @@ void OResultSet::OpenImpl() // But be careful: It is assumed, that the FilePositions will be stored as sequence 1..n { if ( m_nLastVisitedPos > 0) - m_pFileSet->get().reserve( m_nLastVisitedPos ); + m_pFileSet->reserve( m_nLastVisitedPos ); for (sal_Int32 i = 0; i < m_nLastVisitedPos; i++) - m_pFileSet->get().push_back(i + 1); + m_pFileSet->push_back(i + 1); } } OSL_ENSURE(m_pFileSet.is(),"No KeySet existing! :-("); if(bDistinct && m_pFileSet.is()) { - OValueRow aSearchRow = new OValueVector(m_aRow->get().size()); - OValueRefVector::Vector::iterator aRowIter = m_aRow->get().begin(); - OValueVector::Vector::iterator aSearchIter = aSearchRow->get().begin(); + OValueRow aSearchRow = new OValueVector(m_aRow->size()); + OValueRefVector::iterator aRowIter = m_aRow->begin(); + OValueVector::iterator aSearchIter = aSearchRow->begin(); for ( ++aRowIter,++aSearchIter; // the first column is the bookmark column - aRowIter != m_aRow->get().end(); + aRowIter != m_aRow->end(); ++aRowIter,++aSearchIter) aSearchIter->setBound((*aRowIter)->isBound()); - size_t nMaxRow = m_pFileSet->get().size(); + size_t nMaxRow = m_pFileSet->size(); if (nMaxRow) { @@ -1300,37 +1300,37 @@ void OResultSet::OpenImpl() for( size_t j = nMaxRow-1; j > 0; --j) { - nPos = (m_pFileSet->get())[j]; + nPos = (*m_pFileSet)[j]; ExecuteRow(IResultSetHelper::BOOKMARK,nPos,false); m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); - { // copy row values - OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin(); - OValueVector::Vector::iterator copyTo = aSearchRow->get().begin(); + { // cop*y row values + OValueRefVector::iterator copyFrom = m_aSelectRow->begin(); + OValueVector::iterator copyTo = aSearchRow->begin(); for ( ++copyFrom,++copyTo; // the first column is the bookmark column - copyFrom != m_aSelectRow->get().end(); + copyFrom != m_aSelectRow->end(); ++copyFrom,++copyTo) *copyTo = *(*copyFrom); } // compare with next row - nKey = (m_pFileSet->get())[j-1]; + nKey = (*m_pFileSet)[j-1]; ExecuteRow(IResultSetHelper::BOOKMARK,nKey,false); m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); - auto rowsMismatchIters = std::mismatch(std::next(m_aSelectRow->get().begin()), m_aSelectRow->get().end(), - std::next(aSearchRow->get().begin()), // the first column is the bookmark column - [](const OValueRefVector::Vector::value_type& a, const OValueVector::Vector::value_type& b) { + auto rowsMismatchIters = std::mismatch(std::next(m_aSelectRow->begin()), m_aSelectRow->end(), + std::next(aSearchRow->begin()), // the first column is the bookmark column + [](const OValueRefVector::value_type& a, const OValueVector::value_type& b) { return !a->isBound() || (*a == b); }); - if(rowsMismatchIters.first == m_aSelectRow->get().end()) - (m_pFileSet->get())[j] = 0; // Rows match -- Mark for deletion by setting key to 0 + if(rowsMismatchIters.first == m_aSelectRow->end()) + (*m_pFileSet)[j] = 0; // Rows match -- Mark for deletion by setting key to 0 #if OSL_DEBUG_LEVEL > 1 else nFound++; #endif } - m_pFileSet->get().erase(std::remove(m_pFileSet->get().begin(),m_pFileSet->get().end(),0) - ,m_pFileSet->get().end()); + m_pFileSet->erase(std::remove(m_pFileSet->begin(),m_pFileSet->end(),0) + ,m_pFileSet->end()); } } } @@ -1413,10 +1413,10 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); const OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); - std::map<OSQLColumns::Vector::iterator,bool> aSelectIters; - OValueRefVector::Vector::const_iterator aRowIter = _rRow->get().begin()+1; + std::map<OSQLColumns::iterator,bool> aSelectIters; + OValueRefVector::const_iterator aRowIter = _rRow->begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column - aRowIter != _rRow->get().end(); + aRowIter != _rRow->end(); ++i, ++aRowIter ) { @@ -1433,8 +1433,8 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, // look if we have such a select column // TODO: would like to have a O(log n) search here ... - for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); - aIter != _rxColumns->get().end(); + for ( OSQLColumns::iterator aIter = _rxColumns->begin(); + aIter != _rxColumns->end(); ++aIter ) { @@ -1448,12 +1448,12 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, aSelectIters.emplace(aIter,true); if(_bSetColumnMapping) { - sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; + sal_Int32 nSelectColumnPos = aIter - _rxColumns->begin() + 1; // the getXXX methods are 1-based ... sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column ... _rColMapping[nSelectColumnPos] = nTableColumnPos; - (_rSelectRow->get())[nSelectColumnPos] = *aRowIter; + (*_rSelectRow)[nSelectColumnPos] = *aRowIter; } (*aRowIter)->setBound(true); @@ -1477,8 +1477,8 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, Reference<XNameAccess> xNameAccess(_xNames,UNO_QUERY); Sequence< OUString > aSelectColumns = xNameAccess->getElementNames(); - for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); - aIter != _rxColumns->get().end(); + for ( OSQLColumns::iterator aIter = _rxColumns->begin(); + aIter != _rxColumns->end(); ++aIter ) { @@ -1492,7 +1492,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, if ( xNameAccess->hasByName( sSelectColumnRealName ) ) { aSelectIters.emplace(aIter,true); - sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; + sal_Int32 nSelectColumnPos = aIter - _rxColumns->begin() + 1; const OUString* pBegin = aSelectColumns.getConstArray(); const OUString* pEnd = pBegin + aSelectColumns.getLength(); for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) @@ -1503,7 +1503,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column ... _rColMapping[nSelectColumnPos] = nTableColumnPos; - (_rSelectRow->get())[nSelectColumnPos] = (_rRow->get())[nTableColumnPos]; + (*_rSelectRow)[nSelectColumnPos] = (*_rRow)[nTableColumnPos]; break; } } @@ -1539,11 +1539,11 @@ void OResultSet::clearInsertRow() { m_aRow->setDeleted(false); // set to false here because this is the new row sal_Int32 nPos = 0; - for(ORowSetValueDecoratorRef& rValue : m_aInsertRow->get()) + for(ORowSetValueDecoratorRef& rValue : *m_aInsertRow) { if ( rValue->isBound() ) { - (m_aRow->get())[nPos]->setValue( rValue->getValue() ); + (*m_aRow)[nPos]->setValue( rValue->getValue() ); } rValue->setBound(nPos == 0); rValue->setModified(false); @@ -1557,8 +1557,8 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount) if(!_rRow.is()) { _rRow = new OValueRefVector(_nColumnCount); - (_rRow->get())[0]->setBound(true); - std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(false)); + (*_rRow)[0]->setBound(true); + std::for_each(_rRow->begin()+1,_rRow->end(),TSetRefBound(false)); } } @@ -1574,7 +1574,7 @@ bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nO sal_Int32 OResultSet::getDriverPos() const { - return (m_aRow->get())[0]->getValue(); + return (*m_aRow)[0]->getValue(); } bool OResultSet::isRowDeleted() const diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index e9adbc0930ec..f68a06532bb7 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -51,7 +51,7 @@ OResultSetMetaData::~OResultSetMetaData() void OResultSetMetaData::checkColumnIndex(sal_Int32 column) { - if(column <= 0 || column > static_cast<sal_Int32>(m_xColumns->get().size())) + if(column <= 0 || column > static_cast<sal_Int32>(m_xColumns->size())) throwInvalidIndexException(*this); } @@ -64,13 +64,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { checkColumnIndex(column); - return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); + return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); } sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { - return m_xColumns->get().size(); + return m_xColumns->size(); } @@ -90,8 +90,8 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { checkColumnIndex(column); - Any aName((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); - return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); + Any aName((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); + return aName.hasValue() ? getString(aName) : getString((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); } OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) @@ -107,7 +107,7 @@ OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { checkColumnIndex(column); - return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); + return getString((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) @@ -124,7 +124,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex(column); - return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); + return getBOOL((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } @@ -141,20 +141,20 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { checkColumnIndex(column); - return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); + return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { checkColumnIndex(column); - return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); + return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { checkColumnIndex(column); - return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); + return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } @@ -168,8 +168,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { checkColumnIndex(column); return m_pTable->isReadOnly() || ( - (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && - ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)))); + (*m_xColumns)[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && + ::cppu::any2bool((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)))); } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index daacdbf7aac8..28eef44ff71e 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -109,7 +109,7 @@ void OStatement_BASE2::disposing() if(m_aRow.is()) { - m_aRow->get().clear(); + m_aRow->clear(); m_aRow = nullptr; } @@ -285,7 +285,7 @@ void SAL_CALL OStatement_Base::disposing() { if(m_aEvaluateRow.is()) { - m_aEvaluateRow->get().clear(); + m_aEvaluateRow->clear(); m_aEvaluateRow = nullptr; } OStatement_BASE::disposing(); @@ -354,10 +354,10 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode const * pColumnRef, // What number is the Column? ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns(); ::comphelper::UStringMixEqual aCase; - OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase); - if ( aFind == aSelectColumns->get().end() ) + OSQLColumns::const_iterator aFind = ::connectivity::find(aSelectColumns->begin(),aSelectColumns->end(),aColumnName,aCase); + if ( aFind == aSelectColumns->end() ) throw SQLException(); - m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1); + m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->begin()) + 1); // Ascending or Descending? m_aOrderbyAscending.push_back(SQL_ISTOKEN(pAscendingDescending,DESC) ? TAscendingOrder::DESC : TAscendingOrder::ASC); @@ -383,7 +383,7 @@ void OStatement_Base::construct(const OUString& sql) // more than one table -> can't operate on them -> error m_pConnection->throwGenericSQLException(STR_QUERY_MORE_TABLES,*this); - if ( (m_aSQLIterator.getStatementType() == OSQLStatementType::Select) && m_aSQLIterator.getSelectColumns()->get().empty() ) + if ( (m_aSQLIterator.getStatementType() == OSQLStatementType::Select) && m_aSQLIterator.getSelectColumns()->empty() ) // SELECT statement without columns -> error m_pConnection->throwGenericSQLException(STR_QUERY_NO_COLUMN,*this); @@ -410,18 +410,18 @@ void OStatement_Base::construct(const OUString& sql) Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); // set the binding of the resultrow m_aRow = new OValueRefVector(xNames->getCount()); - (m_aRow->get())[0]->setBound(true); - std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(false)); + (*m_aRow)[0]->setBound(true); + std::for_each(m_aRow->begin()+1,m_aRow->end(),TSetRefBound(false)); // set the binding of the resultrow m_aEvaluateRow = new OValueRefVector(xNames->getCount()); - (m_aEvaluateRow->get())[0]->setBound(true); - std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(false)); + (*m_aEvaluateRow)[0]->setBound(true); + std::for_each(m_aEvaluateRow->begin()+1,m_aEvaluateRow->end(),TSetRefBound(false)); // set the select row - m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->get().size()); - std::for_each(m_aSelectRow->get().begin(),m_aSelectRow->get().end(),TSetRefBound(true)); + m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->size()); + std::for_each(m_aSelectRow->begin(),m_aSelectRow->end(),TSetRefBound(true)); // create the column mapping createColumnMapping(); @@ -435,7 +435,7 @@ void OStatement_Base::createColumnMapping() { // initialize the column index map (mapping select columns to table columns) ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns(); - m_aColMapping.resize(xColumns->get().size() + 1); + m_aColMapping.resize(xColumns->size() + 1); for (sal_Int32 i=0; i<static_cast<sal_Int32>(m_aColMapping.size()); ++i) m_aColMapping[i] = i; @@ -476,11 +476,11 @@ void OStatement_Base::GetAssignValues() { // Create Row for the values to be set (Reference through new) if(m_aAssignValues.is()) - m_aAssignValues->get().clear(); + m_aAssignValues->clear(); sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY_THROW)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false)); + std::for_each(m_aAssignValues->begin()+1,m_aAssignValues->end(),TSetRefBound(false)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); @@ -563,11 +563,11 @@ void OStatement_Base::GetAssignValues() else if (SQL_ISRULE(m_pParseTree,update_statement_searched)) { if(m_aAssignValues.is()) - m_aAssignValues->get().clear(); + m_aAssignValues->clear(); sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY_THROW)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false)); + std::for_each(m_aAssignValues->begin()+1,m_aAssignValues->end(),TSetRefBound(false)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); @@ -654,7 +654,7 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName, // Everything tested and we have the names of the Column. // Now allocate one Value, set the value and tie the value to the Row. if (bSetNull) - (m_aAssignValues->get())[nId]->setNull(); + (*m_aAssignValues)[nId]->setNull(); else { switch (::comphelper::getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) @@ -663,15 +663,15 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName, case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: - *(m_aAssignValues->get())[nId] = ORowSetValue(aValue); + *(*m_aAssignValues)[nId] = ORowSetValue(aValue); //Characterset is already converted, since the entire statement was converted break; case DataType::BIT: if (aValue.equalsIgnoreAsciiCase("TRUE") || aValue[0] == '1') - *(m_aAssignValues->get())[nId] = true; + *(*m_aAssignValues)[nId] = true; else if (aValue.equalsIgnoreAsciiCase("FALSE") || aValue[0] == '0') - *(m_aAssignValues->get())[nId] = false; + *(*m_aAssignValues)[nId] = false; else throwFunctionSequenceException(*this); break; @@ -685,7 +685,7 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName, case DataType::DATE: case DataType::TIME: case DataType::TIMESTAMP: - *(m_aAssignValues->get())[nId] = ORowSetValue(aValue); + *(*m_aAssignValues)[nId] = ORowSetValue(aValue); break; default: throwFunctionSequenceException(*this); diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 9764b14f853d..a0d1305f6f89 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -177,7 +177,7 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow const & _pRow,const if ( nPos < static_cast< sal_Int32 >( _rColumnMapping.size() ) ) map = _rColumnMapping[nPos]; if ( map > 0 ) - selectionEval.second->startSelection( (_pRow->get())[map] ); + selectionEval.second->startSelection( (*_pRow)[map] ); } ++nPos; } diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 2950b113d839..36cba4a73485 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -41,20 +41,20 @@ void OOperandRow::bindValue(const OValueRefRow& _pRow) { OSL_ENSURE(_pRow.is(),"NO EMPTY row allowed!"); m_pRow = _pRow; - OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()"); - (m_pRow->get())[m_nRowPos]->setBound(true); + OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()"); + (*m_pRow)[m_nRowPos]->setBound(true); } void OOperandRow::setValue(const ORowSetValue& _rVal) { - OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()"); - (*(m_pRow->get())[m_nRowPos]) = _rVal; + OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()"); + (*(*m_pRow)[m_nRowPos]) = _rVal; } const ORowSetValue& OOperandRow::getValue() const { - OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()"); - return (m_pRow->get())[m_nRowPos]->getValue(); + OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()"); + return (*m_pRow)[m_nRowPos]->getValue(); } diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index 3aae644f2e99..a9e210321ba6 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.cxx @@ -33,9 +33,9 @@ sdbcx::ObjectType OFlatColumns::createObject(const OUString& _rName) { OFlatTable* pTable = static_cast<OFlatTable*>(m_pTable); const ::rtl::Reference<OSQLColumns>& aCols = pTable->getTableColumns(); - OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; - if(aIter != aCols->get().end()) + if(aIter != aCols->end()) xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 150c7971b1c9..aca803041827 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -96,7 +96,7 @@ Any SAL_CALL OFlatResultSet::getBookmark( ) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return makeAny(static_cast<sal_Int32>((m_aRow->get())[0]->getValue())); + return makeAny(static_cast<sal_Int32>((*m_aRow)[0]->getValue())); } sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 6d9fc203f950..670fe46dffb0 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -107,13 +107,13 @@ void OFlatTable::fillColumns(const css::lang::Locale& _aLocale) if(!m_aColumns.is()) m_aColumns = new OSQLColumns(); else - m_aColumns->get().clear(); + m_aColumns->clear(); m_aTypes.clear(); m_aPrecisions.clear(); m_aScales.clear(); // reserve some space - m_aColumns->get().reserve(nFieldCount+1); + m_aColumns->reserve(nFieldCount+1); m_aTypes.assign(nFieldCount+1,DataType::SQLNULL); m_aPrecisions.assign(nFieldCount+1,-1); m_aScales.assign(nFieldCount+1,-1); @@ -168,12 +168,12 @@ void OFlatTable::fillColumns(const css::lang::Locale& _aLocale) { // check if the columname already exists OUString aAlias(aColumnNames[i]); - OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); + OSQLColumns::const_iterator aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); sal_Int32 nExprCnt = 0; - while(aFind != m_aColumns->get().end()) + while(aFind != m_aColumns->end()) { aAlias = aColumnNames[i] + OUString::number(++nExprCnt); - aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); + aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); } sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeNames[i],OUString(),OUString(), @@ -187,7 +187,7 @@ void OFlatTable::fillColumns(const css::lang::Locale& _aLocale) bCase, m_CatalogName, getSchema(), getName()); Reference< XPropertySet> xCol = pColumn; - m_aColumns->get().push_back(xCol); + m_aColumns->push_back(xCol); } m_pFileStream->Seek(m_aRowPosToFilePos[0].second); @@ -494,9 +494,9 @@ void OFlatTable::refreshColumns() ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString> aVector; - aVector.reserve(m_aColumns->get().size()); + aVector.reserve(m_aColumns->size()); - for (auto const& column : m_aColumns->get()) + for (auto const& column : *m_aColumns) aVector.push_back(Reference< XNamed>(column,UNO_QUERY_THROW)->getName()); if(m_xColumns) @@ -567,7 +567,7 @@ sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bRetrieveData) { - *(_rRow->get())[0] = m_nFilePos; + *(*_rRow)[0] = m_nFilePos; if (!bRetrieveData) return true; @@ -591,10 +591,10 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool const sal_Unicode cThousandDelimiter = pConnection->getThousandDelimiter(); // Fields: sal_Int32 nStartPos = 0; - OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); - OSQLColumns::Vector::const_iterator aEnd = _rCols.get().end(); - const OValueRefVector::Vector::size_type nCount = _rRow->get().size(); - for (OValueRefVector::Vector::size_type i = 1; + OSQLColumns::const_iterator aIter = _rCols.begin(); + OSQLColumns::const_iterator aEnd = _rCols.end(); + const OValueRefVector::size_type nCount = _rRow->size(); + for (OValueRefVector::size_type i = 1; aIter != aEnd && i < nCount; ++aIter, i++) { @@ -602,7 +602,7 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool if (aStr.isEmpty()) { - (_rRow->get())[i]->setNull(); + (*_rRow)[i]->setNull(); } else { @@ -620,18 +620,18 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool switch(nType) { case DataType::DATE: - *(_rRow->get())[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,m_aNullDate)); + *(*_rRow)[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,m_aNullDate)); break; case DataType::TIMESTAMP: - *(_rRow->get())[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,m_aNullDate)); + *(*_rRow)[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,m_aNullDate)); break; default: - *(_rRow->get())[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); + *(*_rRow)[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); } } catch(Exception&) { - (_rRow->get())[i]->setNull(); + (*_rRow)[i]->setNull(); } } break; case DataType::DOUBLE: @@ -676,19 +676,19 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool // #99178# OJ if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType ) - *(_rRow->get())[i] = OUString(OUString::number(nVal)); + *(*_rRow)[i] = OUString(OUString::number(nVal)); else - *(_rRow->get())[i] = nVal; + *(*_rRow)[i] = nVal; } break; default: { // Copy Value as String in Row-Variable - *(_rRow->get())[i] = ORowSetValue(aStr); + *(*_rRow)[i] = ORowSetValue(aStr); } break; } // switch(nType) - (_rRow->get())[i]->setTypeKind(nType); + (*_rRow)[i]->setTypeKind(nType); } } return result; diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 102dcae458c9..cbb3dc75608c 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -42,8 +42,8 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) if (nParams < 1) ::dbtools::throwInvalidIndexException(*this); - if (nParams >= static_cast<sal_Int32>(m_aParameterRow->get().size())) - m_aParameterRow->get().resize(nParams); + if (nParams >= static_cast<sal_Int32>(m_aParameterRow->size())) + m_aParameterRow->resize(nParams); } void MacabPreparedStatement::setMacabFields() const @@ -69,7 +69,7 @@ void MacabPreparedStatement::resetParameters() const void MacabPreparedStatement::getNextParameter(OUString &rParameter) const { - if (m_nParameterIndex >= static_cast<sal_Int32>(m_aParameterRow->get().size())) + if (m_nParameterIndex >= static_cast<sal_Int32>(m_aParameterRow->size())) { ::connectivity::SharedResources aResources; const OUString sError( aResources.getResourceString( @@ -78,7 +78,7 @@ void MacabPreparedStatement::getNextParameter(OUString &rParameter) const ::dbtools::throwGenericSQLException(sError,*const_cast<MacabPreparedStatement *>(this)); } - rParameter = (m_aParameterRow->get())[m_nParameterIndex]; + rParameter = (*m_aParameterRow)[m_nParameterIndex]; m_nParameterIndex++; } @@ -105,7 +105,7 @@ void MacabPreparedStatement::disposing() if (m_aParameterRow.is()) { - m_aParameterRow->get().clear(); + m_aParameterRow->clear(); m_aParameterRow = nullptr; } } @@ -197,7 +197,7 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 checkAndResizeParameters(parameterIndex); - (m_aParameterRow->get())[parameterIndex - 1].setNull(); + (*m_aParameterRow)[parameterIndex - 1].setNull(); } void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) @@ -247,7 +247,7 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const checkAndResizeParameters(parameterIndex); - (m_aParameterRow->get())[parameterIndex - 1] = x; + (*m_aParameterRow)[parameterIndex - 1] = x; } void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index e5a851d69dd2..38e7dca051d4 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -57,7 +57,7 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity: aHeader = aRecords->getHeader(); - for (const auto& rxColumn : xColumns->get()) + for (const auto& rxColumn : *xColumns) { OUString aFieldName; sal_uInt32 nFieldNumber; diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index c9a1fafd9c28..d61a0ec96a51 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -52,7 +52,7 @@ void SAL_CALL OPreparedStatement::disposing() m_xMetaData.clear(); if(m_aParameterRow.is()) { - m_aParameterRow->get().clear(); + m_aParameterRow->clear(); m_aParameterRow = nullptr; } m_xParamColumns = nullptr; @@ -245,7 +245,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / checkAndResizeParameters(parameterIndex); - (m_aParameterRow->get())[parameterIndex].setNull(); + (*m_aParameterRow)[parameterIndex].setNull(); } @@ -343,11 +343,11 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) if ( !m_aParameterRow.is() ) { m_aParameterRow = new OValueVector(); - m_aParameterRow->get().push_back(sal_Int32(0)); + m_aParameterRow->push_back(sal_Int32(0)); } - if (static_cast<sal_Int32>(m_aParameterRow->get().size()) <= parameterIndex) - m_aParameterRow->get().resize(parameterIndex+1); + if (static_cast<sal_Int32>(m_aParameterRow->size()) <= parameterIndex) + m_aParameterRow->resize(parameterIndex+1); } void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const @@ -359,7 +359,7 @@ ORowSetValue& x) SAL_INFO( "connectivity.mork", "setParameter(" << parameterIndex << ", '" << x.getString() << "')"); - (m_aParameterRow->get())[parameterIndex] = x; + (*m_aParameterRow)[parameterIndex] = x; } @@ -403,7 +403,7 @@ void OPreparedStatement::AddParameter(OSQLParseNode const * pParameter, const Re ,OUString() ,OUString() ,OUString()); - m_xParamColumns->get().push_back(xParaColumn); + m_xParamColumns->push_back(xParaColumn); } void OPreparedStatement::describeColumn(OSQLParseNode const * _pParameter, diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index d5cc06559e11..ab6b11a9d490 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -272,7 +272,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) void OResultSet::checkIndex(sal_Int32 columnIndex ) { - if(columnIndex <= 0 || columnIndex > static_cast<sal_Int32>(m_xColumns->get().size())) + if(columnIndex <= 0 || columnIndex > static_cast<sal_Int32>(m_xColumns->size())) ::dbtools::throwInvalidIndexException(*this); } @@ -299,7 +299,7 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) if (!bForceReload) { // Check whether we've already fetched the row... - if ( !(m_aRow->get())[0].isNull() && static_cast<sal_Int32>((m_aRow->get())[0]) == cardNumber ) + if ( !(*m_aRow)[0].isNull() && static_cast<sal_Int32>((*m_aRow)[0]) == cardNumber ) return true; } // else @@ -308,17 +308,17 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) if ( !validRow( cardNumber ) ) return false; - (m_aRow->get())[0] = cardNumber; + (*m_aRow)[0] = cardNumber; sal_Int32 nCount = m_aColumnNames.getLength(); //m_RowStates = m_aQuery.getRowStates(cardNumber); for( sal_Int32 i = 1; i <= nCount; i++ ) { - if ( (m_aRow->get())[i].isBound() ) + if ( (*m_aRow)[i].isBound() ) { // Everything in the addressbook is a string! - if ( !m_aQueryHelper.getRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) + if ( !m_aQueryHelper.getRowValue( (*m_aRow)[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this ); } @@ -338,8 +338,8 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI return *ODatabaseMetaDataResultSet::getEmptyValue(); } - m_bWasNull = (m_aRow->get())[columnIndex].isNull(); - return (m_aRow->get())[columnIndex]; + m_bWasNull = (*m_aRow)[columnIndex].isNull(); + return (*m_aRow)[columnIndex]; } @@ -349,7 +349,7 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) ResultSetEntryGuard aGuard( *this ); OSL_ENSURE(m_xColumns.is(), "Need the Columns!!"); - OSL_ENSURE(columnIndex <= static_cast<sal_Int32>(m_xColumns->get().size()), "Trying to access invalid columns number"); + OSL_ENSURE(columnIndex <= static_cast<sal_Int32>(m_xColumns->size()), "Trying to access invalid columns number"); checkIndex( columnIndex ); // If this query was sorted then we should have a valid KeySet, so use it @@ -654,8 +654,8 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchStr "Parameter name [" << m_nParamIndex << "]: " << aParameterName); if ( m_aParameterRow.is() ) { - OSL_ENSURE( m_nParamIndex < static_cast<sal_Int32>(m_aParameterRow->get().size()) + 1, "More parameters than values found" ); - rMatchString = (m_aParameterRow->get())[static_cast<sal_uInt16>(m_nParamIndex)]; + OSL_ENSURE( m_nParamIndex < static_cast<sal_Int32>(m_aParameterRow->size()) + 1, "More parameters than values found" ); + rMatchString = (*m_aParameterRow)[static_cast<sal_uInt16>(m_nParamIndex)]; SAL_INFO("connectivity.mork", "Prop Value: " << rMatchString); } else { @@ -683,12 +683,12 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT { OUString aColName, aParameterValue; sal_Int32 i = 1; - for (auto const& column : xColumns->get()) + for (auto const& column : *xColumns) { column->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; SAL_INFO("connectivity.mork", "Prop Column Name: " << aColName); if ( m_aParameterRow.is() ) { - aParameterValue = (m_aParameterRow->get())[static_cast<sal_uInt16>(i)]; + aParameterValue = (*m_aParameterRow)[static_cast<sal_uInt16>(i)]; SAL_INFO("connectivity.mork", "Prop Value: " << aParameterValue); } else { @@ -949,7 +949,7 @@ void OResultSet::fillRowData() const OUString sPropertyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); OUString sName; sal_Int32 i = 1; - for (const auto& rxColumn : m_xColumns->get()) + for (const auto& rxColumn : *m_xColumns) { rxColumn->getPropertyValue(sPropertyName) >>= sName; SAL_INFO( @@ -997,7 +997,7 @@ void OResultSet::fillRowData() static bool matchRow( OValueRow const & row1, OValueRow const & row2 ) { // the first column is the bookmark column - return std::equal(std::next(row1->get().begin()), row1->get().end(), std::next(row2->get().begin()), + return std::equal(std::next(row1->begin()), row1->end(), std::next(row2->begin()), [](const ORowSetValue& a, const ORowSetValue& b) { return !a.isBound() || a == b; }); } @@ -1008,9 +1008,9 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) if ( m_pKeySet.is() ) { sal_Int32 nPos; - for(nPos=0;nPos < static_cast<sal_Int32>(m_pKeySet->get().size());nPos++) + for(nPos=0;nPos < static_cast<sal_Int32>(m_pKeySet->size());nPos++) { - if (nCardNum == (m_pKeySet->get())[nPos]) + if (nCardNum == (*m_pKeySet)[nPos]) { SAL_INFO("connectivity.mork", "return = " << nPos+1); return nPos+1; @@ -1072,8 +1072,8 @@ void OResultSet::executeQuery() std::vector<sal_Int16>::size_type index = 0; for (const auto& rColIndex : m_aOrderbyColumnNumber) { - OSL_ENSURE(static_cast<sal_Int32>(m_aRow->get().size()) > rColIndex,"Invalid Index"); - switch ((m_aRow->get().begin()+rColIndex)->getTypeKind()) + OSL_ENSURE(static_cast<sal_Int32>(m_aRow->size()) > rColIndex,"Invalid Index"); + switch ((m_aRow->begin()+rColIndex)->getTypeKind()) { case DataType::CHAR: case DataType::VARCHAR: @@ -1140,12 +1140,12 @@ void OResultSet::executeQuery() } m_pKeySet = aSortIndex.CreateKeySet(); - m_CurrentRowCount = static_cast<sal_Int32>(m_pKeySet->get().size()); + m_CurrentRowCount = static_cast<sal_Int32>(m_pKeySet->size()); #if OSL_DEBUG_LEVEL > 0 - for( OKeySet::Vector::size_type i = 0; i < m_pKeySet->get().size(); i++ ) + for( OKeySet::size_type i = 0; i < m_pKeySet->size(); i++ ) SAL_INFO( "connectivity.mork", - "Sorted: " << i << " -> " << (m_pKeySet->get())[i]); + "Sorted: " << i << " -> " << (*m_pKeySet)[i]); #endif beforeFirst(); // Go back to start @@ -1156,9 +1156,9 @@ void OResultSet::executeQuery() // Handle the DISTINCT case if ( bDistinct && m_pKeySet.is() ) { - OValueRow aSearchRow = new OValueVector( m_aRow->get().size() ); + OValueRow aSearchRow = new OValueVector( m_aRow->size() ); - for(sal_Int32 & i : m_pKeySet->get()) + for(sal_Int32 & i : *m_pKeySet) { fetchRow( i ); // Fills m_aRow if ( matchRow( m_aRow, aSearchRow ) ) @@ -1173,9 +1173,9 @@ void OResultSet::executeQuery() } } // Now remove any keys marked with a 0 - m_pKeySet->get().erase(std::remove_if(m_pKeySet->get().begin(),m_pKeySet->get().end() + m_pKeySet->erase(std::remove_if(m_pKeySet->begin(),m_pKeySet->end() ,[](sal_Int32 n) { return n == 0; }) - ,m_pKeySet->get().end()); + ,m_pKeySet->end()); } } @@ -1207,10 +1207,10 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); std::vector< OUString> aColumnNames; - aColumnNames.reserve(_rxColumns->get().size()); - OValueVector::Vector::iterator aRowIter = _rRow->get().begin()+1; + aColumnNames.reserve(_rxColumns->size()); + OValueVector::iterator aRowIter = _rRow->begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column - aRowIter != _rRow->get().end(); + aRowIter != _rRow->end(); ++i, ++aRowIter ) { @@ -1227,7 +1227,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, // look if we have such a select column // TODO: would like to have a O(log n) search here ... sal_Int32 nColumnPos = 0; - for (const auto& rxColumn : _rxColumns->get()) + for (const auto& rxColumn : *_rxColumns) { if ( nColumnPos < static_cast<sal_Int32>(aColumnNames.size()) ) sSelectColumnRealName = aColumnNames[nColumnPos]; @@ -1305,11 +1305,11 @@ void OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) if (m_CurrentRowCount < nMaxCardNumber) { sal_Int32 nKeyValue; - if ( static_cast<sal_Int32>(m_pKeySet->get().capacity()) < nMaxCardNumber ) - m_pKeySet->get().reserve(nMaxCardNumber + 20 ); + if ( static_cast<sal_Int32>(m_pKeySet->capacity()) < nMaxCardNumber ) + m_pKeySet->reserve(nMaxCardNumber + 20 ); for (nKeyValue = m_CurrentRowCount+1; nKeyValue <= nMaxCardNumber; nKeyValue ++) - m_pKeySet->get().push_back( nKeyValue ); + m_pKeySet->push_back( nKeyValue ); m_CurrentRowCount = nMaxCardNumber; } } @@ -1317,7 +1317,7 @@ void OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) sal_Int32 OResultSet::deletedCount() { impl_ensureKeySet(); - return m_CurrentRowCount - static_cast<sal_Int32>(m_pKeySet->get().size()); + return m_CurrentRowCount - static_cast<sal_Int32>(m_pKeySet->size()); } @@ -1361,16 +1361,16 @@ bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) return false; } sal_Int32 nCurCard; - if ( nCurPos < static_cast<sal_Int32>(m_pKeySet->get().size()) ) //The requested row is exist in m_pKeySet, so we just use it + if ( nCurPos < static_cast<sal_Int32>(m_pKeySet->size()) ) //The requested row is exist in m_pKeySet, so we just use it { - nCurCard = (m_pKeySet->get())[nCurPos-1]; + nCurCard = (*m_pKeySet)[nCurPos-1]; } else //The requested row has not been retrieved until now. We should get the right card for it. nCurCard = nCurPos + deletedCount(); if ( nCurCard > nNumberOfRecords) { fillKeySet(nNumberOfRecords); - m_nRowPos = static_cast<sal_uInt32>(m_pKeySet->get().size() + 1); + m_nRowPos = static_cast<sal_uInt32>(m_pKeySet->size() + 1); SAL_INFO( "connectivity.mork", "return False, m_nRowPos = " << m_nRowPos); return false; @@ -1404,7 +1404,7 @@ css::uno::Any OResultSet::getBookmark( ) } OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row"); - return makeAny(static_cast<sal_Int32>((m_aRow->get())[0])); + return makeAny(static_cast<sal_Int32>((*m_aRow)[0])); } sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) { @@ -1464,9 +1464,9 @@ sal_Int32 OResultSet::getCurrentCardNumber() { if ( ( m_nRowPos == 0 ) || !m_pKeySet.is() ) return 0; - if (m_pKeySet->get().size() < m_nRowPos) + if (m_pKeySet->size() < m_nRowPos) return 0; - return (m_pKeySet->get())[m_nRowPos-1]; + return (*m_pKeySet)[m_nRowPos-1]; } void OResultSet::checkPendingUpdate() { @@ -1499,8 +1499,8 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) checkIndex(columnIndex ); columnIndex = mapColumn(columnIndex); - (m_aRow->get())[columnIndex].setBound(true); - (m_aRow->get())[columnIndex] = x; + (*m_aRow)[columnIndex].setBound(true); + (*m_aRow)[columnIndex] = x; } @@ -1515,8 +1515,8 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) checkIndex(columnIndex ); columnIndex = mapColumn(columnIndex); - (m_aRow->get())[columnIndex].setBound(true); - (m_aRow->get())[columnIndex].setNull(); + (*m_aRow)[columnIndex].setBound(true); + (*m_aRow)[columnIndex].setNull(); } diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index 032d4d5d4494..e05eced22da2 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -41,7 +41,7 @@ OResultSetMetaData::~OResultSetMetaData() void OResultSetMetaData::checkColumnIndex(sal_Int32 column) { - if(column <= 0 || column > static_cast<sal_Int32>(m_xColumns->get().size())) + if(column <= 0 || column > static_cast<sal_Int32>(m_xColumns->size())) throwInvalidIndexException(*this); } @@ -59,7 +59,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { - return static_cast<sal_Int32>(m_xColumns->get().size()); + return static_cast<sal_Int32>(m_xColumns->size()); } @@ -82,7 +82,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) OUString sColumnName; try { - Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_SET_THROW ); + Reference< XPropertySet > xColumnProps( (*m_xColumns)[column-1], UNO_SET_THROW ); OSL_VERIFY( xColumnProps->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) >>= sColumnName ); } catch( const Exception& ) @@ -105,7 +105,7 @@ OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { checkColumnIndex(column); - return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); + return getString((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) @@ -122,7 +122,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex(column); - return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); + return getBOOL((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } @@ -139,20 +139,20 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { checkColumnIndex(column); - return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); + return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { checkColumnIndex(column); - return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); + return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { checkColumnIndex(column); - return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); + return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } @@ -171,8 +171,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { checkColumnIndex(column); - bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && - ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); + bool bReadOnly = (*m_xColumns)[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && + ::cppu::any2bool((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); return m_bReadOnly || bReadOnly || OTable::isReadOnly(); } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 408a54dbfc49..fc97ab20b15d 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -142,8 +142,8 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql xNames.set(m_xColNames,UNO_QUERY); // set the binding of the resultrow m_aRow = new OValueVector(xNames->getCount()); - (m_aRow->get())[0].setBound(true); - std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(false)); + (*m_aRow)[0].setBound(true); + std::for_each(m_aRow->begin()+1,m_aRow->end(),TSetBound(false)); // create the column mapping createColumnMapping(); @@ -395,7 +395,7 @@ void OCommonStatement::createColumnMapping() // initialize the column index map (mapping select columns to table columns) ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); - m_aColMapping.resize(xColumns->get().size() + 1); + m_aColMapping.resize(xColumns->size() + 1); for (i=0; i<m_aColMapping.size(); ++i) m_aColMapping[i] = static_cast<sal_Int32>(i); diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index 118a098f9619..4e95eedab7a5 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -150,14 +150,12 @@ void OWriterTable::fillColumns() // check if the column name already exists OUString aAlias = aColumnName; - auto aFind - = connectivity::find(m_aColumns->get().begin(), m_aColumns->get().end(), aAlias, aCase); + auto aFind = connectivity::find(m_aColumns->begin(), m_aColumns->end(), aAlias, aCase); sal_Int32 nExprCnt = 0; - while (aFind != m_aColumns->get().end()) + while (aFind != m_aColumns->end()) { aAlias = aColumnName + OUString::number(++nExprCnt); - aFind = connectivity::find(m_aColumns->get().begin(), m_aColumns->get().end(), aAlias, - aCase); + aFind = connectivity::find(m_aColumns->begin(), m_aColumns->end(), aAlias, aCase); } auto pColumn = new sdbcx::OColumn( @@ -165,7 +163,7 @@ void OWriterTable::fillColumns() nDecimals, eType, false, false, bCurrency, bStoresMixedCaseQuotedIdentifiers, m_CatalogName, getSchema(), getName()); uno::Reference<XPropertySet> xCol = pColumn; - m_aColumns->get().push_back(xCol); + m_aColumns->push_back(xCol); } } @@ -231,21 +229,19 @@ bool OWriterTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool // read the bookmark _rRow->setDeleted(false); - *(_rRow->get())[0] = m_nFilePos; + *(*_rRow)[0] = m_nFilePos; if (!bRetrieveData) return true; // fields - const OValueRefVector::Vector::size_type nCount - = std::min(_rRow->get().size(), _rCols.get().size() + 1); - for (OValueRefVector::Vector::size_type i = 1; i < nCount; i++) + const OValueRefVector::size_type nCount = std::min(_rRow->size(), _rCols.size() + 1); + for (OValueRefVector::size_type i = 1; i < nCount; i++) { - if ((_rRow->get())[i]->isBound()) + if ((*_rRow)[i]->isBound()) { - lcl_SetValue((_rRow->get())[i]->get(), m_xTable, m_nStartCol, m_bHasHeaders, m_nFilePos, - i); + lcl_SetValue((*_rRow)[i]->get(), m_xTable, m_nStartCol, m_bHasHeaders, m_nFilePos, i); } } return true; diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 71f3d3b95ff5..6cb42da8e5e8 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -81,8 +81,8 @@ namespace connectivity // to compare with the restrictions OSkipDeletedSet m_aSkipDeletedSet; - ::rtl::Reference<OKeySet> m_pFileSet; - OKeySet::Vector::iterator m_aFileSetIter; + ::rtl::Reference<OKeySet> m_pFileSet; + OKeySet::iterator m_aFileSetIter; std::unique_ptr<OSortIndex> m_pSortIndex; @@ -266,7 +266,7 @@ namespace connectivity void setSelectRow(const OValueRefRow& _rRow) { m_aSelectRow = _rRow; - m_nColumnCount = m_aSelectRow->get().size(); + m_nColumnCount = m_aSelectRow->size(); } void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 0074d2be6824..cf9b17ee51df 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -104,13 +104,13 @@ OParseColumn::OParseColumn( const OUString& Name, const Reference< XDatabaseMetaData >& _rxDBMetaData,const Reference< XNameAccess>& i_xQueryColumns ) { sal_Int32 nColumnCount = _rxResMetaData->getColumnCount(); - ::rtl::Reference aReturn( new OSQLColumns ); aReturn->get().reserve( nColumnCount ); + ::rtl::Reference aReturn( new OSQLColumns ); aReturn->reserve( nColumnCount ); StringMap aColumnMap; for ( sal_Int32 i = 1; i <= nColumnCount; ++i ) { OParseColumn* pColumn = createColumnForResultSet( _rxResMetaData, _rxDBMetaData, i,aColumnMap ); - aReturn->get().push_back( pColumn ); + aReturn->push_back( pColumn ); if ( i_xQueryColumns.is() && i_xQueryColumns->hasByName(pColumn->getRealName()) ) { Reference<XPropertySet> xColumn(i_xQueryColumns->getByName(pColumn->getRealName()),UNO_QUERY_THROW); diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 686a2d46b522..7af9dc9ab9ee 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -345,8 +345,8 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu } while ( false ); // copy the parameters of the sub query to our own parameter array - std::copy( pSubQueryParameterColumns->get().begin(), pSubQueryParameterColumns->get().end(), - std::insert_iterator< OSQLColumns::Vector >( m_aParameters->get(), m_aParameters->get().end() ) ); + std::copy( pSubQueryParameterColumns->begin(), pSubQueryParameterColumns->end(), + std::back_inserter( *m_aParameters ) ); } @@ -726,7 +726,7 @@ namespace // look up the column in the select column, to find a possible alias if ( _pSelectColumns ) { - for (const Reference< XPropertySet >& xColumn : _pSelectColumns->get()) + for (const Reference< XPropertySet >& xColumn : *_pSelectColumns) { try { @@ -828,7 +828,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo pColumn->setRealName(aColumnName); Reference< XPropertySet> xCol = pColumn; - m_aCreateColumns->get().push_back(xCol); + m_aCreateColumns->push_back(xCol); } } @@ -1362,22 +1362,22 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode pColumn->setFunction(true); pColumn->setAggregateFunction(true); pColumn->setRealName(sFunctionName); - m_aParameters->get().push_back(pColumn); + m_aParameters->push_back(pColumn); } else { bool bNotFound = true; - OSQLColumns::Vector::const_iterator aIter = ::connectivity::find( - m_aSelectColumns->get().begin(), - m_aSelectColumns->get().end(), + OSQLColumns::const_iterator aIter = ::connectivity::find( + m_aSelectColumns->begin(), + m_aSelectColumns->end(), _aColumnName,::comphelper::UStringMixEqual( isCaseSensitive() ) ); - if(aIter != m_aSelectColumns->get().end()) + if(aIter != m_aSelectColumns->end()) { OParseColumn* pNewColumn = new OParseColumn(*aIter,isCaseSensitive()); pNewColumn->setName(sParameterName); pNewColumn->setRealName(_aColumnName); - m_aParameters->get().push_back(pNewColumn); + m_aParameters->push_back(pNewColumn); bNotFound = false; } else if(!_aColumnName.isEmpty())// search in the tables for the right one @@ -1390,7 +1390,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode OParseColumn* pNewColumn = new OParseColumn(xColumn,isCaseSensitive()); pNewColumn->setName(sParameterName); pNewColumn->setRealName(_aColumnName); - m_aParameters->get().push_back(pNewColumn); + m_aParameters->push_back(pNewColumn); bNotFound = false; } } @@ -1428,7 +1428,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode OUString()); pColumn->setName(aNewColName); pColumn->setRealName(sParameterName); - m_aParameters->get().push_back(pColumn); + m_aParameters->push_back(pColumn); } } } @@ -1565,7 +1565,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns> const & pColumn->setTableName(_rTableAlias); pColumn->setRealName(*pBegin); Reference< XPropertySet> xCol = pColumn; - _rColumns->get().push_back(xCol); + _rColumns->push_back(xCol); } else impl_appendError( IParseContext::ErrorCode::InvalidColumn, pBegin, &_rTableAlias ); @@ -1647,7 +1647,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns> co pColumn->setRealName( rColumnName ); } - _rColumns->get().push_back( xNewColumn ); + _rColumns->push_back( xNewColumn ); } else { @@ -1661,7 +1661,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns> co pColumn->setRealName(rColumnName); Reference< XPropertySet> xCol = pColumn; - _rColumns->get().push_back(xCol); + _rColumns->push_back(xCol); } } else // ColumnName and TableName exist @@ -1686,7 +1686,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns> co pColumn->setTableName(aFind->first); Reference< XPropertySet> xCol = pColumn; - _rColumns->get().push_back(xCol); + _rColumns->push_back(xCol); } else { @@ -1701,7 +1701,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns> co pColumn->setTableName(aFind->first); Reference< XPropertySet> xCol = pColumn; - _rColumns->get().push_back(xCol); + _rColumns->push_back(xCol); } else bError = true; @@ -1722,7 +1722,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns> co pColumn->setAggregateFunction(bAggFkt); Reference< XPropertySet> xCol = pColumn; - _rColumns->get().push_back(xCol); + _rColumns->push_back(xCol); } } } @@ -1731,19 +1731,19 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName { OUString aAlias(rColumnName); - OSQLColumns::Vector::const_iterator aIter = find( - m_aSelectColumns->get().begin(), - m_aSelectColumns->get().end(), + OSQLColumns::const_iterator aIter = find( + m_aSelectColumns->begin(), + m_aSelectColumns->end(), aAlias, ::comphelper::UStringMixEqual( isCaseSensitive() ) ); sal_Int32 i=1; - while(aIter != m_aSelectColumns->get().end()) + while(aIter != m_aSelectColumns->end()) { aAlias = rColumnName + OUString::number(i++); aIter = find( - m_aSelectColumns->get().begin(), - m_aSelectColumns->get().end(), + m_aSelectColumns->begin(), + m_aSelectColumns->end(), aAlias, ::comphelper::UStringMixEqual( isCaseSensitive() ) ); @@ -1757,12 +1757,12 @@ void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, O if ( !xColumn.is() ) xColumn = findColumn ( rColumnName, rTableRange, false ); if ( xColumn.is() ) - m_aOrderColumns->get().push_back(new OOrderColumn( xColumn, rTableRange, isCaseSensitive(), bAscending ) ); + m_aOrderColumns->push_back(new OOrderColumn( xColumn, rTableRange, isCaseSensitive(), bAscending ) ); else { sal_Int32 nId = rColumnName.toInt32(); - if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) ) - m_aOrderColumns->get().push_back( new OOrderColumn( ( m_aSelectColumns->get() )[nId-1], isCaseSensitive(), bAscending ) ); + if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->size()) ) + m_aOrderColumns->push_back( new OOrderColumn( (*m_aSelectColumns)[nId-1], isCaseSensitive(), bAscending ) ); } #ifdef SQL_TEST_PARSETREEITERATOR @@ -1778,12 +1778,12 @@ void OSQLParseTreeIterator::setGroupByColumnName(const OUString & rColumnName, O { Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false ); if ( xColumn.is() ) - m_aGroupColumns->get().push_back(new OParseColumn(xColumn,isCaseSensitive())); + m_aGroupColumns->push_back(new OParseColumn(xColumn,isCaseSensitive())); else { sal_Int32 nId = rColumnName.toInt32(); - if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) ) - m_aGroupColumns->get().push_back(new OParseColumn((m_aSelectColumns->get())[nId-1],isCaseSensitive())); + if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->size()) ) + m_aGroupColumns->push_back(new OParseColumn((*m_aSelectColumns)[nId-1],isCaseSensitive())); } #ifdef SQL_TEST_PARSETREEITERATOR @@ -1922,7 +1922,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getSimpleHavingTree() const Reference< XPropertySet > OSQLParseTreeIterator::findSelectColumn( const OUString & rColumnName ) { - for (auto const& lookupColumn : m_aSelectColumns->get()) + for (auto const& lookupColumn : *m_aSelectColumns) { Reference< XPropertySet > xColumn( lookupColumn ); try 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); diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index a515a3b65fed..62e25b10d3f8 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -55,34 +55,29 @@ namespace connectivity typedef std::map<OUString,OSQLTable,comphelper::UStringMixLess> OSQLTables; // class ORefVector allows reference counting on a std::vector - template< class VectorVal > class ORefVector : public salhelper::SimpleReferenceObject + template< class VectorVal > class ORefVector : public salhelper::SimpleReferenceObject, + public std::vector< VectorVal > { - std::vector< VectorVal > m_vector; - protected: virtual ~ORefVector() override {} public: typedef std::vector< VectorVal > Vector; ORefVector() {} - ORefVector(size_t _st) : m_vector(_st) {} + ORefVector(size_t _st) : std::vector< VectorVal >(_st) {} ORefVector(const ORefVector& rOther) : salhelper::SimpleReferenceObject() - , m_vector(rOther.m_vector) + , std::vector< VectorVal >(rOther) {} ORefVector& operator=(const ORefVector& _rRH) { if ( &_rRH != this ) { - m_vector = _rRH.m_vector; + std::vector< VectorVal >::operator=(_rRH); } return *this; } - - std::vector< VectorVal > & get() { return m_vector; } - std::vector< VectorVal > const & get() const { return m_vector; } - }; // class ORowVector includes refcounting and initialize himself @@ -101,16 +96,16 @@ namespace connectivity // search from first to last the column with the name _rVal // when no such column exist last is returned OOO_DLLPUBLIC_DBTOOLS - OSQLColumns::Vector::const_iterator find( const OSQLColumns::Vector::const_iterator& first, - const OSQLColumns::Vector::const_iterator& last, + OSQLColumns::const_iterator find( const OSQLColumns::const_iterator& first, + const OSQLColumns::const_iterator& last, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); // search from first to last the column with the realname _rVal // when no such column exist last is returned OOO_DLLPUBLIC_DBTOOLS - OSQLColumns::Vector::const_iterator findRealName( const OSQLColumns::Vector::const_iterator& first, - const OSQLColumns::Vector::const_iterator& last, + OSQLColumns::const_iterator findRealName( const OSQLColumns::const_iterator& first, + const OSQLColumns::const_iterator& last, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); @@ -118,8 +113,8 @@ namespace connectivity // search from first to last the column with the property _rProp equals the value _rVal // when no such column exist last is returned OOO_DLLPUBLIC_DBTOOLS - OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator first, - const OSQLColumns::Vector::const_iterator& last, + OSQLColumns::const_iterator find( OSQLColumns::const_iterator first, + const OSQLColumns::const_iterator& last, const OUString& _rProp, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 44ec1e2393d6..9740b6712ac3 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -503,7 +503,7 @@ namespace connectivity OValueRefVector(){} OValueRefVector(size_t _st) : ODeleteVector< ORowSetValueDecoratorRef >(_st) { - for (auto & elem : get()) + for (auto & elem : *this) elem = new ORowSetValueDecorator; } }; @@ -513,7 +513,7 @@ namespace connectivity { ::std::vector<sal_Int32> m_nParameterIndexes; public: - OAssignValues(Vector::size_type n) : OValueRefVector(n),m_nParameterIndexes(n+1,SQL_NO_PARAMETER){} + OAssignValues(size_type n) : OValueRefVector(n),m_nParameterIndexes(n+1,SQL_NO_PARAMETER){} void setParameterIndex(sal_Int32 _nId,sal_Int32 _nParameterIndex) { m_nParameterIndexes[_nId] = _nParameterIndex;} sal_Int32 getParameterIndex(sal_Int32 _nId) const { return m_nParameterIndexes[_nId]; } diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 2fcdef3609e9..4e32f806c33e 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -161,6 +161,8 @@ public: void UpdateFrameGeometry(); + virtual void BeginSheet(SalFrame* pSheetFrame) const override; + // trigger painting of the window void SendPaintEvent( const tools::Rectangle* pRect = nullptr ); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index b83138e29d40..bc1127d1989b 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -259,6 +259,10 @@ public: return false; } + /** only does anything on MACOSX where it indicates to the OS that this window is a modal-dialog + * and should be displayed using the special sheet mode */ + virtual void BeginSheet(SalFrame* /*pSheetWindow*/) const {} + // return true to indicate tooltips are shown natively, false otherwise virtual bool ShowTooltip(const OUString& /*rHelpText*/, const tools::Rectangle& /*rHelpArea*/) { diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 9539fb26401d..aafafe7a0c6c 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1808,4 +1808,13 @@ void AquaSalFrame::EndSetClipRegion() // shadow is invalidated when view gets drawn again } +void AquaSalFrame::BeginSheet(SalFrame* pSheetFrame) const +{ + NSWindow* pSheetNSWindow = static_cast<AquaSalFrame*>(pSheetFrame)->mpNSWindow; +// [mpNSWindow beginSheet:pSheetNSWindow]; +// beginSheet(mpNSWindow]; + + [mpNSWindow beginSheet:pSheetNSWindow completionHandler:nil ]; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index ecc760625486..f83b0c3f02b8 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -965,6 +965,9 @@ bool Dialog::ImplStartExecute() // FIXME: no layouting, workaround some clipping issues ImplAdjustNWFSizes(); + if (mpDialogParent) + mpDialogParent->ImplGetFrame()->BeginSheet(ImplGetFrame()); // only does anything on macOS + css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getProcessComponentContext()); bool bForceFocusAndToFront(officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext)); |