summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2012-11-22 20:18:34 +0530
committerMuthu Subramanian <sumuthu@suse.com>2013-01-28 21:04:26 +0530
commit0a61d2f56aabceb0f506baf066e37744a993e380 (patch)
tree712441cb39b868899870d49d0397571c0bae8167
parent0f23430b41791ae1f168644ca7914511d8c3ab6b (diff)
n#782833: (PPT) Fix font size at end of para.
Font size at the end of the para when there is a new(empty) line is set using an extra charprops definition.
-rw-r--r--filter/source/msfilter/svdfppt.cxx15
1 files changed, 15 insertions, 0 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index dfe44003ab08..f6eb87a6b59e 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5134,11 +5134,26 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
PPTCharPropSet aCharPropSet( nCurrentPara );
if ( bTextPropAtom )
+ {
+ if( nCharAnzRead == ( nStringLen - 1 ) && aString.GetChar( nCharAnzRead ) == '\r' )
+ {
+ /* n#782833: Seems like the new line character at end of the para
+ * has two char properties and we would need to use the next one.
+ */
+ PPTCharPropSet aDummyCharPropSet( nCurrentPara );
+ ReadCharProps( rIn, aDummyCharPropSet, aString, nCharCount, nCharAnzRead,
+ bTextPropAtom, nExtParaPos, aStyleTextProp9, nExtParaFlags,
+ nBuBlip, nHasAnm, nAnmScheme );
+ bEmptyParaPossible = true;
+ }
ReadCharProps( rIn, aCharPropSet, aString, nCharCount, nCharAnzRead,
bTextPropAtom, nExtParaPos, aStyleTextProp9, nExtParaFlags,
nBuBlip, nHasAnm, nAnmScheme );
+ }
else
+ {
nCharCount = nStringLen;
+ }
sal_uInt32 nLen;
while( nCharCount )