From c70fea3b9d73b10fbc51b42b2f47ca415093dc74 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 30 May 2008 05:49:18 +0000 Subject: [PATCH] INTEGRATION: CWS sjfixes05 (1.46.26); FILE MERGED 2008/05/22 19:10:37 sj 1.46.26.2: fixed warnings 2008/05/22 19:03:46 sj 1.46.26.1: fixed export problem if proportional linespacing is below 100 --- sd/source/filter/eppt/eppt.hxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 7b89c1896a8e..19a7eafadcfe 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: eppt.hxx,v $ - * $Revision: 1.47 $ + * $Revision: 1.48 $ * * This file is part of OpenOffice.org. * @@ -814,7 +814,11 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj ); void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj ); void ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance, - TextRuleEntry* pTextRule, SvStream& rExtBu ); + TextRuleEntry* pTextRule, SvStream& rExtBu, EscherPropertyContainer* ); + void ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt ); + void ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& ); + void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill ); + void ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& rSolver, PageType ePageType,