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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/core/tool/chartpos.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/viewdata.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index 48169c331191..35b6b9115c1a 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -470,7 +470,7 @@ void ScChartPositioner::CreatePositionMap() { sal_uLong nKey = it1->first; for (ColumnMap::const_iterator it2 = ++pCols->begin(); it2 != pCols->end(); ++it2 ) - it2->second->insert( RowMap::value_type( nKey, NULL )); // no data + it2->second->insert( RowMap::value_type( nKey, (ScAddress *)NULL )); // no data } } } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 667f726d191a..dd91f588c443 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -461,7 +461,7 @@ void ScViewData::InsertTab( SCTAB nTab ) if( nTab >= static_cast<SCTAB>(maTabData.size())) maTabData.resize(nTab+1, NULL); else - maTabData.insert( maTabData.begin() + nTab, NULL ); + maTabData.insert( maTabData.begin() + nTab, (ScViewDataTable *)NULL ); CreateTabData( nTab ); UpdateCurrentTab(); @@ -524,7 +524,7 @@ void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab ) if ( maTabData[nSrcTab] ) maTabData.insert(maTabData.begin() + nDestTab, new ScViewDataTable( *maTabData[nSrcTab] )); else - maTabData.insert(maTabData.begin() + nDestTab, NULL); + maTabData.insert(maTabData.begin() + nDestTab, (ScViewDataTable *)NULL); UpdateCurrentTab(); mpMarkData->InsertTab( nDestTab ); |