[Libreoffice-commits] .: accessibility/source chart2/source connectivity/source dbaccess/source extensions/source filter/source oox/source sc/source sw/source xmlhelp/source xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Oct 28 11:09:26 PDT 2012
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 2 -
chart2/source/inc/CloneHelper.hxx | 1
chart2/source/model/main/BaseCoordinateSystem.cxx | 1
chart2/source/tools/ImplOPropertySet.cxx | 1
chart2/source/tools/InternalData.cxx | 1
chart2/source/tools/PropertyHelper.cxx | 1
connectivity/source/commontools/TSortIndex.cxx | 3 +-
connectivity/source/commontools/TTableHelper.cxx | 2 +
connectivity/source/commontools/dbtools.cxx | 1
connectivity/source/manager/mdrivermanager.cxx | 1
connectivity/source/parse/sqliterator.cxx | 3 ++
dbaccess/source/core/api/KeySet.cxx | 7 +++--
dbaccess/source/core/api/OptimisticSet.cxx | 6 +++-
dbaccess/source/core/dataaccess/datasource.cxx | 1
dbaccess/source/ext/macromigration/migrationengine.cxx | 1
extensions/source/ole/oleobjw.cxx | 3 ++
extensions/source/ole/servprov.cxx | 3 ++
extensions/source/ole/servreg.cxx | 4 +++
extensions/source/ole/unoobjw.cxx | 4 +++
filter/source/svg/svgreader.cxx | 2 -
oox/source/export/SchXMLSeriesHelper.hxx | 1
sc/source/core/tool/chartpos.cxx | 2 -
sc/source/ui/view/viewdata.cxx | 4 +--
sw/source/core/doc/doc.cxx | 2 -
sw/source/core/txtnode/thints.cxx | 4 +--
sw/source/core/unocore/unoportenum.cxx | 2 -
xmlhelp/source/cxxhelp/provider/databases.cxx | 8 +++---
xmloff/source/chart/SchXMLExport.cxx | 13 ++++++----
xmloff/source/chart/SchXMLSeriesHelper.hxx | 1
29 files changed, 62 insertions(+), 23 deletions(-)
New commits:
commit 9e716494a8f7a1ffbfd519ffc388df0226f4046f
Author: David Ostrovsky <david at ostrovsky.org>
Date: Thu Oct 25 21:02:50 2012 +0200
fix some VS 2010 specific issues
Change-Id: Iae27a96c1e2ed72d2744fcbe100d6ada7dc41c82
Reviewed-on: https://gerrit.libreoffice.org/914
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index a1dd5ab..cd95a11 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -213,7 +213,7 @@ namespace accessibility
{
ENSURE_OR_RETURN_VOID( i_nPosition <= m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" );
(void)i_pPanel;
- m_aChildren.insert( m_aChildren.begin() + i_nPosition, NULL );
+ m_aChildren.insert( m_aChildren.begin() + i_nPosition, (Reference< XAccessible >)NULL );
m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny( getAccessiblePanelItem( i_nPosition ) ) );
}
diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx
index f15b808..c19ce8b 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -24,6 +24,7 @@
#include <map>
#include <functional>
#include <algorithm>
+#include <iterator>
namespace chart
{
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 27b4644..cb937f2 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/chart2/AxisType.hpp>
#include <algorithm>
+#include <iterator>
#if OSL_DEBUG_LEVEL > 1
#include <rtl/math.hxx>
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index b9b0c8e..db2031d 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -21,6 +21,7 @@
#include "CloneHelper.hxx"
#include <algorithm>
+#include <iterator>
#include <functional>
#include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 169ef04..a607064 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -25,6 +25,7 @@
#include <rtl/math.hxx>
#include <algorithm>
+#include <iterator>
using ::com::sun::star::uno::Sequence;
using ::rtl::OUString;
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index fbaee8f..c333832 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -25,6 +25,7 @@
#include <vector>
#include <algorithm>
+#include <iterator>
#include <functional>
using namespace ::com::sun::star;
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index a0fc738..a9d5bc5 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -19,6 +19,7 @@
#include "TSortIndex.hxx"
#include <algorithm>
+#include <iterator>
#include <o3tl/compat_functional.hxx>
@@ -107,7 +108,7 @@ void OSortIndex::AddKeyValue(OKeyValue * pKeyValue)
OSL_ENSURE(pKeyValue,"Can not be null here!");
if(m_bFrozen)
{
- m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),NULL));
+ m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),(OKeyValue *)NULL));
delete pKeyValue;
}
else
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index cec9e48..6a5ad87 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -36,6 +36,8 @@
#include <o3tl/compat_functional.hxx>
+#include <iterator>
+
using namespace ::comphelper;
using namespace connectivity;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 2afd001..6c758f8 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -81,6 +81,7 @@
#include "connectivity/OSubComponent.hxx"
#include <algorithm>
+#include <iterator>
using namespace ::comphelper;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 743d38a..7f2d8fb 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -35,6 +35,7 @@
#include <osl/diagnose.h>
#include <algorithm>
+#include <iterator>
#include <o3tl/compat_functional.hxx>
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index f30aca2..5ee583e 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -40,6 +40,9 @@
#include "diagnose_ex.h"
#include <rtl/logfile.hxx>
+
+#include <iterator>
+
using namespace ::comphelper;
using namespace ::connectivity;
using namespace ::connectivity::sdbcx;
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 6a520cf..2fa7eea 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 17dc208..a814950 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 3139e20..54d7156 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 3524b6a..cd17f77 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
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index f77cfcc..2ce5e9f 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -26,6 +26,9 @@
*
************************************************************************/
+// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010
+#define _WIN32_WINNT 0x0403
+
#include "ole2uno.hxx"
#include "rtl/ustrbuf.hxx"
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index c133405..86e1a00 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -26,6 +26,9 @@
*
************************************************************************/
+// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010
+#define _WIN32_WINNT 0x0403
+
#include <vector>
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 9cd793f..7559919 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -26,6 +26,10 @@
*
************************************************************************/
+// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010
+#define _WIN32_WINNT 0x0403
+
+
#include <rtl/unload.h>
#include <osl/time.h>
#include "ole2uno.hxx"
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index df9675c..4b4785a 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -27,6 +27,10 @@
************************************************************************/
+// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010
+#define _WIN32_WINNT 0x403
+
+
#include "ole2uno.hxx"
#include <stdio.h>
#include <tools/presys.h>
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 147f3f3..ecbc844 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1168,7 +1168,7 @@ struct AnnotatingVisitor
const ARGBColor& rInheritColor,
const Gradient& rInheritGradient )
{
- std::pair<const char*,const char*> aPaintUri(NULL,NULL);
+ std::pair<const char*,const char*> aPaintUri((const char*)NULL,(const char*)NULL);
std::pair<ARGBColor,bool> aColor(maCurrState.maCurrentColor,
false);
if( strcmp(sValue,"none") == 0 )
diff --git a/oox/source/export/SchXMLSeriesHelper.hxx b/oox/source/export/SchXMLSeriesHelper.hxx
index 2f0af36..08e8770 100644
--- a/oox/source/export/SchXMLSeriesHelper.hxx
+++ b/oox/source/export/SchXMLSeriesHelper.hxx
@@ -28,6 +28,7 @@
#include <vector>
#include <map>
+#include <iterator>
class SchXMLSeriesHelper
{
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index 48169c3..35b6b91 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 667f726..dd91f58 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 );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 2cf0fe9..bfdfca2 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1632,7 +1632,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
// just one page is special ...
if ( 1 == aVec.size() )
- aVec.insert( aVec.begin() + 1, 0 ); // insert a second empty page
+ aVec.insert( aVec.begin() + 1, (SwPageFrm *)0 ); // insert a second empty page
else
{
// now extend the number of pages to fit a multiple of 4
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 947ed83..8d179e3 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2122,7 +2122,7 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_uInt16 nLength,
{
// insert dummy span covering the gap
o_rSpanMap.insert(AttrSpanMap_t::value_type(
- AttrSpan_t(nLastEnd, aSpan.first), 0));
+ AttrSpan_t(nLastEnd, aSpan.first), (const SwTxtAttr *)0));
}
nLastEnd = aSpan.second;
@@ -2133,7 +2133,7 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_uInt16 nLength,
if (nLastEnd != nLength && nLength != 0)
{
o_rSpanMap.insert(
- AttrSpanMap_t::value_type(AttrSpan_t(nLastEnd, nLength), 0));
+ AttrSpanMap_t::value_type(AttrSpan_t(nLastEnd, nLength), (const SwTxtAttr *)0));
}
}
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 86b60f6..f3e9ac9 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -1108,7 +1108,7 @@ lcl_CreatePortions(
lcl_FillSoftPageBreakArray(*pUnoCrsr, SoftPageBreaks);
PortionStack_t PortionStack;
- PortionStack.push( PortionList_t(&i_rPortions, 0) );
+ PortionStack.push( PortionList_t(&i_rPortions, (const SwTxtAttr *)0) );
bool bAtEnd( false );
while (!bAtEnd) // every iteration consumes at least current character!
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 1d3ca70..fb84af3 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -441,7 +441,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Module;
std::pair< ModInfoTable::iterator,bool > aPair =
- m_aModInfo.insert( ModInfoTable::value_type( key,0 ) );
+ m_aModInfo.insert( ModInfoTable::value_type( key,(StaticModuleInformation*)0 ) );
ModInfoTable::iterator it = aPair.first;
@@ -593,7 +593,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
key = *pExtensionPath + Language + dbFileName; // make unique, don't change language
std::pair< DatabasesTable::iterator,bool > aPair =
- m_aDatabases.insert( DatabasesTable::value_type( key,0 ) );
+ m_aDatabases.insert( DatabasesTable::value_type( key,(Db*)0 ) );
DatabasesTable::iterator it = aPair.first;
@@ -642,7 +642,7 @@ Databases::getCollator( const rtl::OUString& Language,
osl::MutexGuard aGuard( m_aMutex );
CollatorTable::iterator it =
- m_aCollatorTable.insert( CollatorTable::value_type( key,0 ) ).first;
+ m_aCollatorTable.insert( CollatorTable::value_type( key,(Reference< XCollator >)0 ) ).first;
if( ! it->second.is() )
{
@@ -883,7 +883,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Database;
std::pair< KeywordInfoTable::iterator,bool > aPair =
- m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,0 ) );
+ m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,(KeywordInfo*)0 ) );
KeywordInfoTable::iterator it = aPair.first;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 68f2d04..c73e4d0 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -795,7 +795,9 @@ void lcl_ReorderInternalSequencesAccordingToTheirRangeName(
// fill empty columns
for( ; nIndex < aIt->first; ++nIndex )
rInOutSequences.push_back(
- SchXMLExportHelper_Impl::tDataSequenceCont::value_type( 0, 0 ));
+ SchXMLExportHelper_Impl::tDataSequenceCont::value_type(
+ (uno::Reference< chart2::data::XDataSequence >)0,
+ (uno::Reference< chart2::data::XDataSequence >)0 ));
OSL_ASSERT( nIndex == aIt->first );
rInOutSequences.push_back( aIt->second );
}
@@ -2896,7 +2898,8 @@ void SchXMLExportHelper_Impl::exportSeries(
{
Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
if( lcl_exportDomainForThisSequence( xValues, aFirstXDomainRange, mrExport ) )
- m_aDataSequencesToExport.push_back( tLabelValuesDataPair( 0, xValues ));
+ m_aDataSequencesToExport.push_back( tLabelValuesDataPair(
+ (uno::Reference< chart2::data::XDataSequence >)0, xValues ));
}
else if( nSeriesIdx==0 )
{
@@ -2911,7 +2914,8 @@ void SchXMLExportHelper_Impl::exportSeries(
}
}
if( xYValuesForBubbleChart.is() )
- m_aDataSequencesToExport.push_back( tLabelValuesDataPair( 0, xYValuesForBubbleChart ));
+ m_aDataSequencesToExport.push_back( tLabelValuesDataPair(
+ (uno::Reference< chart2::data::XDataSequence >)0, xYValuesForBubbleChart ));
}
}
@@ -3171,7 +3175,8 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe
}
}
- m_aDataSequencesToExport.push_back( tLabelValuesDataPair( 0, *aIt ));
+ m_aDataSequencesToExport.push_back( tLabelValuesDataPair(
+ (uno::Reference< chart2::data::XDataSequence >)0, *aIt ));
}
}
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/source/chart/SchXMLSeriesHelper.hxx
index 90fa620..d343e67 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.hxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.hxx
@@ -36,6 +36,7 @@
#include <vector>
#include <map>
+#include <iterator>
class SchXMLSeriesHelper
{
More information about the Libreoffice-commits
mailing list