Kaydet (Commit) 2022c84d authored tarafından David Tardon's avatar David Tardon

fdo#65123 Revert "n#782833: (PPT) Fix font size at end of para."

This reverts commit e36d227e.

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
üst c930edb2
...@@ -5206,26 +5206,11 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con ...@@ -5206,26 +5206,11 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
PPTCharPropSet aCharPropSet( nCurrentPara ); PPTCharPropSet aCharPropSet( nCurrentPara );
if ( bTextPropAtom ) 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, ReadCharProps( rIn, aCharPropSet, aString, nCharCount, nCharAnzRead,
bTextPropAtom, nExtParaPos, aStyleTextProp9, nExtParaFlags, bTextPropAtom, nExtParaPos, aStyleTextProp9, nExtParaFlags,
nBuBlip, nHasAnm, nAnmScheme ); nBuBlip, nHasAnm, nAnmScheme );
}
else else
{
nCharCount = nStringLen; nCharCount = nStringLen;
}
sal_uInt32 nLen; sal_uInt32 nLen;
while( nCharCount ) while( nCharCount )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment