diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-10-25 21:02:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-28 18:09:02 +0000 |
| commit | 9e716494a8f7a1ffbfd519ffc388df0226f4046f (patch) | |
| tree | 99e4fdb269c6d0ea2d8082b88fabc59713062b28 /dbaccess | |
| parent | 1d1bab408421030cb260d67a519d478db87bdff5 (diff) | |
fix some VS 2010 specific issues
Change-Id: Iae27a96c1e2ed72d2744fcbe100d6ada7dc41c82
Reviewed-on: https://gerrit.libreoffice.org/914
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/api/KeySet.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/core/api/OptimisticSet.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/migrationengine.cxx | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 6a520cf49fe1..2fa7eeafddd6 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -291,7 +291,8 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra variable to be set - m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL)))); + OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)); + m_aKeyMap.insert(OKeySetMatrix::value_type(0, keySetValue)); m_aKeyIter = m_aKeyMap.begin(); ::rtl::OUStringBuffer aFilter = createKeyFilter(); @@ -876,7 +877,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >(m_pKeyColumnNames->size()); copyRowValue(_rInsertRow,aKeyRow,aKeyIter->first + 1); - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(1,NULL)))).first; + m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(1,(Reference<XRow>)NULL)))).first; // now we set the bookmark for this row (_rInsertRow->get())[0] = makeAny((sal_Int32)m_aKeyIter->first); tryRefetch(_rInsertRow,bRefetch); @@ -1466,7 +1467,7 @@ sal_Bool OKeySet::fetchRow() const SelectColumnDescription& rColDesc = aPosIter->second; aIter->fill(rColDesc.nPosition, rColDesc.nType, m_xRow); } - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(0,NULL)))).first; + m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)))).first; } else m_bRowCountFinal = sal_True; diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 17dc208cb6cf..a814950817ef 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -131,7 +131,8 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra variable to be set - m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL)))); + OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)); + m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue)); m_aKeyIter = m_aKeyMap.begin(); ::rtl::OUStringBuffer aFilter = createKeyFilter(); @@ -503,7 +504,8 @@ void OptimisticSet::reset(const Reference< XResultSet>& _xDriverSet) OCacheSet::construct(_xDriverSet,::rtl::OUString()); m_bRowCountFinal = sal_False; m_aKeyMap.clear(); - m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL)))); + OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)); + m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue)); m_aKeyIter = m_aKeyMap.begin(); } diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 3139e2004498..54d7156520fb 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -69,6 +69,7 @@ #include <rtl/logfile.hxx> #include <rtl/digest.h> #include <algorithm> +#include <iterator> using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 3524b6ac271e..cd17f77b3e4d 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -71,6 +71,7 @@ #include <vector> #include <set> +#include <iterator> #define DEFAULT_DOC_PROGRESS_RANGE 100000 |