summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2020-02-06 23:54:26 +0100
committerLászló Németh <nemeth@numbertext.org>2020-02-13 09:54:40 +0100
commit176e06c116db09cae5781522461390da87632953 (patch)
tree5095b3d892dd63f2a6f1eda6435cf97f67925444 /oox
parentdcf6fd8bb66cddbd54ec3f019ea606d2c99d9e08 (diff)
tdf#119138 Show custom chart title if autoTitleDeleted is missing
autoTitleDeleted might be omitted by generators other than Excel while providing custom title. mbAutoTitleDel is set only based on the attribute value and the default also varies on whether MSO 2007 or newer is the generator, see tdf#78080 ECMA-376 Part 1 at 21.2.2.7 says: A value of 1 or true specifies that the property is applied. This is the default value for this attribute, and is implied when the parent element is present, but this attribute is omitted. Change-Id: If3457fe850e13ae8af207bb9beceecc9e887b797 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88151 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index ade046ef08e8..9ea5d8a6c97f 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -176,7 +176,10 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
}
// chart title
- if( !mrModel.mbAutoTitleDel ) try
+ /* tdf#119138 autoTitleDeleted might be omitted by generators other than Excel
+ while providing custom title. mbAutoTitleDel is set only based on the attribute value
+ and the default also varies on whether MSO 2007 or newer is the generator, see tdf#78080 */
+ if( !mrModel.mbAutoTitleDel || mrModel.mxTitle.is() ) try
{
/* If the title model is missing, but the chart shows exactly one
series, the series title is shown as chart title. */