diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 13:16:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 13:16:37 +0000 |
| commit | a3b319399a30cca8fd7af2b85be469ac9c53712a (patch) | |
| tree | bd9a853876c2a7e21434ae9db41217f19b2683cf /svx | |
| parent | 43daaf713c7de7335ef7d4328c93c041f82d4899 (diff) | |
INTEGRATION: CWS sj09 (1.122.34); FILE MERGED
2004/10/11 21:26:25 sj 1.122.34.3: RESYNC: (1.122-1.123); FILE MERGED
2004/09/16 13:12:03 sj 1.122.34.2: AutoGrowSize has been removed
2004/09/09 17:13:12 sj 1.122.34.1: added initial version of characterstyle atom interpreter
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdfppt.cxx | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx index 367906896ab4..3d8ef4520631 100644 --- a/svx/source/svdraw/svdfppt.cxx +++ b/svx/source/svdraw/svdfppt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdfppt.cxx,v $ * - * $Revision: 1.124 $ + * $Revision: 1.125 $ * - * last change: $Author: hr $ $Date: 2004-10-12 10:19:17 $ + * last change: $Author: hr $ $Date: 2004-10-12 14:16:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1320,7 +1320,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi else { pTObj->SetMergedItem( SdrTextWordWrapItem( bWordWrap ) ); - pTObj->SetMergedItem( SdrTextAutoGrowSizeItem( bFitShapeToText ) ); + pTObj->SetMergedItem( SdrTextAutoGrowHeightItem( bFitShapeToText ) ); } pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) ); @@ -1698,6 +1698,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam ) : ReadFontCollection(); // reading TxPF, TxSI + PPTTextCharacterStyleAtomInterpreter aTxCFStyle; // SJ: ToDo, this atom needs to be interpreted, it contains character default styles for standard objects (instance4) PPTTextParagraphStyleAtomInterpreter aTxPFStyle; PPTTextSpecInfoAtomInterpreter aTxSIStyle; // styles (default language setting ... ) @@ -1842,7 +1843,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam ) : if ( aTxSIStyle.bValid && aTxSIStyle.aList.Count() ) aTxSI = *( ( (PPTTextSpecInfo*)aTxSIStyle.aList.GetObject( 0 ) ) ); - pE->pStyleSheet = new PPTStyleSheet( aSlideHd, rStCtrl, *this, aTxPFStyle, aTxSI ); + pE->pStyleSheet = new PPTStyleSheet( aSlideHd, rStCtrl, *this, aTxCFStyle, aTxPFStyle, aTxSI ); pDefaultSheet = pE->pStyleSheet; } if ( SeekToRec( rStCtrl, PPT_PST_ColorSchemeAtom, aSlideHd.GetRecEndFilePos() ) ) @@ -4231,7 +4232,9 @@ void PPTParaSheet::Read( SdrPowerPointImport& rManager, SvStream& rIn, sal_Bool } PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, SdrPowerPointImport& rManager, - const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle, const PPTTextSpecInfo& rTextSpecInfo ) : + const PPTTextCharacterStyleAtomInterpreter& rTxCFStyle, const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle, + const PPTTextSpecInfo& rTextSpecInfo ) : + maTxSI ( rTextSpecInfo ), PPTNumberFormatCreator ( new PPTExtParaProv( rManager, rIn, &rSlideHd ) ) { @@ -4828,6 +4831,33 @@ PPTTextRulerInterpreter::~PPTTextRulerInterpreter() } //////////////////////////////////////////////////////////////////////////////////////////////////// + +PPTTextCharacterStyleAtomInterpreter::PPTTextCharacterStyleAtomInterpreter() : + nFlags1 ( 0 ), + nFlags2 ( 0 ), + nFlags3 ( 0 ) +{ +} + +sal_Bool PPTTextCharacterStyleAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd ) +{ + rRecHd.SeekToContent( rIn ); + + rIn >> nFlags1 + >> nFlags2 + >> nFlags3 + >> n1 + >> nFontHeight + >> nFontColor; + + return sal_True; +} + +PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter() +{ +} + +//////////////////////////////////////////////////////////////////////////////////////////////////// PPTTextParagraphStyleAtomInterpreter::PPTTextParagraphStyleAtomInterpreter() : bValid ( sal_False ), bForbiddenRules ( sal_False ), |