diff options
35 files changed, 303 insertions, 252 deletions
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 59c00ab9a539..c5a2f8ec8b29 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -119,13 +119,13 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne { xUpd->moveToInsertRow(); sal_Int32 i = 1; - for(connectivity::ORowVector< ORowSetValue > ::iterator aIter = _rInsertRow->begin()+1;aIter != _rInsertRow->end();++aIter,++i) + for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != _rInsertRow->get().end();++aIter,++i) { aIter->setSigned(m_aSignedFlags[i-1]); updateColumn(i,xUpdRow,*aIter); } xUpd->insertRow(); - (*_rInsertRow->begin()) = m_xRowLocate->getBookmark(); + (*_rInsertRow->get().begin()) = m_xRowLocate->getBookmark(); } else ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this ); @@ -139,8 +139,8 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); sal_Int32 i = 1; - connectivity::ORowVector< ORowSetValue > ::const_iterator aOrgIter = _rOrginalRow->begin()+1; - for(connectivity::ORowVector< ORowSetValue > ::iterator aIter = _rInsertRow->begin()+1;aIter != _rInsertRow->end();++aIter,++i,++aOrgIter) + connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOrginalRow->get().begin()+1; + for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != _rInsertRow->get().end();++aIter,++i,++aOrgIter) { aIter->setSigned(aOrgIter->isSigned()); updateColumn(i,xUpdRow,*aIter); diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 9ee2ce8e1b83..bc48a56ed3f0 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -148,7 +148,7 @@ void SAL_CALL ORowSetColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandl break; case PROPERTY_ID_VALUE: if ( !m_aColumnValue.isNull() && (*m_aColumnValue).isValid() ) - rValue = (*(*m_aColumnValue))[m_nPos].makeAny(); + rValue = ((*m_aColumnValue)->get())[m_nPos].makeAny(); break; default: ORowSetDataColumn::getFastPropertyValue(rValue,nHandle); diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 96f645f77acc..3205d343f83b 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -158,8 +158,8 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue( Any& rValue, sal_Int32 nH #if OSL_DEBUG_LEVEL > 0 ORowSetRow aRow = *m_aColumnValue; #endif - OSL_ENSURE((sal_Int32)aRow->size() > m_nPos,"Pos is greater than size of vector"); - rValue = (*(*m_aColumnValue))[m_nPos].makeAny(); + OSL_ENSURE((sal_Int32)aRow->get().size() > m_nPos,"Pos is greater than size of vector"); + rValue = ((*m_aColumnValue)->get())[m_nPos].makeAny(); } break; default: @@ -237,11 +237,11 @@ Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId() throw (RuntimeExce // ------------------------------------------------------------------------- void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue) { - if ( !m_aColumnValue.isNull() && m_aColumnValue->isValid() && (!((*(*m_aColumnValue))[m_nPos] == _rOldValue)) ) + if ( !m_aColumnValue.isNull() && m_aColumnValue->isValid() && (!(((*m_aColumnValue)->get())[m_nPos] == _rOldValue)) ) { sal_Int32 nHandle = PROPERTY_ID_VALUE; m_aOldValue = _rOldValue.makeAny(); - Any aNew = (*(*m_aColumnValue))[m_nPos].makeAny(); + Any aNew = ((*m_aColumnValue)->get())[m_nPos].makeAny(); fire(&nHandle, &aNew, &m_aOldValue, 1, sal_False ); } @@ -278,8 +278,8 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName connectivity::sdbcx::ObjectType xNamed; ::comphelper::UStringMixEqual aCase(isCaseSensitive()); - ::connectivity::OSQLColumns::const_iterator first = ::connectivity::find(m_aColumns->begin(),m_aColumns->end(),_rName,aCase); - if(first != m_aColumns->end()) + ::connectivity::OSQLColumns::Vector::const_iterator first = ::connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),_rName,aCase); + if(first != m_aColumns->get().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 ae36a6dd15da..3a8cf7cd94fe 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -204,8 +204,8 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aComma = ::rtl::OUString::createFromAscii(","); sal_Int32 i = 1; - ORowVector< ORowSetValue >::const_iterator aIter = _rInsertRow->begin()+1; - for(; aIter != _rInsertRow->end();++aIter) + ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1; + for(; aIter != _rInsertRow->get().end();++aIter) { aSql += ::dbtools::quoteName( aQuote,m_xSetMetaData->getColumnName(i++)); aSql += aComma; @@ -221,7 +221,7 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql)); Reference< XParameters > xParameter(xPrep,UNO_QUERY); i = 1; - for(aIter = _rInsertRow->begin()+1; aIter != _rInsertRow->end();++aIter,++i) + for(aIter = _rInsertRow->get().begin()+1; aIter != _rInsertRow->get().end();++aIter,++i) { if(aIter->isNull()) xParameter->setNull(i,aIter->getTypeKind()); @@ -316,8 +316,8 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow sal_Int32 nCheckCount = 1; // index for the orginal values sal_Int32 i = 1; - ORowVector< ORowSetValue >::const_iterator aIter = _rRow->begin()+1; - ORowVector< ORowSetValue >::const_iterator aEnd = _rRow->begin()+1; + ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rRow->get().begin()+1; + ORowVector< ORowSetValue >::Vector::const_iterator aEnd = _rRow->get().end()+1; for(; aIter != aEnd;++aIter,++nCheckCount,++i) { aColumnName = m_xSetMetaData->getColumnName(i); @@ -384,7 +384,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql)); Reference< XParameters > xParameter(xPrep,UNO_QUERY); sal_Int32 i = 1; - for(ORowVector< ORowSetValue >::const_iterator aIter = _rInsertRow->begin()+1; aIter != _rInsertRow->end();++aIter) + for(ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1; aIter != _rInsertRow->get().end();++aIter) { if(aIter->isModified()) { @@ -394,7 +394,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR } for(::std::list< sal_Int32>::const_iterator aOrgValue = aOrgValues.begin(); aOrgValue != aOrgValues.end();++aOrgValue,++i) { - setParameter(i,xParameter,(*_rOrginalRow)[*aOrgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i)); + setParameter(i,xParameter,(_rOrginalRow->get())[*aOrgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i)); } m_bUpdated = xPrep->executeUpdate() > 0; @@ -476,7 +476,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti sal_Int32 i = 1; for(::std::list< sal_Int32>::const_iterator j = aOrgValues.begin(); j != aOrgValues.end();++j,++i) { - setParameter(i,xParameter,(*_rDeleteRow)[*j],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i)); + setParameter(i,xParameter,(_rDeleteRow->get())[*j],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i)); } m_bDeleted = xPrep->executeUpdate() > 0; @@ -579,10 +579,10 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) if(!aBookmark.hasValue()) aBookmark = makeAny(_nPosition); - connectivity::ORowVector< ORowSetValue >::iterator aIter = _rRow->begin(); + connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rRow->get().begin(); (*aIter) = aBookmark; ++aIter; - for(sal_Int32 i=1;aIter != _rRow->end();++aIter,++i) + for(sal_Int32 i=1;aIter != _rRow->get().end();++aIter,++i) { sal_Int32 nType = m_xSetMetaData->getColumnType(i); aIter->setSigned(m_aSignedFlags[i-1]); diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index 8d44daf40130..6d7b609b4d25 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -69,11 +69,11 @@ namespace dbaccess OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::vos::ORef< ::connectivity::OSQLColumns >& _rColumns, sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex ) { - ::std::vector< ::rtl::OUString > aNames; aNames.reserve( _rColumns->size() ); + ::std::vector< ::rtl::OUString > aNames; aNames.reserve( _rColumns->get().size() ); ::rtl::OUString sColumName; - for ( ::connectivity::OSQLColumns::const_iterator column = _rColumns->begin(); - column != _rColumns->end(); + for ( ::connectivity::OSQLColumns::Vector::const_iterator column = _rColumns->get().begin(); + column != _rColumns->get().end(); ++column ) { @@ -98,11 +98,11 @@ namespace dbaccess { if ( m_aColumns.isValid() ) { - ::connectivity::OSQLColumns::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()); + ::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()); - if(aIter != m_aColumns->end()) + if(aIter != m_aColumns->get().end()) return connectivity::sdbcx::ObjectType(*aIter,UNO_QUERY); OSL_ENSURE(0,"Column not found in collection!"); diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 28f8417a6b25..e3bdf43228f9 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -406,9 +406,9 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(*pBegin)); if(m_aKeyIter != m_aKeyMap.end()) { - connectivity::ORowVector< ORowSetValue >::iterator aKeyIter = m_aKeyIter->second.first->begin(); + connectivity::ORowVector< ORowSetValue >::Vector::iterator aKeyIter = m_aKeyIter->second.first->get().begin(); SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); - for(sal_uInt16 j = 0;aKeyIter != m_aKeyIter->second.first->end();++aKeyIter,++j,++aPosIter) + for(sal_uInt16 j = 0;aKeyIter != m_aKeyIter->second.first->get().end();++aKeyIter,++j,++aPosIter) { setParameter(i++,xParameter,*aKeyIter,aPosIter->second.nType,aPosIter->second.nScale); } @@ -475,7 +475,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if(xKeyColumns.is() && xKeyColumns->hasByName(aIter->first)) { sKeyCondition += ::dbtools::quoteName( aQuote,aIter->first); - if((*_rOrginalRow)[aIter->second.nPosition].isNull()) + if((_rOrginalRow->get())[aIter->second.nPosition].isNull()) sKeyCondition += ::rtl::OUString::createFromAscii(" IS NULL"); else sKeyCondition += ::rtl::OUString::createFromAscii(" = ?"); @@ -489,7 +489,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if((*aIndexIter)->hasByName(aIter->first)) { sIndexCondition += ::dbtools::quoteName( aQuote,aIter->first); - if((*_rOrginalRow)[aIter->second.nPosition].isNull()) + if((_rOrginalRow->get())[aIter->second.nPosition].isNull()) sIndexCondition += ::rtl::OUString::createFromAscii(" IS NULL"); else { @@ -501,7 +501,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow } } } - if((*_rInsertRow)[aIter->second.nPosition].isModified()) + if((_rInsertRow->get())[aIter->second.nPosition].isModified()) { sSetValues += ::dbtools::quoteName( aQuote,aIter->first); sSetValues += aPara; @@ -551,10 +551,10 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow for(;aIter != m_pColumnNames->end();++aIter,++j) { sal_Int32 nPos = aIter->second.nPosition; - if((*_rInsertRow)[nPos].isModified()) + if((_rInsertRow->get())[nPos].isModified()) { - (*_rInsertRow)[nPos].setSigned((*_rOrginalRow)[nPos].isSigned()); - setParameter(i++,xParameter,(*_rInsertRow)[nPos],aIter->second.nType,aIter->second.nScale); + (_rInsertRow->get())[nPos].setSigned((_rOrginalRow->get())[nPos].isSigned()); + setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); } } // and then the values of the where condition @@ -562,7 +562,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow j = 0; for(;aIter != (*m_pKeyColumnNames).end();++aIter,++i,++j) { - setParameter(i,xParameter,(*_rOrginalRow)[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); + setParameter(i,xParameter,(_rOrginalRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); } // now we have to set the index values @@ -570,7 +570,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow j = 0; for(;aIdxColIter != aIndexColumnPositions.end();++aIdxColIter,++i,++j) { - setParameter(i,xParameter,(*_rOrginalRow)[*aIdxColIter],(*_rOrginalRow)[*aIdxColIter].getTypeKind(),aIter->second.nScale); + setParameter(i,xParameter,(_rOrginalRow->get())[*aIdxColIter],(_rOrginalRow->get())[*aIdxColIter].getTypeKind(),aIter->second.nScale); } m_bUpdated = xPrep->executeUpdate() > 0; @@ -578,7 +578,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if(m_bUpdated) { - m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32((*_rInsertRow)[0].getAny())); + m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32((_rInsertRow->get())[0].getAny())); OSL_ENSURE(m_aKeyIter != m_aKeyMap.end(),"New inserted row not found!"); m_aKeyIter->second.second = 2; copyRowValue(_rInsertRow,m_aKeyIter->second.first); @@ -604,7 +604,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi sal_Bool bModified = sal_False; for(;aIter != m_pColumnNames->end();++aIter,++j) { - if((*_rInsertRow)[aIter->second.nPosition].isModified()) + if((_rInsertRow->get())[aIter->second.nPosition].isModified()) { aSql += ::dbtools::quoteName( aQuote,aIter->first); aSql += aComma; @@ -627,14 +627,14 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi for(sal_Int32 i = 1;aPosIter != m_pColumnNames->end();++aPosIter) { sal_Int32 nPos = aPosIter->second.nPosition; - if((*_rInsertRow)[nPos].isModified()) + if((_rInsertRow->get())[nPos].isModified()) { - if((*_rInsertRow)[nPos].isNull()) - xParameter->setNull(i++,(*_rInsertRow)[nPos].getTypeKind()); + if((_rInsertRow->get())[nPos].isNull()) + xParameter->setNull(i++,(_rInsertRow->get())[nPos].getTypeKind()); else { - (*_rInsertRow)[nPos].setSigned(m_aSignedFlags[nPos-1]); - setParameter(i++,xParameter,(*_rInsertRow)[nPos],aPosIter->second.nType,aPosIter->second.nScale); + (_rInsertRow->get())[nPos].setSigned(m_aSignedFlags[nPos-1]); + setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aPosIter->second.nType,aPosIter->second.nScale); } } } @@ -647,8 +647,8 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi SelectColumnsMetaData::const_iterator defaultIter = m_pColumnNames->begin(); for(;defaultIter != m_pColumnNames->end();++defaultIter) { - if ( !(*_rInsertRow)[defaultIter->second.nPosition].isModified() ) - (*_rInsertRow)[defaultIter->second.nPosition] = defaultIter->second.sDefaultValue; + if ( !(_rInsertRow->get())[defaultIter->second.nPosition].isModified() ) + (_rInsertRow->get())[defaultIter->second.nPosition] = defaultIter->second.sDefaultValue; } try { @@ -671,7 +671,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi #endif SelectColumnsMetaData::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); if ( aFind != m_pKeyColumnNames->end() ) - (*_rInsertRow)[aFind->second.nPosition].fill(i,aFind->second.nType,xRow); + (_rInsertRow->get())[aFind->second.nPosition].fill(i,aFind->second.nType,xRow); } bAutoValuesFetched = sal_True; } @@ -724,7 +724,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi // we will only fetch values which are keycolumns SelectColumnsMetaData::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); if(aFind != m_pKeyColumnNames->end()) - (*_rInsertRow)[aFind->second.nPosition].fill(i,aFind->second.nType,xRow); + (_rInsertRow->get())[aFind->second.nPosition].fill(i,aFind->second.nType,xRow); } } ::comphelper::disposeComponent(xStatement); @@ -744,18 +744,18 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi --aKeyIter; m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,1))).first; // now we set the bookmark for this row - (*_rInsertRow)[0] = makeAny((sal_Int32)m_aKeyIter->first); + (_rInsertRow->get())[0] = makeAny((sal_Int32)m_aKeyIter->first); } } // ----------------------------------------------------------------------------- void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow) { - connectivity::ORowVector< ORowSetValue >::iterator aIter = _rKeyRow->begin(); + connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rKeyRow->get().begin(); SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); for(;aPosIter != aPosEnd;++aPosIter,++aIter) { - *aIter = (*_rInsertRow)[aPosIter->second.nPosition]; + *aIter = (_rInsertRow->get())[aPosIter->second.nPosition]; aIter->setTypeKind(aPosIter->second.nType); } } @@ -795,7 +795,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit if(xKeyColumns.is() && xKeyColumns->hasByName(aIter->first)) { aSql += ::dbtools::quoteName( aQuote,aIter->first); - if((*_rDeleteRow)[aIter->second.nPosition].isNull()) + if((_rDeleteRow->get())[aIter->second.nPosition].isNull()) { OSL_ENSURE(0,"can a primary key be null"); aSql += ::rtl::OUString::createFromAscii(" IS NULL"); @@ -812,7 +812,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit if((*aIndexIter)->hasByName(aIter->first)) { sIndexCondition += ::dbtools::quoteName( aQuote,aIter->first); - if((*_rDeleteRow)[aIter->second.nPosition].isNull()) + if((_rDeleteRow->get())[aIter->second.nPosition].isNull()) sIndexCondition += ::rtl::OUString::createFromAscii(" IS NULL"); else { @@ -837,21 +837,21 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit i = 1; for(;aIter != (*m_pKeyColumnNames).end();++aIter,++i) { - setParameter(i,xParameter,(*_rDeleteRow)[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); + setParameter(i,xParameter,(_rDeleteRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); } // now we have to set the index values ::std::vector<sal_Int32>::iterator aIdxColIter = aIndexColumnPositions.begin(); for(;aIdxColIter != aIndexColumnPositions.end();++aIdxColIter,++i) { - setParameter(i,xParameter,(*_rDeleteRow)[*aIdxColIter],(*_rDeleteRow)[*aIdxColIter].getTypeKind(),aIter->second.nScale); + setParameter(i,xParameter,(_rDeleteRow->get())[*aIdxColIter],(_rDeleteRow->get())[*aIdxColIter].getTypeKind(),aIter->second.nScale); } m_bDeleted = xPrep->executeUpdate() > 0; if(m_bDeleted) { - sal_Int32 nBookmark = ::comphelper::getINT32((*_rDeleteRow)[0].getAny()); + sal_Int32 nBookmark = ::comphelper::getINT32((_rDeleteRow->get())[0].getAny()); if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != m_aKeyMap.end()) ++m_aKeyIter; m_aKeyMap.erase(nBookmark); @@ -1076,7 +1076,7 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) OSL_ENSURE(xParameter.is(),"No Parameter interface!"); xParameter->clearParameters(); sal_Int32 nPos=1; - connectivity::ORowVector< ORowSetValue >::const_iterator aIter = m_aKeyIter->second.first->begin(); + connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->get().begin(); SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); for(;aPosIter != (*m_pKeyColumnNames).end();++aPosIter,++aIter,++nPos) setParameter(nPos,xParameter,*aIter,aPosIter->second.nType,aPosIter->second.nScale); @@ -1101,7 +1101,7 @@ sal_Bool OKeySet::fetchRow() if ( bRet ) { ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size() + m_pForeignColumnNames->size()); - connectivity::ORowVector< ORowSetValue >::iterator aIter = aKeyRow->begin(); + connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = aKeyRow->get().begin(); // first fetch the values needed for the key column SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); for(;aPosIter != (*m_pKeyColumnNames).end();++aPosIter,++aIter) diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 06e10a34405b..e854a91694cf 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -284,7 +284,7 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; sal_Int32 nBT = PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; - m_aPrematureParamValues.resize( 0 ); + m_aPrematureParamValues.get().resize( 0 ); // sdb.RowSet Properties registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); @@ -790,10 +790,10 @@ void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x) checkUpdateConditions(columnIndex); checkUpdateIterator(); - ::connectivity::ORowSetValue aOldValue((*(*m_aCurrentRow))[columnIndex]); + ::connectivity::ORowSetValue aOldValue(((*m_aCurrentRow)->get())[columnIndex]); m_pCache->updateValue(columnIndex,x); // we have to notify all listeners - (*(*m_aCurrentRow))[columnIndex] = x; + ((*m_aCurrentRow)->get())[columnIndex] = x; firePropertyChange(columnIndex-1 ,aOldValue); fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False); } @@ -874,11 +874,11 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc checkUpdateIterator(); ::connectivity::ORowSetValue aOldValue; - if((*(*m_aCurrentRow))[columnIndex].getTypeKind() == DataType::BLOB) + if(((*m_aCurrentRow)->get())[columnIndex].getTypeKind() == DataType::BLOB) { m_pCache->updateBinaryStream(columnIndex,x,length); - aOldValue = (*(*m_aCurrentRow))[columnIndex]; - (*(*m_aCurrentRow))[columnIndex] = makeAny(x); + aOldValue = ((*m_aCurrentRow)->get())[columnIndex]; + ((*m_aCurrentRow)->get())[columnIndex] = makeAny(x); } else { @@ -886,8 +886,8 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc if(x.is()) x->readBytes(aSeq,length); updateValue(columnIndex,aSeq); - aOldValue = (*(*m_aCurrentRow))[columnIndex]; - (*(*m_aCurrentRow))[columnIndex] = aSeq; + aOldValue = ((*m_aCurrentRow)->get())[columnIndex]; + ((*m_aCurrentRow)->get())[columnIndex] = aSeq; } firePropertyChange(columnIndex-1 ,aOldValue); @@ -904,8 +904,8 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer checkUpdateIterator(); m_pCache->updateCharacterStream(columnIndex,x,length); - ::connectivity::ORowSetValue aOldValue((*(*m_aCurrentRow))[columnIndex]); - (*(*m_aCurrentRow))[columnIndex] = makeAny(x); + ::connectivity::ORowSetValue aOldValue(((*m_aCurrentRow)->get())[columnIndex]); + ((*m_aCurrentRow)->get())[columnIndex] = makeAny(x); firePropertyChange(columnIndex-1 ,aOldValue); fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False); } @@ -949,10 +949,10 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw if (!::dbtools::implUpdateObject(this, columnIndex, aNewValue)) { // there is no other updateXXX call which can handle the value in x - ::connectivity::ORowSetValue aOldValue((*(*m_aCurrentRow))[columnIndex]); + ::connectivity::ORowSetValue aOldValue(((*m_aCurrentRow)->get())[columnIndex]); m_pCache->updateObject(columnIndex,aNewValue); // we have to notify all listeners - (*(*m_aCurrentRow))[columnIndex] = aNewValue; + ((*m_aCurrentRow)->get())[columnIndex] = aNewValue; firePropertyChange(columnIndex-1 ,aOldValue); fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False); } @@ -966,10 +966,10 @@ void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, checkUpdateConditions(columnIndex); checkUpdateIterator(); - ::connectivity::ORowSetValue aOldValue((*(*m_aCurrentRow))[columnIndex]); + ::connectivity::ORowSetValue aOldValue(((*m_aCurrentRow)->get())[columnIndex]); m_pCache->updateNumericObject(columnIndex,x,scale); // we have to notify all listeners - (*(*m_aCurrentRow))[columnIndex] = x; + ((*m_aCurrentRow)->get())[columnIndex] = x; firePropertyChange(columnIndex-1 ,aOldValue); fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False); } @@ -1348,7 +1348,7 @@ sal_Bool SAL_CALL ORowSet::wasNull( ) throw(SQLException, RuntimeException) ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); - return ( m_pCache && isInsertRow() ) ? (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex].isNull() : ORowSetBase::wasNull(); + return ( m_pCache && isInsertRow() ) ? ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex].isNull() : ORowSetBase::wasNull(); } // ----------------------------------------------------------------------------- const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex) @@ -1356,7 +1356,7 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex) checkCache(); if ( m_pCache && isInsertRow() ) - return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex]; + return ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex]; return getValue(columnIndex); } @@ -1439,7 +1439,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getBinaryStrea if ( m_pCache && isInsertRow() ) { checkCache(); - return new ::comphelper::SequenceInputStream((*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex].getSequence()); + return new ::comphelper::SequenceInputStream(((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex].getSequence()); } return ORowSetBase::getBinaryStream(columnIndex); @@ -1451,7 +1451,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getCharacterSt if(m_pCache && isInsertRow() ) { checkCache(); - return new ::comphelper::SequenceInputStream((*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex].getSequence()); + return new ::comphelper::SequenceInputStream(((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex].getSequence()); } return ORowSetBase::getCharacterStream(columnIndex); @@ -1698,7 +1698,7 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw() } Reference< XParameters > xParam( m_xStatement, UNO_QUERY_THROW ); - size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues.size() ); + size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues.get().size() ); for ( size_t i=1; i<=nParamCount; ++i ) { ORowSetValue& rParamValue( getParameterStorage( (sal_Int32)i ) ); @@ -1877,7 +1877,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi { sal_Int32 nCount = xMetaData->getColumnCount(); m_aDataColumns.reserve(nCount+1); - aColumns->reserve(nCount+1); + aColumns->get().reserve(nCount+1); DECLARE_STL_USTRINGACCESS_MAP(int,StringMap); StringMap aColumnMap; for (sal_Int32 i = 0 ; i < nCount; ++i) @@ -1903,7 +1903,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi aDescription, m_aCurrentRow); aColumnMap.insert(StringMap::value_type(sName,0)); - aColumns->push_back(pColumn); + aColumns->get().push_back(pColumn); pColumn->setName(sName); aNames.push_back(sName); m_aDataColumns.push_back(pColumn); @@ -1937,7 +1937,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi Reference< XResultSetMetaData > xMeta( getMetaData(), UNO_QUERY_THROW ); sal_Int32 nCount = xMeta->getColumnCount(); m_aDataColumns.reserve(nCount+1); - aColumns->reserve(nCount+1); + aColumns->get().reserve(nCount+1); ::std::set< Reference< XPropertySet > > aAllColumns; for(sal_Int32 i=1; i <= nCount ;++i) @@ -1991,7 +1991,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi m_xActiveConnection->getMetaData(), aDescription, m_aCurrentRow); - aColumns->push_back(pColumn); + aColumns->get().push_back(pColumn); if(!sName.getLength()) { if(xColumn.is()) @@ -2423,10 +2423,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.size() ) ); + size_t nParamCount( ::std::min( m_pParameters->size(), m_aPrematureParamValues.get().size() ) ); for ( size_t i=0; i<nParamCount; ++i ) { - (*m_pParameters)[i] = m_aPrematureParamValues[i]; + (*m_pParameters)[i] = m_aPrematureParamValues.get()[i]; } } @@ -2438,10 +2438,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.resize( nParamCount ); + m_aPrematureParamValues.get().resize( nParamCount ); for ( size_t i=0; i<nParamCount; ++i ) { - m_aPrematureParamValues[i] = (*m_pParameters)[i]; + m_aPrematureParamValues.get()[i] = (*m_pParameters)[i]; } m_pParameters->dispose(); @@ -2469,9 +2469,9 @@ ORowSetValue& ORowSet::getParameterStorage(sal_Int32 parameterIndex) } } - if ( m_aPrematureParamValues.size() < (size_t)parameterIndex ) - m_aPrematureParamValues.resize( parameterIndex ); - return m_aPrematureParamValues[ parameterIndex - 1 ]; + if ( m_aPrematureParamValues.get().size() < (size_t)parameterIndex ) + m_aPrematureParamValues.get().resize( parameterIndex ); + return m_aPrematureParamValues.get()[ parameterIndex - 1 ]; } // ------------------------------------------------------------------------- // XParameters @@ -2637,7 +2637,7 @@ void SAL_CALL ORowSet::clearParameters( ) throw(SQLException, RuntimeException) ::osl::MutexGuard aGuard( m_aColumnsMutex ); - size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues.size() ); + size_t nParamCount( m_pParameters.is() ? m_pParameters->size() : m_aPrematureParamValues.get().size() ); for ( size_t i=1; i<=nParamCount; ++i ) getParameterStorage( (sal_Int32)i ).setNull(); } @@ -2700,7 +2700,7 @@ void ORowSet::checkUpdateConditions(sal_Int32 columnIndex) if ( m_aCurrentRow.isNull() ) throwSQLException( "Invalid cursor state", SQL_INVALID_CURSOR_STATE, *this ); - if ( sal_Int32((*m_aCurrentRow)->size()) <= columnIndex ) + if ( sal_Int32((*m_aCurrentRow)->get().size()) <= columnIndex ) throwSQLException( "Invalid column index", SQL_INVALID_DESCRIPTOR_INDEX, *this ); // TODO: resource if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY) @@ -2765,7 +2765,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo Sequence< ::rtl::OUString> aSeq = rParent.m_pColumns->getElementNames(); const ::rtl::OUString* pBegin = aSeq.getConstArray(); const ::rtl::OUString* pEnd = pBegin + aSeq.getLength(); - aColumns->reserve(aSeq.getLength()+1); + aColumns->get().reserve(aSeq.getLength()+1); for(sal_Int32 i=1;pBegin != pEnd ;++pBegin,++i) { Reference<XPropertySet> xColumn; @@ -2779,7 +2779,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo rParent.m_xActiveConnection->getMetaData(), aDescription, m_aCurrentRow); - aColumns->push_back(pColumn); + aColumns->get().push_back(pColumn); pColumn->setName(*pBegin); aNames.push_back(*pBegin); m_aDataColumns.push_back(pColumn); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 1d1ce74c7e6f..5ba71d0e74d8 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -245,7 +245,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull( ) throw(SQLException, RuntimeException) checkCache(); - return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->isValid()) ? (*(*m_aCurrentRow))[m_nLastColumnIndex].isNull() : sal_True; + return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->isValid()) ? ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull() : sal_True; } // ----------------------------------------------------------------------------- @@ -298,9 +298,9 @@ const ORowSetValue& ORowSetBase::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!"); #if OSL_DEBUG_LEVEL > 0 ORowSetRow rRow = (*m_aCurrentRow); - OSL_ENSURE(rRow.isValid() && static_cast<sal_uInt16>(columnIndex) < (*rRow).size(),"Invalid size of vector!"); + OSL_ENSURE(rRow.isValid() && static_cast<sal_uInt16>(columnIndex) < (rRow->get()).size(),"Invalid size of vector!"); #endif - return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex]; + return ((*m_aCurrentRow)->get())[m_nLastColumnIndex = columnIndex]; } // we should normally never reach this @@ -407,7 +407,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS } if ( bValidCurrentRow ) - return new ::comphelper::SequenceInputStream((*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex].getSequence()); + return new ::comphelper::SequenceInputStream(((*m_aCurrentRow)->get())[m_nLastColumnIndex = columnIndex].getSequence()); // we should normally never reach this return Reference< ::com::sun::star::io::XInputStream >(); @@ -1248,7 +1248,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow) try { for(TDataColumns::iterator aIter = m_aDataColumns.begin();aIter != m_aDataColumns.end();++aIter,++i) // #104278# OJ ++i inserted - (*aIter)->fireValueChange(_rOldRow.isValid() ? (*_rOldRow)[i+1] : ::connectivity::ORowSetValue()); + (*aIter)->fireValueChange(_rOldRow.isValid() ? (_rOldRow->get())[i+1] : ::connectivity::ORowSetValue()); } catch(Exception&) { diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 318b49e247bc..a967bd0da5f0 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -481,16 +481,16 @@ Any ORowSetCache::getBookmark( ) return Any(); // this is allowed here because the rowset knowns what it is doing } - switch((*(*m_aMatrixIter))[0].getTypeKind()) + switch(((*m_aMatrixIter)->get())[0].getTypeKind()) { case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: - return makeAny((sal_Int32)(*(*m_aMatrixIter))[0]); + return makeAny((sal_Int32)((*m_aMatrixIter)->get())[0]); default: - if((*(*m_aMatrixIter))[0].isNull()) - (*(*m_aMatrixIter))[0] = m_pCacheSet->getBookmark(); - return (*(*m_aMatrixIter))[0].getAny(); + if(((*m_aMatrixIter)->get())[0].isNull()) + ((*m_aMatrixIter)->get())[0] = m_pCacheSet->getBookmark(); + return ((*m_aMatrixIter)->get())[0].getAny(); } } // ------------------------------------------------------------------------- @@ -563,9 +563,9 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x) checkUpdateConditions(columnIndex); - (*(*m_aInsertRow))[columnIndex].setBound(sal_True); - (*(*m_aInsertRow))[columnIndex] = x; - (*(*m_aInsertRow))[columnIndex].setModified(); + ((*m_aInsertRow)->get())[columnIndex].setBound(sal_True); + ((*m_aInsertRow)->get())[columnIndex] = x; + ((*m_aInsertRow)->get())[columnIndex].setModified(); } // ------------------------------------------------------------------------- void ORowSetCache::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) @@ -596,9 +596,9 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x ) checkUpdateConditions(columnIndex); - (*(*m_aInsertRow))[columnIndex].setBound(sal_True); - (*(*m_aInsertRow))[columnIndex] = x; - (*(*m_aInsertRow))[columnIndex].setModified(); + ((*m_aInsertRow)->get())[columnIndex].setBound(sal_True); + ((*m_aInsertRow)->get())[columnIndex] = x; + ((*m_aInsertRow)->get())[columnIndex].setModified(); } // ------------------------------------------------------------------------- void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) @@ -606,9 +606,9 @@ void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal checkUpdateConditions(columnIndex); - (*(*m_aInsertRow))[columnIndex].setBound(sal_True); - (*(*m_aInsertRow))[columnIndex] = x; - (*(*m_aInsertRow))[columnIndex].setModified(); + ((*m_aInsertRow)->get())[columnIndex].setBound(sal_True); + ((*m_aInsertRow)->get())[columnIndex] = x; + ((*m_aInsertRow)->get())[columnIndex].setModified(); } // ------------------------------------------------------------------------- // XResultSet @@ -1223,7 +1223,7 @@ sal_Bool ORowSetCache::insertRow( ) if ( bRet ) { ++m_nRowCount; - Any aBookmark = (*(*m_aInsertRow))[0].makeAny(); + Any aBookmark = ((*m_aInsertRow)->get())[0].makeAny(); m_bAfterLast = m_bBeforeFirst = sal_False; if(aBookmark.hasValue()) moveToBookmark(aBookmark); @@ -1261,7 +1261,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow ) if(isAfterLast() || isBeforeFirst()) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_UPDATEROW),NULL,SQLSTATE_GENERAL,1000,Any() ); - Any aBookmark = (*(*_rUpdateRow))[0].makeAny(); + Any aBookmark = ((*_rUpdateRow)->get())[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 @@ -1335,8 +1335,8 @@ void ORowSetCache::moveToInsertRow( ) *m_aInsertRow = new ORowSetValueVector(m_xMetaData->getColumnCount()); // we don't unbound the bookmark column - ORowSetValueVector::iterator aIter = (*m_aInsertRow)->begin()+1; - for(;aIter != (*m_aInsertRow)->end();++aIter) + ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin()+1; + for(;aIter != (*m_aInsertRow)->get().end();++aIter) { aIter->setBound(sal_False); aIter->setModified(sal_False); @@ -1389,8 +1389,8 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo (*(*m_aInsertRow)) = (*(*_rOriginalRow)); // we don't unbound the bookmark column - ORowSetValueVector::iterator aIter = (*m_aInsertRow)->begin(); - for(;aIter != (*m_aInsertRow)->end();++aIter) + ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin(); + for(;aIter != (*m_aInsertRow)->get().end();++aIter) aIter->setModified(sal_False); } // ----------------------------------------------------------------------------- @@ -1406,7 +1406,7 @@ void ORowSetCache::checkPositionFlags() // ----------------------------------------------------------------------------- void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex) { - if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size()) + if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->get().size()) throwFunctionSequenceException(m_xSet.get()); } //------------------------------------------------------------------------------ @@ -1514,8 +1514,8 @@ void ORowSetCache::clearInsertRow() // we don't unbound the bookmark column if ( m_aInsertRow != m_pInsertMatrix->end() && m_aInsertRow->isValid() ) { - ORowSetValueVector::iterator aIter = (*m_aInsertRow)->begin()+1; - ORowSetValueVector::iterator aEnd = (*m_aInsertRow)->end(); + ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin()+1; + ORowSetValueVector::Vector::iterator aEnd = (*m_aInsertRow)->get().end(); for(;aIter != aEnd;++aIter) { aIter->setBound(sal_False); diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 42eea30a7cf0..56e043483a7b 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -91,17 +91,17 @@ namespace dbaccess sal_Bool operator ()(const ORowSetRow& _rRH) { - switch((*_rRH)[0].getTypeKind()) + switch((_rRH->get())[0].getTypeKind()) { case ::com::sun::star::sdbc::DataType::TINYINT: case ::com::sun::star::sdbc::DataType::SMALLINT: case ::com::sun::star::sdbc::DataType::INTEGER: - return comphelper::getINT32(m_rAny) == (sal_Int32)(*_rRH)[0]; + return comphelper::getINT32(m_rAny) == (sal_Int32)(_rRH->get())[0]; default: { ::com::sun::star::uno::Sequence<sal_Int8> aSeq; m_rAny >>= aSeq; - return aSeq == (*_rRH)[0]; + return aSeq == (_rRH->get())[0]; } } } diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 4dfd571f1148..34aeb94c0586 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -740,7 +740,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW ); } - if ( aSelectColumns->empty() ) + if ( aSelectColumns->get().empty() ) { // This is a valid casse. 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 @@ -754,28 +754,28 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr SizeTSet aUsedSelectColumns; sal_Int32 nCount = xResultSetMeta->getColumnCount(); - OSL_ENSURE( (size_t) nCount == aSelectColumns->size(), "OSingleSelectQueryComposer::getColumns: inconsistent column counts, this might result in wrong columns!" ); + OSL_ENSURE( (size_t) nCount == aSelectColumns->get().size(), "OSingleSelectQueryComposer::getColumns: inconsistent column counts, this might result in wrong columns!" ); for(sal_Int32 i=1;i<=nCount;++i) { ::rtl::OUString sName = xResultSetMeta->getColumnName(i); sal_Bool bFound = sal_False; - OSQLColumns::const_iterator aFind = ::connectivity::find(aSelectColumns->begin(),aSelectColumns->end(),sName,aCaseCompare); - size_t nFoundSelectColumnPos = aFind - aSelectColumns->begin(); - if ( aFind != aSelectColumns->end() ) + OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),sName,aCaseCompare); + size_t nFoundSelectColumnPos = aFind - aSelectColumns->get().begin(); + if ( aFind != aSelectColumns->get().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->end(),sName,aCaseCompare); - nFoundSelectColumnPos = aFind - aSelectColumns->begin(); + aFind = ::connectivity::findRealName(++aFind,aSelectColumns->get().end(),sName,aCaseCompare); + nFoundSelectColumnPos = aFind - aSelectColumns->get().begin(); } while ( ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() ) - && ( aFind != aSelectColumns->end() ) + && ( aFind != aSelectColumns->get().end() ) ); } - if ( aFind != aSelectColumns->end() ) + if ( aFind != aSelectColumns->get().end() ) { (*aFind)->getPropertyValue(PROPERTY_NAME) >>= sName; aUsedSelectColumns.insert( nFoundSelectColumnPos ); @@ -787,21 +787,21 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr if ( bFound ) continue; - OSQLColumns::const_iterator aRealFind = ::connectivity::findRealName( - aSelectColumns->begin(), aSelectColumns->end(), sName, aCaseCompare ); + OSQLColumns::Vector::const_iterator aRealFind = ::connectivity::findRealName( + aSelectColumns->get().begin(), aSelectColumns->get().end(), sName, aCaseCompare ); - if ( i > static_cast< sal_Int32>( aSelectColumns->size() ) ) + if ( i > static_cast< sal_Int32>( aSelectColumns->get().size() ) ) { - aSelectColumns->push_back( + aSelectColumns->get().push_back( ::connectivity::parse::OParseColumn::createColumnForResultSet( xResultSetMeta, m_xMetaData, i ) ); - OSL_ENSURE( aSelectColumns->size() == (size_t)i, "OSingleSelectQueryComposer::getColumns: inconsistency!" ); + OSL_ENSURE( aSelectColumns->get().size() == (size_t)i, "OSingleSelectQueryComposer::getColumns: inconsistency!" ); } - else if ( aRealFind == aSelectColumns->end() ) + else if ( aRealFind == aSelectColumns->get().end() ) { // we can now only look if we found it under the realname propertery // here we have to make the assumption that the position is correct - OSQLColumns::iterator aFind2 = aSelectColumns->begin() + i-1; + OSQLColumns::Vector::iterator aFind2 = aSelectColumns->get().begin() + i-1; Reference<XPropertySet> xProp(*aFind2,UNO_QUERY); if ( !xProp.is() || !xProp->getPropertySetInfo()->hasPropertyByName( PROPERTY_REALNAME ) ) continue; @@ -829,7 +829,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr pColumn->setRealName(sRealName); pColumn->setTableName(::comphelper::getString(xProp->getPropertyValue(PROPERTY_TABLENAME))); - (*aSelectColumns)[i-1] = pColumn; + (aSelectColumns->get())[i-1] = pColumn; } else continue; @@ -1252,7 +1252,7 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( ) { ::vos::ORef< OSQLColumns> aCols = m_aSqlIterator.getParameters(); ::std::vector< ::rtl::OUString> aNames; - for(OSQLColumns::const_iterator aIter = aCols->begin(); aIter != aCols->end();++aIter) + for(OSQLColumns::Vector::const_iterator aIter = aCols->get().begin(); aIter != aCols->get().end();++aIter) aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME))); m_aCurrentColumns[ParameterColumns] = new OPrivateColumns(aCols,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames,sal_True); } @@ -1302,7 +1302,7 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn if ( !m_aCurrentColumns[_eType] ) { ::std::vector< ::rtl::OUString> aNames; - for(OSQLColumns::const_iterator aIter = _rCols->begin(); aIter != _rCols->end();++aIter) + for(OSQLColumns::Vector::const_iterator aIter = _rCols->get().begin(); aIter != _rCols->get().end();++aIter) aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME))); m_aCurrentColumns[_eType] = new OPrivateColumns(_rCols,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames,sal_True); } diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index 1e5864019880..80f54f2b47fa 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -122,8 +122,8 @@ sal_Bool OStaticSet::fetchRow() { m_aSet.push_back(new connectivity::ORowVector< connectivity::ORowSetValue >(m_xSetMetaData->getColumnCount())); m_aSetIter = m_aSet.end() - 1; - (*(*m_aSetIter))[0] = getRow(); - OCacheSet::fillValueRow(*m_aSetIter,(*(*m_aSetIter))[0]); + ((*m_aSetIter)->get())[0] = getRow(); + OCacheSet::fillValueRow(*m_aSetIter,((*m_aSetIter)->get())[0]); } else m_bEnd = sal_True; @@ -139,8 +139,8 @@ void OStaticSet::fillAllRows() ORowSetRow pRow = new connectivity::ORowVector< connectivity::ORowSetValue >(m_xSetMetaData->getColumnCount()); m_aSet.push_back(pRow); m_aSetIter = m_aSet.end() - 1; - (*pRow)[0] = getRow(); - OCacheSet::fillValueRow(pRow,(*pRow)[0]); + (pRow->get())[0] = getRow(); + OCacheSet::fillValueRow(pRow,(pRow->get())[0]); } m_bEnd = sal_True; } @@ -324,7 +324,7 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect { 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))[0] = (*_rInsertRow)[0] = getBookmark(); + ((*m_aSetIter)->get())[0] = (_rInsertRow->get())[0] = getBookmark(); m_bEnd = sal_False; } } @@ -339,7 +339,7 @@ void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connect OCacheSet::deleteRow(_rDeleteRow,_xTable); if(m_bDeleted) { - ORowSetMatrix::iterator aPos = m_aSet.begin()+(*_rDeleteRow)[0].getInt32(); + ORowSetMatrix::iterator aPos = m_aSet.begin()+(_rDeleteRow->get())[0].getInt32(); if(aPos == (m_aSet.end()-1)) m_aSetIter = m_aSet.end(); m_aSet.erase(aPos); diff --git a/dbaccess/source/core/api/makefile.mk b/dbaccess/source/core/api/makefile.mk index dd685af7e2d8..59d89fb9036f 100644 --- a/dbaccess/source/core/api/makefile.mk +++ b/dbaccess/source/core/api/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/dba.pmk # --- Files ------------------------------------- SLOFILES= \ diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index 350a9f334e87..3caa9fb903b6 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -30,8 +30,6 @@ #ifndef DBACCESS_DOCUMENTEVENTS_HXX #define DBACCESS_DOCUMENTEVENTS_HXX -#include "dbaccessdllapi.h" - /** === begin UNO includes === **/ #include <com/sun/star/container/XNameReplace.hpp> /** === end UNO includes === **/ @@ -54,7 +52,7 @@ namespace dbaccess typedef ::cppu::WeakImplHelper1 < ::com::sun::star::container::XNameReplace > DocumentEvents_Base; - class DBACCESS_DLLPRIVATE DocumentEvents + class DocumentEvents :public DocumentEvents_Base ,public ::boost::noncopyable { diff --git a/dbaccess/source/core/dataaccess/makefile.mk b/dbaccess/source/core/dataaccess/makefile.mk index f49e011bd861..580d62c08e55 100644 --- a/dbaccess/source/core/dataaccess/makefile.mk +++ b/dbaccess/source/core/dataaccess/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/dba.pmk # --- Files ------------------------------------- diff --git a/dbaccess/source/shared/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index 33dd640770e3..33dd640770e3 100644 --- a/dbaccess/source/shared/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx diff --git a/dbaccess/source/shared/dbastrings.cxx b/dbaccess/source/core/misc/dbastrings.cxx index 65d446386339..4caaa5650656 100644 --- a/dbaccess/source/shared/dbastrings.cxx +++ b/dbaccess/source/core/misc/dbastrings.cxx @@ -37,7 +37,7 @@ namespace dbaccess { -#include "stringconstants.cxx" +#include "stringconstants.inc" //============================================================ //= SQLSTATE //============================================================ diff --git a/dbaccess/source/core/misc/makefile.mk b/dbaccess/source/core/misc/makefile.mk index b274e11f0617..f4c3a93bba87 100644 --- a/dbaccess/source/core/misc/makefile.mk +++ b/dbaccess/source/core/misc/makefile.mk @@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +.INCLUDE : $(PRJ)$/util$/dba.pmk # --- Files ------------------------------------- @@ -55,7 +55,9 @@ SLOFILES= \ $(SLO)$/DatabaseDataProvider.obj \ $(SLO)$/module_dba.obj \ $(SLO)$/dsntypes.obj \ - $(SLO)$/veto.obj + $(SLO)$/veto.obj \ + $(SLO)$/apitools.obj \ + $(SLO)$/dbastrings.obj # --- Targets ---------------------------------- diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index a83217b1f18e..3c349bdb1c16 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -36,7 +36,7 @@ #include "module_dba.hxx" #include <osl/diagnose.h> #include "DatabaseDataProvider.hxx" -#include "dbaccessdllapi.h" +#include "dbadllapi.hxx" /********************************************************************************************/ @@ -87,7 +87,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() //--------------------------------------------------------------------------------------- -extern "C" DBACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( +extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** ) @@ -97,7 +97,7 @@ extern "C" DBACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironme } //--------------------------------------------------------------------------------------- -extern "C" DBACCESS_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( +extern "C" OOO_DLLPUBLIC_DBA sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey ) @@ -119,7 +119,7 @@ extern "C" DBACCESS_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" DBACCESS_DLLPUBLIC void* SAL_CALL component_getFactory( +extern "C" OOO_DLLPUBLIC_DBA void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey) diff --git a/dbaccess/source/core/resource/makefile.mk b/dbaccess/source/core/resource/makefile.mk index 91599dfb3ca0..cf81a6fe87f0 100644 --- a/dbaccess/source/core/resource/makefile.mk +++ b/dbaccess/source/core/resource/makefile.mk @@ -37,6 +37,7 @@ TARGET=core_resource # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/dba.pmk # --- Files -------------------------------------------------------- diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index 56ba9362b135..fe97a3a67198 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -66,7 +66,8 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui() //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** ) @@ -76,7 +77,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey ) @@ -97,7 +98,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/ext/adabas/makefile.mk b/dbaccess/source/ext/adabas/makefile.mk index fdd614266348..dd6f99a39ced 100644 --- a/dbaccess/source/ext/adabas/makefile.mk +++ b/dbaccess/source/ext/adabas/makefile.mk @@ -34,6 +34,7 @@ PRJ=..$/..$/.. PRJNAME=dbaccess TARGET=adabasui ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/dbaccess/source/ext/macromigration/makefile.mk b/dbaccess/source/ext/macromigration/makefile.mk index 3c833332fb8f..880a62afc173 100644 --- a/dbaccess/source/ext/macromigration/makefile.mk +++ b/dbaccess/source/ext/macromigration/makefile.mk @@ -36,6 +36,7 @@ TARGET=dbmm USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/source/inc/dbadllapi.hxx new file mode 100644 index 000000000000..326b8dbf9b3a --- /dev/null +++ b/dbaccess/source/inc/dbadllapi.hxx @@ -0,0 +1,45 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: $ + * + * $Revision: $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef INCLUDED_DBACCESS_SOURCE_INC_DBADLLAPI_HXX +#define INCLUDED_DBACCESS_SOURCE_INC_DBADLLAPI_HXX + +#include "sal/config.h" + +#include "sal/types.h" + +#if defined OOO_DLLIMPLEMENTATION_DBA +#define OOO_DLLPUBLIC_DBA SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_DBA SAL_DLLPUBLIC_IMPORT +#endif + +#endif diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index 0651c0d5babc..d523d5a62012 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/stl_types.hxx> -#include "dbaccessdllapi.h" +#include "dbadllapi.hxx" #include <tools/string.hxx> //......................................................................... @@ -92,7 +92,7 @@ enum DATASOURCE_TYPE //========================================================================= //= ODsnTypeCollection //========================================================================= -class DBACCESS_DLLPUBLIC ODsnTypeCollection +class OOO_DLLPUBLIC_DBA ODsnTypeCollection { protected: DECLARE_STL_VECTOR(String, StringVector); @@ -179,12 +179,12 @@ protected: //------------------------------------------------------------------------- //- ODsnTypeCollection::TypeIterator //------------------------------------------------------------------------- -class DBACCESS_DLLPUBLIC ODsnTypeCollection::TypeIterator +class OOO_DLLPUBLIC_DBA ODsnTypeCollection::TypeIterator { friend class ODsnTypeCollection; - friend bool DBACCESS_DLLPUBLIC operator==(const TypeIterator& lhs, const TypeIterator& rhs); - friend bool DBACCESS_DLLPUBLIC operator!=(const TypeIterator& lhs, const TypeIterator& rhs) { return !(lhs == rhs); } + friend bool OOO_DLLPUBLIC_DBA operator==(const TypeIterator& lhs, const TypeIterator& rhs); + friend bool OOO_DLLPUBLIC_DBA operator!=(const TypeIterator& lhs, const TypeIterator& rhs) { return !(lhs == rhs); } protected: const ODsnTypeCollection* m_pContainer; diff --git a/dbaccess/source/shared/stringconstants.cxx b/dbaccess/source/inc/stringconstants.inc index 55148de19e65..b8ede15d1d55 100644 --- a/dbaccess/source/shared/stringconstants.cxx +++ b/dbaccess/source/inc/stringconstants.inc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVE_CONNECTION, "ActiveConnection"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYFILTER, "ApplyFilter"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORDER, "Order"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYORDER, "ApplyOrder"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYORDER, "ApplyOrder"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISMODIFIED, "IsModified"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISNEW, "IsNew"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ROWCOUNT, "RowCount"); @@ -137,10 +137,10 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARENTWINDOW, "ParentWindow"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SQLEXCEPTION, "SQLException"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER, "Border"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_THREADSAFE, "ThreadSafe"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELPTEXT ,"HelpText"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLDEFAULT ,"ControlDefault"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HIDDEN ,"Hidden"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTSTATE ,"DefaultState"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELPTEXT ,"HelpText"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLDEFAULT ,"ControlDefault"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HIDDEN ,"Hidden"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTSTATE ,"DefaultState"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SUPPRESSVERSIONCL, "SuppressVersionColumns"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHOW_BROWSER, "ShowBrowser"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLE_BROWSER, "EnableBrowser"); @@ -158,32 +158,32 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTTEXT, "DefaultText"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT, "EffectiveDefault"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_AUTOINCREMENTCREATION, "AutoIncrementCreation"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOOLEANCOMPARISONMODE, "BooleanComparisonMode"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLESQL92CHECK, "EnableSQL92Check"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH, "FontCharWidth"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET, "FontCharset"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY, "FontFamily"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT, "FontHeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING, "FontKerning"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME, "FontName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION, "FontOrientation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH, "FontPitch"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT, "FontSlant"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT, "FontStrikeout"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME, "FontStyleName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE, "FontUnderline"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT, "FontWeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH, "FontWidth"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE, "FontType"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PERSISTENT_NAME, "PersistentName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EMBEDDEDOBJECT, "EmbeddedObject"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIGINAL, "Original"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLESQL92CHECK, "EnableSQL92Check"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH, "FontCharWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET, "FontCharset"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY, "FontFamily"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT, "FontHeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING, "FontKerning"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME, "FontName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION, "FontOrientation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH, "FontPitch"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT, "FontSlant"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT, "FontStrikeout"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME, "FontStyleName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE, "FontUnderline"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT, "FontWeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH, "FontWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE, "FontType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PERSISTENT_NAME, "PersistentName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EMBEDDEDOBJECT, "EmbeddedObject"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIGINAL, "Original"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USECATALOGINSELECT,"UseCatalogInSelect"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USESCHEMAINSELECT, "UseSchemaInSelect"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_OUTERJOINESCAPE, "EnableOuterJoinEscape"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_AS_TEMPLATE, "AsTemplate"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HAVING_CLAUSE, "HavingClause"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP_BY, "GroupBy"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_OUTERJOINESCAPE, "EnableOuterJoinEscape"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_AS_TEMPLATE, "AsTemplate"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HAVING_CLAUSE, "HavingClause"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP_BY, "GroupBy"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EDIT_WIDTH, "EditWidth"); //============================================================ @@ -230,14 +230,14 @@ IMPLEMENT_CONSTASCII_USTRING(SERVICE_UI_FOLDERPICKER, "com.sun.star.ui.dialogs.F IMPLEMENT_CONSTASCII_USTRING(SERVICE_I18N_COLLATOR, "com.sun.star.i18n.Collator"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_EXTENDED_ADABAS_DRIVER, "com.sun.star.comp.sdbcx.adabas.ODriver"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_TABLEDEFINITION, "com.sun.star.sdb.TableDefinition"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COMMAND_DEFINITION, "com.sun.star.sdb.CommandDefinition"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DOCUMENTDEFINITION, "com.sun.star.sdb.DocumentDefinition"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_FORM, "com.sun.star.sdb.Form"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_FORM_COLLECTION, "com.sun.star.sdb.Forms"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_REPORT, "com.sun.star.sdb.Report"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_REPORT_COLLECTION, "com.sun.star.sdb.Reports"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_QUERY_COLLECTION, "com.sun.star.sdb.Queries"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_TABLE_COLLECTION, "com.sun.star.sdb.Tables"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COMMAND_DEFINITION, "com.sun.star.sdb.CommandDefinition"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DOCUMENTDEFINITION, "com.sun.star.sdb.DocumentDefinition"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_FORM, "com.sun.star.sdb.Form"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_FORM_COLLECTION, "com.sun.star.sdb.Forms"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_REPORT, "com.sun.star.sdb.Report"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_REPORT_COLLECTION, "com.sun.star.sdb.Reports"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_QUERY_COLLECTION, "com.sun.star.sdb.Queries"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_TABLE_COLLECTION, "com.sun.star.sdb.Tables"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER, "com.sun.star.sdb.SingleSelectQueryComposer"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_APPLICATIONCONTROLLER, "org.openoffice.comp.dbu.OApplicationController"); diff --git a/dbaccess/source/shared/cfgstrings.cxx b/dbaccess/source/shared/cfgstrings.cxx index 60b40dd60862..50e63970680c 100644 --- a/dbaccess/source/shared/cfgstrings.cxx +++ b/dbaccess/source/shared/cfgstrings.cxx @@ -34,7 +34,7 @@ namespace dbacfg { -#include "stringconstants.cxx" +#include "stringconstants.inc" //============================================================ //= configuration key names diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx index 285fbd1d5354..875342b73b07 100644 --- a/dbaccess/source/shared/dbustrings.cxx +++ b/dbaccess/source/shared/dbustrings.cxx @@ -35,7 +35,7 @@ namespace dbaui { -#include "stringconstants.cxx" +#include "stringconstants.inc" //============================================================ //= URLs diff --git a/dbaccess/source/shared/makefile.mk b/dbaccess/source/shared/makefile.mk index 0eb36588c8ac..02157944689b 100644 --- a/dbaccess/source/shared/makefile.mk +++ b/dbaccess/source/shared/makefile.mk @@ -34,11 +34,10 @@ PRJINC=$(PRJ)$/source PRJNAME=dbaccess LIBTARGET=NO TARGET=shared -LIB1TARGET=$(SLB)$/dbashared.lib -LIB2TARGET=$(SLB)$/dbushared.lib -LIB3TARGET=$(SLB)$/fltshared.lib -LIB4TARGET=$(SLB)$/cfgshared.lib -LIB5TARGET=$(SLB)$/sdbtshared.lib +LIB1TARGET=$(SLB)$/dbushared.lib +LIB2TARGET=$(SLB)$/fltshared.lib +LIB3TARGET=$(SLB)$/cfgshared.lib +LIB4TARGET=$(SLB)$/sdbtshared.lib #ENABLE_EXCEPTIONS=TRUE @@ -50,7 +49,6 @@ LIB5TARGET=$(SLB)$/sdbtshared.lib # --- Files ------------------------------------- EXCEPTIONSFILES= \ - $(SLO)$/apitools.obj \ $(SLO)$/dbu_reghelper.obj \ $(SLO)$/cfg_reghelper.obj \ $(SLO)$/flt_reghelper.obj @@ -59,27 +57,21 @@ SLOFILES= \ $(EXCEPTIONSFILES) \ $(SLO)$/cfgstrings.obj \ $(SLO)$/xmlstrings.obj \ - $(SLO)$/dbastrings.obj \ $(SLO)$/dbustrings.obj - LIB1OBJFILES= \ - $(SLO)$/dbastrings.obj \ - $(SLO)$/apitools.obj - -LIB2OBJFILES= \ $(SLO)$/dbu_reghelper.obj \ $(SLO)$/dbustrings.obj -LIB3OBJFILES= \ +LIB2OBJFILES= \ $(SLO)$/flt_reghelper.obj \ $(SLO)$/xmlstrings.obj -LIB4OBJFILES= \ +LIB3OBJFILES= \ $(SLO)$/cfg_reghelper.obj \ $(SLO)$/cfgstrings.obj -LIB5OBJFILES= \ +LIB4OBJFILES= \ $(SLO)$/sdbtstrings.obj # --- Targets ---------------------------------- diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx index f2a68576894f..3b45fef52c6b 100644 --- a/dbaccess/source/shared/sdbtstrings.cxx +++ b/dbaccess/source/shared/sdbtstrings.cxx @@ -34,5 +34,5 @@ namespace sdbtools { - #include "stringconstants.cxx" + #include "stringconstants.inc" } diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx index d7a014abdfa1..ef20c2c6d114 100644 --- a/dbaccess/source/shared/xmlstrings.cxx +++ b/dbaccess/source/shared/xmlstrings.cxx @@ -34,6 +34,6 @@ namespace dbaxml { -#include "stringconstants.cxx" +#include "stringconstants.inc" } diff --git a/dbaccess/util/dba.pmk b/dbaccess/util/dba.pmk new file mode 100644 index 000000000000..75b986ccd272 --- /dev/null +++ b/dbaccess/util/dba.pmk @@ -0,0 +1,33 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: $ +# +# $Revision: $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +VISIBILITY_HIDDEN = TRUE +CDEFS += -DOOO_DLLIMPLEMENTATION_DBA diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index af5ee5e9ba38..e56c7911fe3a 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/util/makefile.mk @@ -51,8 +51,7 @@ LIB1FILES=\ $(SLB)$/api.lib \ $(SLB)$/dataaccess.lib \ $(SLB)$/misc.lib \ - $(SLB)$/core_resource.lib \ - $(SLB)$/dbashared.lib + $(SLB)$/core_resource.lib SHL1TARGET=$(TARGET)$(DLLPOSTFIX) diff --git a/dbaccess/util/makefile.pmk b/dbaccess/util/makefile.pmk index 4a85ec9bca65..bc196833c408 100644 --- a/dbaccess/util/makefile.pmk +++ b/dbaccess/util/makefile.pmk @@ -32,16 +32,4 @@ # define DBACCESS_DLLIMPLEMENTATION (see @ dbaccessdllapi.h) CDEFS += -DDBACCESS_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 - +VISIBILITY_HIDDEN=TRUE diff --git a/reportdesign/util/dll.pmk b/reportdesign/util/dll.pmk index 92aaffb550cc..583b009b6d74 100644 --- a/reportdesign/util/dll.pmk +++ b/reportdesign/util/dll.pmk @@ -32,16 +32,4 @@ # define REPORTDESIGN_DLLIMPLEMENTATION (see @ dllapi.h) CDEFS += -DREPORTDESIGN_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 - +VISIBILITY_HIDDEN=TRUE |