INTEGRATION: CWS sjfixes05 (1.62.26); FILE MERGED

2008/05/22 19:03:46 sj 1.62.26.1: fixed export problem if proportional linespacing is below 100
This commit is contained in:
Oliver Bolte 2008-05-30 05:48:19 +00:00
parent e5e03dbec6
commit 0d06011242

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: eppt.cxx,v $ * $RCSfile: eppt.cxx,v $
* $Revision: 1.62 $ * $Revision: 1.63 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -612,7 +612,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
SvMemoryStream aExtBu( 0x200, 0x200 ); SvMemoryStream aExtBu( 0x200, 0x200 );
if ( !mbEmptyPresObj ) if ( !mbEmptyPresObj )
ImplGetText(); ImplGetText();
ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pRule, aExtBu ); ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pRule, aExtBu, NULL );
ImplWriteExtParaHeader( aExtBu, nPObjects++, nTextType, i + 0x100 ); ImplWriteExtParaHeader( aExtBu, nPObjects++, nTextType, i + 0x100 );
maTextRuleList.Insert( (void*)pRule, LIST_APPEND ); maTextRuleList.Insert( (void*)pRule, LIST_APPEND );
if ( rLayout.bSecOutlinerPossible ) if ( rLayout.bSecOutlinerPossible )
@ -626,7 +626,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
SvMemoryStream aTmpStrm( 0x200, 0x200 ); SvMemoryStream aTmpStrm( 0x200, 0x200 );
if ( !mbEmptyPresObj ) if ( !mbEmptyPresObj )
ImplGetText(); ImplGetText();
ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pTempRule, aTmpStrm ); ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pTempRule, aTmpStrm, NULL );
ImplWriteExtParaHeader( aTmpStrm, nPObjects++, nTextType, i + 0x100 ); ImplWriteExtParaHeader( aTmpStrm, nPObjects++, nTextType, i + 0x100 );
maTextRuleList.Insert( (void*)pTempRule, LIST_APPEND ); maTextRuleList.Insert( (void*)pTempRule, LIST_APPEND );
} }
@ -644,7 +644,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
SvMemoryStream aExtBu( 0x200, 0x200 ); SvMemoryStream aExtBu( 0x200, 0x200 );
if ( !mbEmptyPresObj ) if ( !mbEmptyPresObj )
ImplGetText(); ImplGetText();
ImplWriteTextStyleAtom( *mpStrm, EPP_TEXTTYPE_Title, nPObjects, pRule, aExtBu ); ImplWriteTextStyleAtom( *mpStrm, EPP_TEXTTYPE_Title, nPObjects, pRule, aExtBu, NULL );
ImplWriteExtParaHeader( aExtBu, nPObjects++, EPP_TEXTTYPE_Title, i + 0x100 ); ImplWriteExtParaHeader( aExtBu, nPObjects++, EPP_TEXTTYPE_Title, i + 0x100 );
maTextRuleList.Insert( (void*)pRule, LIST_APPEND ); maTextRuleList.Insert( (void*)pRule, LIST_APPEND );
} }