summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2019-08-29 11:08:04 +0200
committerXisco Faulí <xiscofauli@libreoffice.org>2019-09-02 10:33:38 +0200
commit55dbf08740ffefd6dd08d4bcea0638a15117dc65 (patch)
tree1ef755a28f371a339511afba7b6dbb9a1b5d1ab6 /oox
parent6c6f459f32144d06385bd542944f24afef0240eb (diff)
tdf#103988 OOXML export: fix bubble chart MSO interoperability
Write <c:bubble3D val="0"/> into each <CT_BubbleSer> OOXML element to allow file opening in MSO without removing the (previously "corrupted") bubble chart. Change-Id: Idf31a0d3d8f98a3be4c9a3b29e65d4d4c582be53 Reviewed-on: https://gerrit.libreoffice.org/78259 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 5b97e75589523b3769ec87e27854e2c841d0d79f) Reviewed-on: https://gerrit.libreoffice.org/78378 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/chartexport.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 8b41e216dede..4f2e9c61846a 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1476,8 +1476,6 @@ void ChartExport::exportBubbleChart( const Reference< chart2::XChartType >& xCha
bool bPrimaryAxes = true;
exportAllSeries(xChartType, bPrimaryAxes);
- pFS->singleElement(FSNS(XML_c, XML_bubble3D), XML_val, "0");
-
exportAxesId(bPrimaryAxes);
pFS->endElement( FSNS( XML_c, XML_bubbleChart ) );
@@ -2029,6 +2027,10 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType,
|| eChartType == chart::TYPEID_LINE )
exportSmooth();
+ // tdf103988: "corrupted" files with Bubble chart opening in MSO
+ if( eChartType == chart::TYPEID_BUBBLE )
+ pFS->singleElement(FSNS(XML_c, XML_bubble3D), XML_val, "0");
+
pFS->endElement( FSNS( XML_c, XML_ser ) );
}
}