summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
authorsushil_shinde <sushil.shinde@synerzip.com>2013-12-27 14:36:10 +0530
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-02-12 02:36:41 +0000
commit5505cf4f1c7b27662b0e8c0a6db01fd8c52243c3 (patch)
tree4b16153374b03d2d33509b9b26f0ea0e369d5156 /oox/source/drawingml
parent1779d2a3dde60cf705702fcb132bba46aa38fc5b (diff)
fdo#72520 : Preserving external data path in chart import.
- Preserved external data path for chart in newly added property for external data. Change-Id: I3c49093c9e71cd126c097500b3951a345e81039e Reviewed-on: https://gerrit.libreoffice.org/7214 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx7
-rw-r--r--oox/source/drawingml/chart/chartspacefragment.cxx6
2 files changed, 12 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index db0421585aac..d6b09a44845e 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -212,6 +212,13 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
aProps.setProperty( PROP_DisableDataTableDialog , true );
aProps.setProperty( PROP_DisableComplexChartTypes , true );
}
+
+ if(!mrModel.maSheetPath.isEmpty() )
+ {
+ Reference< ::com::sun::star::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY );
+ PropertySet aProps( xChartDoc->getDiagram() );
+ aProps.setProperty( PROP_ExternalData , uno::makeAny(mrModel.maSheetPath) );
+ }
}
// ============================================================================
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index 2e717a8a9ec5..03389f00ebdc 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -36,7 +36,8 @@ using namespace ::oox::core;
// ============================================================================
ChartSpaceFragment::ChartSpaceFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, ChartSpaceModel& rModel ) :
- FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel )
+ FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel ),
+ mpFilterBase(rFilter)
{
}
@@ -74,6 +75,9 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
case C_TOKEN( pivotSource ):
mrModel.mbPivotChart = true;
return 0;
+ case C_TOKEN (externalData):
+ mrModel.maSheetPath = getFragmentPathFromRelId(rAttribs.getString(R_TOKEN(id),OUString()));
+ return 0;
}
break;