From 2022c84d1e7e88e65243c6dfd1a62ec17f1361a1 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 26 Jun 2013 14:24:18 +0200 Subject: fdo#65123 Revert "n#782833: (PPT) Fix font size at end of para." This reverts commit e36d227ee584aa07fa48dda7710ac6b7a850fcc3. The description in the orig. commit: "Font size at the end of the para when there is a new(empty) line is set using an extra charprops definition." That would mean the extra StyleTextPropAtom record does not have a record header, which seems pretty fishy. I suspect the real problem is somewhere else (or the ppt is broken). But I cannot check it, because I cannot access the bug. Conflicts: filter/source/msfilter/svdfppt.cxx Change-Id: I1d555cd2905ef8f297d1a96f56bebbea8f83ad62 --- filter/source/msfilter/svdfppt.cxx | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'filter') diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 5e28dfa48d61..2e37372e7438 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5206,26 +5206,11 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con PPTCharPropSet aCharPropSet( nCurrentPara ); if ( bTextPropAtom ) - { - if( nCharAnzRead == ( nStringLen - 1 ) && aString[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 ) -- cgit