summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-07-31 11:23:54 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-07-31 11:23:54 +0000
commitd56994ff3cb3cada585a016b24e197df04b300ae (patch)
tree05e77ceca1f543b6ee4d0d7cc2083e50a2e8a7fb /xmloff
parent2792f3d9750382a9f713a36ac3203a36ac376f52 (diff)
#i10000#: (merge error): proper initialization of xDataProvider
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 2702ec94e9..82a8973408 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -665,7 +665,10 @@ void SchXMLSeries2Context::EndElement()
}
}
- Reference< chart2::data::XDataProvider > xDataProvider( mrImportHelper.GetDataProvider( mxNewDoc ));
+ Reference< chart2::data::XDataProvider > xDataProvider;
+ if ( mxNewDoc.is() ) {
+ xDataProvider = mxNewDoc->getDataProvider();
+ }
for( std::vector< DomainInfo >::reverse_iterator aIt( aDomainInfos.rbegin() ); aIt!= aDomainInfos.rend(); ++aIt )
{
DomainInfo aDomainInfo( *aIt );