diff options
| author | Ocke Janssen <oj@openoffice.org> | 2010-03-26 10:44:45 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2010-03-26 10:44:45 +0000 |
| commit | 06571ad7e8c2df5fdfe3d4401d3144db5faa09ec (patch) | |
| tree | 7f8dbbfcfdfc4c4e35223e259ecfa4649c935e80 | |
| parent | 60bd0627776f7f19f993feb4facd946c96b869f0 (diff) | |
compile fixes
| -rw-r--r-- | dbaccess/source/core/api/KeySet.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 343726cbe..581af61c8 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -478,9 +478,9 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O xAnalyzer->setFilter(aFilter.makeStringAndClear()); if ( bFilterSet ) { - Sequence< Sequence< PropertyValue > > aFilter = xAnalyzer->getStructuredFilter(); - const Sequence< PropertyValue >* pOr = aFilter.getConstArray(); - const Sequence< PropertyValue >* pOrEnd = pOr + aFilter.getLength(); + Sequence< Sequence< PropertyValue > > aFilter2 = xAnalyzer->getStructuredFilter(); + const Sequence< PropertyValue >* pOr = aFilter2.getConstArray(); + const Sequence< PropertyValue >* pOrEnd = pOr + aFilter2.getLength(); for(;pOr != pOrEnd;++pOr) { const PropertyValue* pAnd = pOr->getConstArray(); @@ -824,7 +824,6 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi sal_Int32 j = 1; sal_Bool bModified = sal_False; bool bRefetch = true; - Reference <XRow> xRow; for(;aIter != aEnd;++aIter,++j) { if((_rInsertRow->get())[aIter->second.nPosition].isModified()) @@ -974,8 +973,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(1,NULL)))).first; if ( !bRefetch ) { - xRow = new OPrivateRow(_rInsertRow->get()); - m_aKeyIter->second.second.second = xRow; + m_aKeyIter->second.second.second = new OPrivateRow(_rInsertRow->get()); } // now we set the bookmark for this row |