summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2012-08-14 17:43:54 +0530
committerMuthu Subramanian <sumuthu@suse.com>2012-08-14 17:47:03 +0530
commitb8b054785b9718f0ec08f92b0c53cac7a497b189 (patch)
tree91eb3948ff46963dd30cac7550170d04c05699db /oox
parented011e491bc9c4ca5ea90851bb81384eb0b47537 (diff)
n#759180: Override properties with endParaPr.
This is done only for empty textruns.
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/textparagraph.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index 163b79ca7aff..a47a5d57f4d4 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -92,8 +92,13 @@ void TextParagraph::insertAt(
{
for( TextRunVector::const_iterator aIt = maRuns.begin(), aEnd = maRuns.end(); aIt != aEnd; ++aIt )
{
+ sal_Int32 nLen = (*aIt)->getText().getLength();
+ // n#759180: Force use, maEndProperties for the last segment
+ // This is currently applied to only empty runs
+ if( !nLen && ( ( aIt + 1 ) == aEnd ) )
+ (*aIt)->getTextCharacterProperties().assignUsed( maEndProperties );
nCharHeight = std::max< sal_Int32 >( nCharHeight, (*aIt)->insertAt( rFilterBase, xText, xAt, aTextCharacterStyle ) );
- nParagraphSize += (*aIt)->getText().getLength();
+ nParagraphSize += nLen;
}
}
xAt->gotoEnd( sal_True );