filter/source/msfilter/svdfppt.cxx | 15 +++++++++++++++
1 file changed, 15 insertions(+)
New commits:
commit e36d227ee584aa07fa48dda7710ac6b7a850fcc3
Author: Muthu Subramanian <sumu...@suse.com>
Date: Thu Nov 22 20:18:34 2012 +0530
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.
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 9e0fbc0..c3b495a 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
