Attachment #78635 for issue #120233

View | Details | Raw Unified | Return to issue 120233
Collapse All | Expand All

Lines 764-769 Link Here

(-)filter/inc/filter/msfilter/svdfppt.hxx (+1 lines)
764		764
765	void Read( SdrPowerPointImport& rMan, SvStream& rIn, sal_Bool bMasterStyle,	765	void Read( SdrPowerPointImport& rMan, SvStream& rIn, sal_Bool bMasterStyle,
766	sal_uInt32 nLevel, sal_Bool bFirst );	766	sal_uInt32 nLevel, sal_Bool bFirst );
		767	void UpdateBulletRelSize( sal_uInt32 nLevel, sal_uInt16 nFontHeight );
767	};	768	};
768		769
769	////////////////////////////////////////////////////////////////////////////////////////////////////	770	////////////////////////////////////////////////////////////////////////////////////////////////////




	}
}

void PPTParaSheet::UpdateBulletRelSize(  sal_uInt32 nLevel, sal_uInt16 nFontHeight )
{
	if ( maParaLevel[ nLevel ].mnBulletHeight > 0x7fff ) // a negative value is the absolute bullet height
	{
		sal_Int16  nBulletRelSize = ( sal_Int16 )maParaLevel[ nLevel ].mnBulletHeight;
		nBulletRelSize = nFontHeight ? ((-nBulletRelSize) * 100 ) / nFontHeight : 100;
		if ( nBulletRelSize < 0 ) //bullet size over flow
			nBulletRelSize = 100; 
		maParaLevel[ nLevel ].mnBulletHeight = nBulletRelSize;
	}
}

PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, SdrPowerPointImport& rManager,
                                const PPTTextCharacterStyleAtomInterpreter& /*rTxCFStyle*/, const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle,
									const PPTTextSpecInfo& rTextSpecInfo ) :

                        }
                    }
					mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );
					mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize(  nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
					bFirst = sal_False;
					nLev++;
				}

				}
				mpParaSheet[ nInstance ]->Read( rManager, rIn, sal_True, nLev, bFirst );
				mpCharSheet[ nInstance ]->Read( rIn, sal_True, nLev, bFirst );
				mpParaSheet[ nInstance ]->UpdateBulletRelSize(  nLev, mpCharSheet[ nInstance ]->maCharLevel[ nLev ].mnFontHeight );
				bFirst = sal_False;
				nLev++;
			}

                            }
                        }
						mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );
						mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize(  nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
						bFirst = sal_False;
						nLev++;
					}

Return to issue 120233

Lines 4268-4273 Link Here

(-)filter/source/msfilter/svdfppt.cxx (+15 lines)
4268	}	4268	}
4269	}	4269	}
4270		4270
		4271	void PPTParaSheet::UpdateBulletRelSize( sal_uInt32 nLevel, sal_uInt16 nFontHeight )
		4272	{
		4273	if ( maParaLevel[ nLevel ].mnBulletHeight > 0x7fff ) // a negative value is the absolute bullet height
		4274	{
		4275	sal_Int16 nBulletRelSize = ( sal_Int16 )maParaLevel[ nLevel ].mnBulletHeight;
		4276	nBulletRelSize = nFontHeight ? ((-nBulletRelSize) * 100 ) / nFontHeight : 100;
		4277	if ( nBulletRelSize < 0 ) //bullet size over flow
		4278	nBulletRelSize = 100;
		4279	maParaLevel[ nLevel ].mnBulletHeight = nBulletRelSize;
		4280	}
		4281	}
		4282
4271	PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, SdrPowerPointImport& rManager,	4283	PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, SdrPowerPointImport& rManager,
4272	const PPTTextCharacterStyleAtomInterpreter& /rTxCFStyle/, const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle,	4284	const PPTTextCharacterStyleAtomInterpreter& /rTxCFStyle/, const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle,
4273	const PPTTextSpecInfo& rTextSpecInfo ) :	4285	const PPTTextSpecInfo& rTextSpecInfo ) :
Lines 4338-4343 Link Here
4338	}	4350	}
4339	}	4351	}
4340	mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );	4352	mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );
		4353	mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize( nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
4341	bFirst = sal_False;	4354	bFirst = sal_False;
4342	nLev++;	4355	nLev++;
4343	}	4356	}
Lines 4426-4431 Link Here
4426	}	4439	}
4427	mpParaSheet[ nInstance ]->Read( rManager, rIn, sal_True, nLev, bFirst );	4440	mpParaSheet[ nInstance ]->Read( rManager, rIn, sal_True, nLev, bFirst );
4428	mpCharSheet[ nInstance ]->Read( rIn, sal_True, nLev, bFirst );	4441	mpCharSheet[ nInstance ]->Read( rIn, sal_True, nLev, bFirst );
		4442	mpParaSheet[ nInstance ]->UpdateBulletRelSize( nLev, mpCharSheet[ nInstance ]->maCharLevel[ nLev ].mnFontHeight );
4429	bFirst = sal_False;	4443	bFirst = sal_False;
4430	nLev++;	4444	nLev++;
4431	}	4445	}
Lines 4523-4528 Link Here
4523	}	4537	}
4524	}	4538	}
4525	mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );	4539	mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );
		4540	mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize( nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
4526	bFirst = sal_False;	4541	bFirst = sal_False;
4527	nLev++;	4542	nLev++;
4528	}	4543	}