summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2018-11-01 17:37:21 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-11-08 12:27:24 +0100
commita1ea94fde40b82d0ec7ec842bf44cdeeea676aca (patch)
tree6b1f178c343f0b128c3085f0e05559c56894510a /oox/source
parent821c9fd85bf49ddab9968c7f1787a265c02d1f01 (diff)
tdf#121205: Convert <a:br> to newline chars in chart title
Change-Id: I43d14025c48878c5bc035d492623f4fc52426e5e Reviewed-on: https://gerrit.libreoffice.org/62752 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 57d4cd80dcaf01fe4897d79d89e906d355410243) Reviewed-on: https://gerrit.libreoffice.org/62990 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/drawingml/chart/titleconverter.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index daa1f2d8cb57..a4bb1ec70944 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -85,7 +85,7 @@ Sequence< Reference< XFormattedString > > TextConverter::createStringSequence(
for( TextRunVector::const_iterator aRIt = rTextPara.getRuns().begin(), aREnd = rTextPara.getRuns().end(); aRIt != aREnd; ++aRIt )
{
const TextRun& rTextRun = **aRIt;
- bool bAddNewLine = (aRIt + 1 == aREnd) && (aPIt + 1 != aPEnd);
+ bool bAddNewLine = ((aRIt + 1 == aREnd) && (aPIt + 1 != aPEnd)) || rTextRun.isLineBreak();
Reference< XFormattedString > xFmtStr = appendFormattedString( aStringVec, rTextRun.getText(), bAddNewLine );
PropertySet aPropSet( xFmtStr );
TextCharacterProperties aRunProps( rParaProps );