diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-11-22 20:18:34 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-11-22 21:02:13 +0530 |
| commit | e36d227ee584aa07fa48dda7710ac6b7a850fcc3 (patch) | |
| tree | 45270cccab3ac91f0d2eaf9c3593eab5054c6679 | |
| parent | 8eafec91be723cbe5342899863232e800e77d828 (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.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 9e0fbc076e73..c3b495ae45fe 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5122,11 +5122,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 ) |