diff options
Diffstat (limited to 'sd/source/filter')
35 files changed, 1196 insertions, 1196 deletions
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index dc03cd6b3829..3a303e15246e 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,16 +45,16 @@ // - Defines - // ----------- -#define CGM_IMPORT_CGM 0x00000001 -#define CGM_IMPORT_IM 0x00000002 +#define CGM_IMPORT_CGM 0x00000001 +#define CGM_IMPORT_IM 0x00000002 -#define CGM_EXPORT_IMPRESS 0x00000100 -#define CGM_EXPORT_META 0x00000200 -#define CGM_EXPORT_COMMENT 0x00000400 +#define CGM_EXPORT_IMPRESS 0x00000100 +#define CGM_EXPORT_META 0x00000200 +#define CGM_EXPORT_COMMENT 0x00000400 -#define CGM_NO_PAD_BYTE 0x00010000 -#define CGM_BIG_ENDIAN 0x00020000 -#define CGM_LITTLE_ENDIAN 0x00040000 +#define CGM_NO_PAD_BYTE 0x00010000 +#define CGM_BIG_ENDIAN 0x00020000 +#define CGM_LITTLE_ENDIAN 0x00040000 // -------------- // - Namespaces - @@ -91,26 +91,26 @@ SdCGMFilter::~SdCGMFilter() sal_Bool SdCGMFilter::Import() { ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; if( pLibrary && mxModel.is() ) { - ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); - ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - UINT32 nRetValue; + ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); + ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + UINT32 nRetValue; if( mrDocument.GetPageCount() == 0L ) mrDocument.CreateFirstPages(); CreateStatusIndicator(); nRetValue = FncImportCGM( aFileURL, mxModel, CGM_IMPORT_CGM | CGM_BIG_ENDIAN | CGM_EXPORT_IMPRESS, mxStatusIndicator ); - + if( nRetValue ) { bRet = TRUE; - - if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white - { // so we must not set a master page + + if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white + { // so we must not set a master page mrDocument.StopWorkStartupDelay(); SdPage* pSdPage = mrDocument.GetMasterSdPage(0, PK_STANDARD); @@ -135,7 +135,7 @@ sal_Bool SdCGMFilter::Import() sal_Bool SdCGMFilter::Export() { ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; if( pLibrary && mxModel.is() ) { diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx index 7b5f2d17a9b8..a06de1456adc 100644 --- a/sd/source/filter/eppt/epptdef.hxx +++ b/sd/source/filter/eppt/epptdef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <tools/solar.h> -#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record +#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record // header takes on this value, the // record header marks the start of // a container. @@ -55,7 +55,7 @@ #define EPP_Notes 1008 #define EPP_NotesAtom 1009 #define EPP_Environment 1010 -#define EPP_SlidePersistAtom 1011 //0x03F3 +#define EPP_SlidePersistAtom 1011 //0x03F3 #define EPP_Scheme 1012 #define EPP_SchemeAtom 1013 #define EPP_DocViewInfo 1014 @@ -101,8 +101,8 @@ #define EPP_ColorSchemeAtom 2032 // these atoms first was seen in ppt2000 in a private Tag atom -#define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041 -#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic +#define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041 +#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic #define EPP_OEShape 3008 #define EPP_ExObjRefAtom 3009 @@ -129,13 +129,13 @@ #define EPP_DefaultRulerAtom 4011 // these atoms first was seen in ppt2000 in a private Tag atom -#define EPP_PST_ExtendedParagraphAtom 4012 -#define EPP_PST_ExtendedParagraphMasterAtom 4013 -#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, -#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj +#define EPP_PST_ExtendedParagraphAtom 4012 +#define EPP_PST_ExtendedParagraphMasterAtom 4013 +#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, +#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj // the first UINT32 in this atom indices the current slideId -#define EPP_FontEnityAtom 4023 +#define EPP_FontEnityAtom 4023 #define EPP_FontEmbedData 4024 #define EPP_TypeFace 4025 #define EPP_CString 4026 @@ -177,7 +177,7 @@ #define EPP_ExSubscriptionSection 4077 #define EPP_ExControl 4078 #define EPP_ExControlAtom 4091 -#define EPP_SlideListWithText 4080 // 0x0FF0 +#define EPP_SlideListWithText 4080 // 0x0FF0 #define EPP_AnimationInfoAtom 4081 #define EPP_InteractiveInfo 4082 #define EPP_InteractiveInfoAtom 4083 @@ -212,54 +212,54 @@ #define EPP_GscalingAtom 10001 #define EPP_GrColorAtom 10002 #define EPP_GLPointAtom 10003 -#define EPP_Comment10 12000 -#define EPP_CommentAtom10 12001 +#define EPP_Comment10 12000 +#define EPP_CommentAtom10 12001 -#define EPP_PLACEHOLDER_NONE 0 // 0 None -#define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title -#define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body -#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title -#define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle -#define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image -#define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image -#define EPP_PLACEHOLDER_MASTERDATE 7 // 6 Master date -#define EPP_PLACEHOLDER_MASTERSLIDENUMBER 8 // 7 Master slide number -#define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer -#define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header -#define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object -#define EPP_PLACEHOLDER_TITLE 13 // 12 Title -#define EPP_PLACEHOLDER_BODY 14 // 13 Body -#define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body -#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title -#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle -#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title -#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body -#define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image -#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size) -#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph -#define EPP_PLACEHOLDER_TABLE 21 // 22 Table -#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art -#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart -#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip +#define EPP_PLACEHOLDER_NONE 0 // 0 None +#define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title +#define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body +#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title +#define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle +#define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image +#define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image +#define EPP_PLACEHOLDER_MASTERDATE 7 // 6 Master date +#define EPP_PLACEHOLDER_MASTERSLIDENUMBER 8 // 7 Master slide number +#define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer +#define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header +#define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object +#define EPP_PLACEHOLDER_TITLE 13 // 12 Title +#define EPP_PLACEHOLDER_BODY 14 // 13 Body +#define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body +#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title +#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle +#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title +#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body +#define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image +#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size) +#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph +#define EPP_PLACEHOLDER_TABLE 21 // 22 Table +#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art +#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart +#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip -#define EPP_TEXTTYPE_Title 0 -#define EPP_TEXTTYPE_Body 1 -#define EPP_TEXTTYPE_Notes 2 -#define EPP_TEXTTYPE_notUsed 3 -#define EPP_TEXTTYPE_Other 4 // ( Text in a shape ) -#define EPP_TEXTTYPE_CenterBody 5 // ( subtitle in title slide ) -#define EPP_TEXTTYPE_CenterTitle 6 // ( title in title slide ) -#define EPP_TEXTTYPE_HalfBody 7 // ( body in two-column slide ) -#define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide ) +#define EPP_TEXTTYPE_Title 0 +#define EPP_TEXTTYPE_Body 1 +#define EPP_TEXTTYPE_Notes 2 +#define EPP_TEXTTYPE_notUsed 3 +#define EPP_TEXTTYPE_Other 4 // ( Text in a shape ) +#define EPP_TEXTTYPE_CenterBody 5 // ( subtitle in title slide ) +#define EPP_TEXTTYPE_CenterTitle 6 // ( title in title slide ) +#define EPP_TEXTTYPE_HalfBody 7 // ( body in two-column slide ) +#define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide ) -#define EPP_SLIDESIZE_TYPEONSCREEN 0 -#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1 -#define EPP_SLIDESIZE_TYPEA4PAPER 2 -#define EPP_SLIDESIZE_TYPE35MM 3 -#define EPP_SLIDESIZE_TYPEOVERHEAD 4 -#define EPP_SLIDESIZE_TYPEBANNER 5 -#define EPP_SLIDESIZE_TYPECUSTOM 6 +#define EPP_SLIDESIZE_TYPEONSCREEN 0 +#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1 +#define EPP_SLIDESIZE_TYPEA4PAPER 2 +#define EPP_SLIDESIZE_TYPE35MM 3 +#define EPP_SLIDESIZE_TYPEOVERHEAD 4 +#define EPP_SLIDESIZE_TYPEBANNER 5 +#define EPP_SLIDESIZE_TYPECUSTOM 6 #endif diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 55f143ee9849..df9e4b6795e1 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -3442,7 +3442,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplFlipBoundingBox( aPropOpt ); aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); - if ( GetCurrentGroupLevel() > 0 ) + if ( GetCurrentGroupLevel() > 0 ) mpPptEscherEx->AddChildAnchor( maRect ); else mpPptEscherEx->AddClientAnchor( maRect ); @@ -3515,7 +3515,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); - if ( GetCurrentGroupLevel() > 0 ) + if ( GetCurrentGroupLevel() > 0 ) mpPptEscherEx->AddChildAnchor( maRect ); else mpPptEscherEx->AddClientAnchor( maRect ); @@ -3665,7 +3665,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aPropOpt.CreateShapeProperties( rXShape ); aPropOpt.Commit( *mpStrm ); aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp ); - if ( GetCurrentGroupLevel() > 0 ) + if ( GetCurrentGroupLevel() > 0 ) mpPptEscherEx->AddChildAnchor( maRect ); else mpPptEscherEx->AddClientAnchor( maRect ); diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index c40cf5043038..f6db4e1ea4e3 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -39,7 +39,7 @@ PptEscherEx::PptEscherEx( SvStream& rOutStrm ) : EscherEx( EscherExGlobalRef( new EscherExGlobal ), rOutStrm ) { - mnCurrentDg = 0; + mnCurrentDg = 0; } // --------------------------------------------------------------------------------------------- @@ -52,7 +52,7 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize() void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt ) { UINT32 nSize = DrawingGroupContainerSize(); - rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup + rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup << (sal_uInt32)( nSize - 8 ); ImplWriteDggContainer( rSt ); @@ -107,18 +107,18 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt ) { rSt << (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) << (sal_uInt32)( nSize - 8 ) - << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800 - << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0 - << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010 - << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001 - << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008 - << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002; + << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800 + << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0 + << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010 + << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001 + << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008 + << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002; } } // --------------------------------------------------------------------------------------------- -#define ESCHER_SPLIT_MENU_COLORS_COUNT 4 +#define ESCHER_SPLIT_MENU_COLORS_COUNT 4 sal_uInt32 PptEscherEx::ImplSplitMenuColorsAtomSize() { @@ -167,8 +167,8 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance ) mnCurrentDg = mxGlobal->GenerateDrawingId(); AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg ); PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() ); - *mpOutStrm << (UINT32)0 // The number of shapes in this drawing - << (UINT32)0; // The last MSOSPID given to an SP in this DG + *mpOutStrm << (UINT32)0 // The number of shapes in this drawing + << (UINT32)0; // The last MSOSPID given to an SP in this DG } } break; @@ -258,17 +258,17 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie OpenContainer( ESCHER_SpContainer ); AddAtom( 16, ESCHER_Spgr, 1 ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden + *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden << (INT32)aRect.Top() << (INT32)aRect.Right() << (INT32)aRect.Bottom(); nShapeId = GenerateShapeId(); if ( !mnGroupLevel ) - AddShape( ESCHER_ShpInst_Min, 5, nShapeId ); // Flags: Group | Patriarch + AddShape( ESCHER_ShpInst_Min, 5, nShapeId ); // Flags: Group | Patriarch else { - AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor + AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor if ( mnGroupLevel == 1 ) { AddAtom( 8, ESCHER_ClientAnchor ); @@ -296,7 +296,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie mpOutStrm->Write( pClientData->GetData(), nSize ); } } - CloseContainer(); // ESCHER_SpContainer + CloseContainer(); // ESCHER_SpContainer } mnGroupLevel++; return nShapeId; diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 4589ea8f5c6c..f646195d13cf 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -49,27 +49,27 @@ enum PPT_TextHeader class PptEscherEx : public EscherEx { - sal_uInt32 ImplDggContainerSize(); - void ImplWriteDggContainer( SvStream& rSt ); + sal_uInt32 ImplDggContainerSize(); + void ImplWriteDggContainer( SvStream& rSt ); - sal_uInt32 ImplOptAtomSize(); - void ImplWriteOptAtom( SvStream& rSt ); + sal_uInt32 ImplOptAtomSize(); + void ImplWriteOptAtom( SvStream& rSt ); - sal_uInt32 ImplSplitMenuColorsAtomSize(); - void ImplWriteSplitMenuColorsAtom( SvStream& rSt ); + sal_uInt32 ImplSplitMenuColorsAtomSize(); + void ImplWriteSplitMenuColorsAtom( SvStream& rSt ); public: PptEscherEx( SvStream& rOut ); ~PptEscherEx(); - void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 ); - void CloseContainer(); + void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 ); + void CloseContainer(); sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData ); - UINT32 DrawingGroupContainerSize(); - void WriteDrawingGroupContainer( SvStream& rSt ); + UINT32 DrawingGroupContainerSize(); + void WriteDrawingGroupContainer( SvStream& rSt ); using EscherEx::EnterGroup; }; diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 23381d6ae002..9ce1c572ec1e 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -1809,7 +1809,7 @@ Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, s void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any aAny, const sal_Bool bCreate2b01Atom ) { - sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph + sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph sal_Int32 begin = -1; sal_Int32 end = -1; sal_Bool bParagraphTarget; diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 448f3c9f7ef1..8459d2b3dc8e 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ class SdPage; class SvStream; namespace ppt -{ +{ struct AfterEffectNode { @@ -86,7 +86,7 @@ class AnimationExporter void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode eTranslateMode ); - + // if available exportAnimPropertySet returns the ::com::sun::star::presentation::EffectNodeType sal_Int16 exportAnimPropertySet( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimNode( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 159e3e53d362..62122df0d172 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ namespace ppt { ExSoundEntry::ExSoundEntry( const String& rString ) -: nFileSize( 0 ) -, aSoundURL( rString ) +: nFileSize( 0 ) +, aSoundURL( rString ) { try { diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index 5881bbff3150..d3fa349a64a1 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,42 +39,42 @@ #include <list> namespace ppt -{ +{ class ExSoundEntry { - sal_uInt32 nFileSize; - String aSoundURL; + sal_uInt32 nFileSize; + String aSoundURL; - String ImplGetName() const; - String ImplGetExtension() const; + String ImplGetName() const; + String ImplGetExtension() const; public : - - sal_Bool IsSameURL( const String& rURL ) const; - sal_uInt32 GetFileSize( ) const { return nFileSize; }; + + sal_Bool IsSameURL( const String& rURL ) const; + sal_uInt32 GetFileSize( ) const { return nFileSize; }; ExSoundEntry( const String& rSoundURL ); // returns the size of a complete SoundContainer - sal_uInt32 GetSize( sal_uInt32 nId ) const; - void Write( SvStream& rSt, sal_uInt32 nId ); + sal_uInt32 GetSize( sal_uInt32 nId ) const; + void Write( SvStream& rSt, sal_uInt32 nId ); }; class ExSoundCollection : private List { - const ExSoundEntry* ImplGetByIndex( sal_uInt32 nId ) const; + const ExSoundEntry* ImplGetByIndex( sal_uInt32 nId ) const; public: ExSoundCollection() {} ~ExSoundCollection(); - sal_uInt32 GetId( const String& ); + sal_uInt32 GetId( const String& ); // returns the size of a complete SoundCollectionContainer - sal_uInt32 GetSize() const; - void Write( SvStream& rSt ); + sal_uInt32 GetSize() const; + void Write( SvStream& rSt ); }; } // namespace ppt diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 0a1d1d5f47cc..fecf13d87586 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun: USHORT GetErrorCode() const { return nFilterError; }; - virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& ) + virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& ) throw( com::sun::star::uno::RuntimeException ); }; @@ -210,13 +210,13 @@ sal_Bool SdGRFFilter::Import() const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); const USHORT nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; // ggf. Filterdialog ausfuehren if ( !pGraphicFilter->HasImportDialog( nFilter ) || pGraphicFilter->DoImportDialog( NULL, nFilter ) ) { - SvStream* pIStm = mrMedium.GetInStream(); - USHORT nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; + SvStream* pIStm = mrMedium.GetInStream(); + USHORT nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; if( nReturn ) HandleGraphicFilterError( nReturn, pGraphicFilter->GetLastError().nStreamError ); @@ -225,10 +225,10 @@ sal_Bool SdGRFFilter::Import() if( mrDocument.GetPageCount() == 0L ) mrDocument.CreateFirstPages(); - SdPage* pPage = mrDocument.GetSdPage( 0, PK_STANDARD ); - Point aPos; - Size aPagSize( pPage->GetSize() ); - Size aGrfSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), + SdPage* pPage = mrDocument.GetSdPage( 0, PK_STANDARD ); + Point aPos; + Size aPagSize( pPage->GetSize() ); + Size aGrfSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MAP_100TH_MM ) ); aPagSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); @@ -238,8 +238,8 @@ sal_Bool SdGRFFilter::Import() if ( ( ( aGrfSize.Height() > aPagSize.Height() ) || ( aGrfSize.Width() > aPagSize.Width() ) ) && aGrfSize.Height() && aPagSize.Height() ) { - double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); - double fWinWH = (double) aPagSize.Width() / aPagSize.Height(); + double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); + double fWinWH = (double) aPagSize.Width() / aPagSize.Height(); // Grafik an Pagesize anpassen (skaliert) if( fGrfWH < fWinWH ) @@ -286,8 +286,8 @@ sal_Bool SdGRFFilter::Export() ( xComponent, uno::UNO_QUERY ); if ( xExporter.is() && xFilter.is() ) { - SdPage* pPage = NULL; - sd::DrawViewShell* pDrawViewShell = static_cast< ::sd::DrawViewShell* > + SdPage* pPage = NULL; + sd::DrawViewShell* pDrawViewShell = static_cast< ::sd::DrawViewShell* > ( ( ( mrDocShell.GetViewShell() && mrDocShell.GetViewShell()->ISA(::sd::DrawViewShell ) ) ? mrDocShell.GetViewShell() : NULL ) ); PageKind ePageKind = PK_STANDARD; @@ -326,8 +326,8 @@ sal_Bool SdGRFFilter::Export() rtl::OUString sFilterName( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); rtl::OUString sShortName( pGraphicFilter->GetExportFormatShortName( nFilter ) ); - sal_Bool bFilterNameFound = sal_False; - sal_Int32 i, nCount; + sal_Bool bFilterNameFound = sal_False; + sal_Int32 i, nCount; for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ ) { rtl::OUString& rStr = aArgs[ i ].Name; @@ -455,7 +455,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su } } // Fallthrough! -// case ::com::sun::star::graphic::GraphicType::EMPTY: +// case ::com::sun::star::graphic::GraphicType::EMPTY: default: aMimeType = OUString::createFromAscii( "image/png" ); break; diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 468a5f07fd8c..c754c8d05550 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,8 +144,8 @@ Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceName // ----------------------------------------------------------------------------- SdHtmlOptionsDialog::SdHtmlOptionsDialog( const Reference< XMultiServiceFactory > & xMgr ) : - mrxMgr ( xMgr ), - meDocType ( DOCUMENT_TYPE_DRAW ) + mrxMgr ( xMgr ), + meDocType ( DOCUMENT_TYPE_DRAW ) { } diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index cd47b0e21af7..cd531949d2cf 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx index bf7a90c431b6..babfe24c3513 100644 --- a/sd/source/filter/html/buttonset.hxx +++ b/sd/source/filter/html/buttonset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ public: ~ButtonSet(); int getCount() const; - + bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 0e3fdd0cba8c..2b33d280186e 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index e3f001758b45..97b215e79b87 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,16 +36,16 @@ class SdHtmlAttrPreview : public Control { protected: - Color m_aBackColor, m_aTextColor, m_aLinkColor; + Color m_aBackColor, m_aTextColor, m_aLinkColor; Color m_aVLinkColor, m_aALinkColor; public: SdHtmlAttrPreview( Window* pParent, const ResId& rResId ); ~SdHtmlAttrPreview(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); - void SetColors( Color& aBack, Color& aText, Color& aLink, + void SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ); }; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index ec10650bfed8..149b869c09b9 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; -#define KEY_QUALITY "JPG-EXPORT-QUALITY" +#define KEY_QUALITY "JPG-EXPORT-QUALITY" // Parameter aus Itemset abfragen @@ -128,21 +128,21 @@ const char *pButtonNames[NUM_BUTTONS] = "collapse.png", }; -#define BTN_FIRST_0 0 -#define BTN_FIRST_1 1 -#define BTN_PREV_0 2 -#define BTN_PREV_1 3 -#define BTN_NEXT_0 4 -#define BTN_NEXT_1 5 -#define BTN_LAST_0 6 -#define BTN_LAST_1 7 -#define BTN_INDEX 8 -#define BTN_TEXT 9 -#define BTN_MORE 10 -#define BTN_LESS 11 +#define BTN_FIRST_0 0 +#define BTN_FIRST_1 1 +#define BTN_PREV_0 2 +#define BTN_PREV_1 3 +#define BTN_NEXT_0 4 +#define BTN_NEXT_1 5 +#define BTN_LAST_0 6 +#define BTN_LAST_1 7 +#define BTN_INDEX 8 +#define BTN_TEXT 9 +#define BTN_MORE 10 +#define BTN_LESS 11 // Fuer Detectfilter -#define CALC_OPTIONS "9,34,SYSTEM" +#define CALC_OPTIONS "9,34,SYSTEM" // ********************************************************************* // Hilfsklasse fuer das simple erzeugen von Dateien lokal/remote @@ -150,9 +150,9 @@ const char *pButtonNames[NUM_BUTTONS] = class EasyFile { private: - SvStream* pOStm; - SfxMedium* pMedium; - bool bOpen; + SvStream* pOStm; + SfxMedium* pMedium; + bool bOpen; public: @@ -380,7 +380,7 @@ HtmlExport::HtmlExport( const Sequence< PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ) - : maPath( aPath ), + : maPath( aPath ), mpDoc(pExpDoc), mpDocSh( pDocShell ), meEC(NULL), @@ -677,7 +677,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams INetURLObject aINetURLObj( maPath ); DBG_ASSERT( aINetURLObj.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' + maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' maIndex = aINetURLObj.GetLastName(); mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); @@ -1060,9 +1060,9 @@ bool HtmlExport::CreateImagesForPresPages() // ===================================================================== SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); - SdrObject* pObject = NULL; - SdrTextObj* pResult = NULL; + ULONG nObjectCount = pPage->GetObjCount(); + SdrObject* pObject = NULL; + SdrTextObj* pResult = NULL; for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { @@ -1107,7 +1107,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() if( mbDocColors ) { SetDocColors( pPage ); -// maBackColor = pPage->GetPageBackgroundColor(); +// maBackColor = pPage->GetPageBackgroundColor(); } // HTML Kopf @@ -1640,12 +1640,12 @@ bool HtmlExport::CreateHtmlForPresPages() for (ULONG nObject = 0; nObject < nClickableObjectCount; nObject++) { SdrObject* pObject = (SdrObject*)aClickableObjects.GetObject(nObject); - SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject); - SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject); + SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject); + SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject); Rectangle aRect(pObject->GetCurrentBoundRect()); - Point aLogPos(aRect.TopLeft()); - bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); + Point aLogPos(aRect.TopLeft()); + bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); ULONG nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(); @@ -1691,7 +1691,7 @@ bool HtmlExport::CreateHtmlForPresPages() } if (nPgNum != SDRPAGE_NOTFOUND) { - nPgNum = (nPgNum - 1) / 2; // SdrPageNum --> SdPageNum + nPgNum = (nPgNum - 1) / 2; // SdrPageNum --> SdPageNum aURL = CreatePageURL(nPgNum); } @@ -1756,14 +1756,14 @@ bool HtmlExport::CreateHtmlForPresPages() \************************************************************/ if( pInfo ) { - String aHRef; + String aHRef; presentation::ClickAction eClickAction = pInfo->meClickAction; switch( eClickAction ) { case presentation::ClickAction_BOOKMARK: { - BOOL bIsMasterPage; + BOOL bIsMasterPage; USHORT nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); SdrObject* pObj = NULL; @@ -2106,7 +2106,7 @@ void HtmlExport::CreateFileNames() mpPageNames = new String*[mnSdPageCount]; mpTextFiles = new String*[mnSdPageCount]; - mbHeader = false; // Ueberschrift auf Uebersichtsseite? + mbHeader = false; // Ueberschrift auf Uebersichtsseite? for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { @@ -2501,7 +2501,7 @@ bool HtmlExport::CreateNavBarFrames() if(mnButtonThema != -1) aButton = CreateImage(GetButtonName(BTN_TEXT), aButton); - String aText0( RTL_CONSTASCII_USTRINGPARAM("text0")); + String aText0( RTL_CONSTASCII_USTRINGPARAM("text0")); aText0 += maHTMLExtension; aStr += CreateLink( aText0, aButton, String(RTL_CONSTASCII_USTRINGPARAM("_top"))); aStr.AppendAscii( "\r\n" ); @@ -2634,7 +2634,7 @@ String HtmlExport::CreateNavBar( USHORT nSdPage, bool bIsText ) const // to Previous page if(nSdPage > 0) aStr += CreateLink( bIsText?*mpTextFiles[nSdPage-1]: - *mpHTMLFiles[nSdPage-1], aStrNavPrev); + *mpHTMLFiles[nSdPage-1], aStrNavPrev); else aStr += aStrNavPrev; aStr.Append(sal_Unicode(' ')); @@ -2835,7 +2835,7 @@ String HtmlExport::CreateHTMLCircleArea( ULONG nRadius, String HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPolygon, Size aShift, double fFactor, const String& rHRef ) const { - String aStr; + String aStr; const sal_uInt32 nNoOfPolygons(rPolyPolygon.count()); for ( sal_uInt32 nXPoly = 0L; nXPoly < nNoOfPolygons; nXPoly++ ) @@ -2923,16 +2923,16 @@ String HtmlExport::CreatePageURL( USHORT nPgNum ) bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix /* = false */ ) { - INetURLObject aURL( SvtPathOptions().GetConfigPath() ); - String aScript; + INetURLObject aURL( SvtPathOptions().GetConfigPath() ); + String aScript; aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM("webcast") ) ); aURL.Append( rSource ); meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource ); - ULONG nErr = 0; - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); + ULONG nErr = 0; + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); if( pIStm ) { @@ -3098,8 +3098,8 @@ String HtmlExport::InsertSound( const String& rSoundFile ) if( rSoundFile.Len() == 0 ) return rSoundFile; - String aStr( RTL_CONSTASCII_USTRINGPARAM("<embed src=\"") ); - INetURLObject aURL( rSoundFile ); + String aStr( RTL_CONSTASCII_USTRINGPARAM("<embed src=\"") ); + INetURLObject aURL( rSoundFile ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index fd5a30fa2f0c..61ed24f6061f 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ #define NUM_BUTTONS 12 -#define PUB_LOWRES_WIDTH 640 -#define PUB_LOWRES_HEIGHT 480 -#define PUB_MEDRES_WIDTH 800 -#define PUB_MEDRES_HEIGHT 600 -#define PUB_HIGHRES_WIDTH 1024 -#define PUB_HIGHRES_HEIGHT 768 +#define PUB_LOWRES_WIDTH 640 +#define PUB_LOWRES_HEIGHT 480 +#define PUB_MEDRES_WIDTH 800 +#define PUB_MEDRES_HEIGHT 600 +#define PUB_HIGHRES_WIDTH 1024 +#define PUB_HIGHRES_HEIGHT 768 #define HtmlButtonThemaStr = "private://gallery/hidden/HtmlExportButtons"; @@ -77,18 +77,18 @@ class View; class HtmlErrorContext : public ErrorContext { private: - USHORT mnResId; - String maURL1; - String maURL2; + USHORT mnResId; + String maURL1; + String maURL2; public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); + virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); - void SetContext( USHORT nResId, const String& rURL ); - void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); + void SetContext( USHORT nResId, const String& rURL ); + void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); }; // ===================================================================== @@ -132,13 +132,13 @@ class HtmlExport bool mbDownload; bool mbAutoSlide; - UINT32 mnSlideDuration; + UINT32 mnSlideDuration; bool mbSlideSound; bool mbHiddenSlides; bool mbEndless; - bool mbUserAttr; // die folgenden Farben werden fuer das <body> - Color maTextColor; // tag genutzt, wenn mbUserAttr true ist + bool mbUserAttr; // die folgenden Farben werden fuer das <body> + Color maTextColor; // tag genutzt, wenn mbUserAttr true ist Color maBackColor; Color maLinkColor; Color maVLinkColor; @@ -146,13 +146,13 @@ class HtmlExport Color maFirstPageColor; bool mbDocColors; - String maHTMLExtension; + String maHTMLExtension; String** mpHTMLFiles; String** mpImageFiles; String** mpPageNames; String** mpTextFiles; - String maExportPath; // Das Ausgabeverzeichnes bzw. die URL + String maExportPath; // Das Ausgabeverzeichnes bzw. die URL String maIndexUrl; String maURLPath; String maCGIPath; @@ -166,49 +166,49 @@ class HtmlExport void SetDocColors( SdPage* pPage = NULL ); - bool CreateImagesForPresPages(); - bool CreateHtmlTextForPresPages(); - bool CreateHtmlForPresPages(); - bool CreateContentPage(); - void CreateFileNames(); - bool CreateBitmaps(); - bool CreateOutlinePages(); - bool CreateFrames(); - bool CreateNotesPages(); - bool CreateNavBarFrames(); - - bool CreateASPScripts(); - bool CreatePERLScripts(); - bool CreateImageFileList(); - bool CreateImageNumberFile(); - - bool checkForExistingFiles(); - bool checkFileExists( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >& xFileAccess, String const & aFileName ); + bool CreateImagesForPresPages(); + bool CreateHtmlTextForPresPages(); + bool CreateHtmlForPresPages(); + bool CreateContentPage(); + void CreateFileNames(); + bool CreateBitmaps(); + bool CreateOutlinePages(); + bool CreateFrames(); + bool CreateNotesPages(); + bool CreateNavBarFrames(); + + bool CreateASPScripts(); + bool CreatePERLScripts(); + bool CreateImageFileList(); + bool CreateImageNumberFile(); + + bool checkForExistingFiles(); + bool checkFileExists( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >& xFileAccess, String const & aFileName ); String getDocumentTitle(); - bool SavePresentation(); + bool SavePresentation(); - String CreateLink( const String& aLink, const String& aText, + String CreateLink( const String& aLink, const String& aText, const String& aTarget = String()) const; - String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const; - String CreateNavBar( USHORT nSdPage, bool bIsText ) const; - String CreateBodyTag() const; + String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const; + String CreateNavBar( USHORT nSdPage, bool bIsText ) const; + String CreateBodyTag() const; - String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ); - String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ); + String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ); + String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ); - String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); - String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); + String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); + String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); + String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX, + String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX, ULONG nCenterY, const String& rHRef ) const; - String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const; - String CreateHTMLRectArea( const Rectangle& rRect, + String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const; + String CreateHTMLRectArea( const Rectangle& rRect, const String& rHRef ) const; - String CreatePageURL( USHORT nPgNum ); - + String CreatePageURL( USHORT nPgNum ); + String InsertSound( const String& rSoundFile ); bool CopyFile( const String& rSourceFile, const String& rDestPath ); bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false ); @@ -230,9 +230,9 @@ class HtmlExport HtmlExport( rtl::OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ); virtual ~HtmlExport(); - static String ColorToHTMLString( Color aColor ); - static String StringToHTMLString( const String& rString ); - static String StringToURL( const String& rURL ); + static String ColorToHTMLString( Color aColor ); + static String StringToHTMLString( const String& rString ); + static String StringToURL( const String& rURL ); }; #endif // _SD_HTMLEX_HXX diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 6c0e4de2d3f9..48a2f85ad5a0 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ extern void InterpolateFixedBitmap( FixedBitmap * pBitmap ); const UINT16 nMagic = (UINT16)0x1977; // Key fuer die soffice.ini -#define KEY_QUALITY "JPG-EXPORT-QUALITY" +#define KEY_QUALITY "JPG-EXPORT-QUALITY" // Die Help Ids der einzelnen Seiten ULONG aPageHelpIds[NOOFPAGES] = @@ -97,49 +97,49 @@ ULONG aPageHelpIds[NOOFPAGES] = class SdPublishingDesign { public: - String m_aDesignName; + String m_aDesignName; - HtmlPublishMode m_eMode; + HtmlPublishMode m_eMode; // special WebCast options PublishingScript m_eScript; - String m_aCGI; - String m_aURL; + String m_aCGI; + String m_aURL; // special Kiosk options - BOOL m_bAutoSlide; - UINT32 m_nSlideDuration; - BOOL m_bEndless; + BOOL m_bAutoSlide; + UINT32 m_nSlideDuration; + BOOL m_bEndless; // special HTML options - BOOL m_bContentPage; - BOOL m_bNotes; + BOOL m_bContentPage; + BOOL m_bNotes; // misc options - UINT16 m_nResolution; - String m_aCompression; + UINT16 m_nResolution; + String m_aCompression; PublishingFormat m_eFormat; - BOOL m_bSlideSound; + BOOL m_bSlideSound; BOOL m_bHiddenSlides; // titel page information - String m_aAuthor; - String m_aEMail; - String m_aWWW; - String m_aMisc; - BOOL m_bDownload; - BOOL m_bCreated; // not used + String m_aAuthor; + String m_aEMail; + String m_aWWW; + String m_aMisc; + BOOL m_bDownload; + BOOL m_bCreated; // not used // buttons and colorscheme - INT16 m_nButtonThema; - BOOL m_bUserAttr; - Color m_aBackColor; - Color m_aTextColor; + INT16 m_nButtonThema; + BOOL m_bUserAttr; + Color m_aBackColor; + Color m_aTextColor; Color m_aLinkColor; - Color m_aVLinkColor; - Color m_aALinkColor; - BOOL m_bUseAttribs; - BOOL m_bUseColor; + Color m_aVLinkColor; + Color m_aALinkColor; + BOOL m_bUseAttribs; + BOOL m_bUseColor; SdPublishingDesign(); @@ -159,7 +159,7 @@ SdPublishingDesign::SdPublishingDesign() m_eFormat = FORMAT_PNG; - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); FilterConfigItem aFilterConfigItem( aFilterConfigPath ); sal_Int32 nCompression = aFilterConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), 75 ); m_aCompression = UniString::CreateFromInt32( nCompression ); @@ -167,33 +167,33 @@ SdPublishingDesign::SdPublishingDesign() SvtUserOptions aUserOptions; - m_nResolution = PUB_LOWRES_WIDTH; + m_nResolution = PUB_LOWRES_WIDTH; m_aAuthor = aUserOptions.GetFirstName(); if( m_aAuthor.Len() && aUserOptions.GetLastName().getLength() ) - m_aAuthor += sal_Unicode(' '); + m_aAuthor += sal_Unicode(' '); m_aAuthor += (String)aUserOptions.GetLastName(); m_aEMail = aUserOptions.GetEmail(); - m_bDownload = FALSE; -//-/ m_bCreated = TRUE; - m_nButtonThema = -1; + m_bDownload = FALSE; +//-/ m_bCreated = TRUE; + m_nButtonThema = -1; - m_bUserAttr = FALSE; - m_bUseAttribs = TRUE; - m_bUseColor = TRUE; + m_bUserAttr = FALSE; + m_bUseAttribs = TRUE; + m_bUseColor = TRUE; m_aBackColor = COL_WHITE; m_aTextColor = COL_BLACK; m_aLinkColor = COL_BLUE; - m_aVLinkColor = COL_LIGHTBLUE; - m_aALinkColor = COL_GRAY; + m_aVLinkColor = COL_LIGHTBLUE; + m_aALinkColor = COL_GRAY; - m_eScript = SCRIPT_ASP; + m_eScript = SCRIPT_ASP; - m_bAutoSlide = TRUE; + m_bAutoSlide = TRUE; m_nSlideDuration = 15; - m_bEndless = TRUE; + m_bEndless = TRUE; - m_bSlideSound = TRUE; + m_bSlideSound = TRUE; m_bHiddenSlides = FALSE; } @@ -204,22 +204,22 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const { return ( - m_eMode == rDesign.m_eMode && + m_eMode == rDesign.m_eMode && m_nResolution == rDesign.m_nResolution && m_aCompression == rDesign.m_aCompression && - m_eFormat == rDesign.m_eFormat && + m_eFormat == rDesign.m_eFormat && m_bHiddenSlides == rDesign.m_bHiddenSlides && ( // compare html options (m_eMode != PUBLISH_HTML && m_eMode != PUBLISH_FRAMES) || ( m_bContentPage == rDesign.m_bContentPage && - m_bNotes == rDesign.m_bNotes && - m_aAuthor == rDesign.m_aAuthor && - m_aEMail == rDesign.m_aEMail && - m_aWWW == rDesign.m_aWWW && - m_aMisc == rDesign.m_aMisc && + m_bNotes == rDesign.m_bNotes && + m_aAuthor == rDesign.m_aAuthor && + m_aEMail == rDesign.m_aEMail && + m_aWWW == rDesign.m_aWWW && + m_aMisc == rDesign.m_aMisc && m_bDownload == rDesign.m_bDownload && -//-/ m_bCreated == rDesign.m_bCreated && +//-/ m_bCreated == rDesign.m_bCreated && m_nButtonThema == rDesign.m_nButtonThema && m_bUserAttr == rDesign.m_bUserAttr && m_aBackColor == rDesign.m_aBackColor && @@ -232,7 +232,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const m_bUseColor == rDesign.m_bUseColor ) ) && - ( // compare kiosk options + ( // compare kiosk options (m_eMode != PUBLISH_KIOSK) || ( m_bAutoSlide == rDesign.m_bAutoSlide && @@ -246,7 +246,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const ) ) ) && - ( // compare WebCast options + ( // compare WebCast options (m_eMode != PUBLISH_WEBCAST) || ( m_eScript == rDesign.m_eScript && @@ -285,7 +285,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn.ReadByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); rIn.ReadByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rIn >> rDesign.m_bDownload; - rIn >> rDesign.m_bCreated; // not used + rIn >> rDesign.m_bCreated; // not used rIn >> rDesign.m_nButtonThema; rIn >> rDesign.m_bUserAttr; rIn >> rDesign.m_aBackColor; @@ -332,7 +332,7 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); rOut.WriteByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rOut << rDesign.m_bDownload; - rOut << rDesign.m_bCreated; // not used + rOut << rDesign.m_bCreated; // not used rOut << rDesign.m_nButtonThema; rOut << rDesign.m_bUserAttr; rOut << rDesign.m_aBackColor; @@ -362,9 +362,9 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) class SdDesignNameDlg : public ModalDialog { private: - Edit m_aEdit; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; + Edit m_aEdit; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; public: SdDesignNameDlg(Window* pWindow, const String& aName ); @@ -381,18 +381,18 @@ public: // Konstruktor des Dialogs // ===================================================================== SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) -: ModalDialog(pWindow, SdResId( DLG_PUBLISHING )) -, mpButtonSet( new ButtonSet() ) -, aBottomLine( this, SdResId( BOTTOM_LINE ) ) -, aHelpButton(this,SdResId(BUT_HELP)) -, aCancelButton(this,SdResId(BUT_CANCEL)) -, aLastPageButton(this,SdResId(BUT_LAST)) -, aNextPageButton(this,SdResId(BUT_NEXT)) -, aFinishButton(this,SdResId(BUT_FINISH)) -, aAssistentFunc(NOOFPAGES) -, m_bButtonsDirty(TRUE) -, m_bDesignListDirty(FALSE) -, m_pDesign(NULL) +: ModalDialog(pWindow, SdResId( DLG_PUBLISHING )) +, mpButtonSet( new ButtonSet() ) +, aBottomLine( this, SdResId( BOTTOM_LINE ) ) +, aHelpButton(this,SdResId(BUT_HELP)) +, aCancelButton(this,SdResId(BUT_CANCEL)) +, aLastPageButton(this,SdResId(BUT_LAST)) +, aNextPageButton(this,SdResId(BUT_NEXT)) +, aFinishButton(this,SdResId(BUT_FINISH)) +, aAssistentFunc(NOOFPAGES) +, m_bButtonsDirty(TRUE) +, m_bDesignListDirty(FALSE) +, m_pDesign(NULL) { m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS; @@ -426,7 +426,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); - String aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("index")) ); + String aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("index")) ); aText += String(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)); pPage2_Index->SetText(aText); pPage2_CGI->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "/cgi-bin/" ) ) ); @@ -490,7 +490,7 @@ SdPublishingDlg::~SdPublishingDlg() { if( m_pDesignList ) { - for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) + for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) delete (SdPublishingDesign*)m_pDesignList->GetObject(nIndex); } @@ -639,8 +639,8 @@ void SdPublishingDlg::CreatePages() if(m_bImpress) aAssistentFunc.InsertControl(4, pPage4_Download = new CheckBox(this,SdResId(PAGE4_DOWNLOAD))); -//-/ aAssistentFunc.InsertControl(4, -//-/ pPage4_Created = new CheckBox(this,SdResId(PAGE4_CREATED))); +//-/ aAssistentFunc.InsertControl(4, +//-/ pPage4_Created = new CheckBox(this,SdResId(PAGE4_CREATED))); // Seite 5 aAssistentFunc.InsertControl(5, @@ -766,7 +766,7 @@ void SdPublishingDlg::RemovePages() delete pPage4_Misc; if(m_bImpress) delete pPage4_Download; -//-/ delete pPage4_Created; +//-/ delete pPage4_Created; delete pPage5_Bmp; delete pPage5_Titel; @@ -906,7 +906,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) // #92433# try to guess protocol for user's homepage INetURLObject aHomeURL( pPage4_WWW->GetText(), - INET_PROT_HTTP, // default proto is HTTP + INET_PROT_HTTP, // default proto is HTTP INetURLObject::ENCODE_ALL ); aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "HomepageURL" ) ); @@ -964,7 +964,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) } // Seite 6 -// aSet.Put(SfxBoolItem(ATTR_PUBLISH_SLIDESOUND,pPage6_Sound->IsChecked())); +// aSet.Put(SfxBoolItem(ATTR_PUBLISH_SLIDESOUND,pPage6_Sound->IsChecked())); rParams.realloc( aProps.size() ); @@ -1001,7 +1001,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) if(pPage1_Designs->GetSelectEntryCount() == 0) pPage1_Designs->SelectEntryPos(0); - USHORT nPos = pPage1_Designs->GetSelectEntryPos(); + USHORT nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos); DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)"); @@ -1516,7 +1516,7 @@ void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign ) pPage4_Misc->SetText(pDesign->m_aMisc); if(m_bImpress) pPage4_Download->Check(pDesign->m_bDownload); -//-/ pPage4_Created->Check(pDesign->m_bCreated); +//-/ pPage4_Created->Check(pDesign->m_bCreated); pPage5_TextOnly->Check(pDesign->m_nButtonThema == -1); if(pDesign->m_nButtonThema != -1) @@ -1552,7 +1552,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) if(!pDesign) return; - pDesign->m_eMode = pPage2_Standard->IsChecked()?PUBLISH_HTML: + pDesign->m_eMode = pPage2_Standard->IsChecked()?PUBLISH_HTML: pPage2_Frames->IsChecked()?PUBLISH_FRAMES: pPage2_Kiosk->IsChecked()?PUBLISH_KIOSK: PUBLISH_WEBCAST; @@ -1581,7 +1581,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) pDesign->m_aWWW = pPage4_WWW->GetText(); pDesign->m_aMisc = pPage4_Misc->GetText(); pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():FALSE; -//-/ pDesign->m_bCreated = pPage4_Created->IsChecked(); +//-/ pDesign->m_bCreated = pPage4_Created->IsChecked(); if(pPage5_TextOnly->IsChecked()) pDesign->m_nButtonThema = -1; @@ -1723,7 +1723,7 @@ BOOL SdPublishingDlg::Save() // ===================================================================== SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName): ModalDialog (pWindow, SdResId( DLG_DESIGNNAME )), - m_aEdit (this, SdResId(EDT_NAME)), + m_aEdit (this, SdResId(EDT_NAME)), m_aBtnOK (this, SdResId(BTN_SAVE)), m_aBtnCancel (this, SdResId(BTN_NOSAVE)) { diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index 00e9b4af75e4..cc57ab31b4af 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -386,7 +386,7 @@ ModalDialog DLG_PUBLISHING Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~PNG"; }; - + RadioButton PAGE3_GIF { Pos = MAP_APPFONT( 12, 63 ); diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index e484fea74b4a..ce59fd03b60d 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index f22df66795dd..02970068ad7b 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -230,7 +230,7 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) DBG_WARNING("you tried to deselect the animation of the form for random animation-> this has been refused"); return; } - + } if(bAnimate) @@ -290,7 +290,7 @@ void Ppt97Animation::UpdateCacheData() const return; ClearCacheData(); - + if( !HasEffect() ) { m_bDirtyCache = false; @@ -300,19 +300,19 @@ void Ppt97Animation::UpdateCacheData() const switch( m_aAtom.nFlyMethod ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR; + //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear"); // --- appear --- break; case 0x01: - //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM; + //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random"); // --- random --- break; - case 0x02: // --- blinds effect --- + case 0x02: // --- blinds effect --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES; + //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds"); m_aSubType = ::rtl::OUString::createFromAscii("horizontal"); // horizontal break; @@ -324,7 +324,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x03: // --- (hor/ver) shifted appear --- + case 0x03: // --- (hor/ver) shifted appear --- { switch ( m_aAtom.nFlyDirection ) { @@ -342,10 +342,10 @@ void Ppt97Animation::UpdateCacheData() const } break; case 0x05: - //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ---- + //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ---- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-dissolve-in"); break; - case 0x08: // --- (hor/ver) lines --- + case 0x08: // --- (hor/ver) lines --- { switch ( m_aAtom.nFlyDirection ) { @@ -355,56 +355,56 @@ void Ppt97Animation::UpdateCacheData() const m_aSubType = ::rtl::OUString::createFromAscii("vertical"); // horizontal ??? break; case 0x1: - //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES; + //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars"); m_aSubType = rtl::OUString::createFromAscii("horizontal"); // vertical ??? break; } } break; - case 0x09: // --- diagonal --- + case 0x09: // --- diagonal --- { switch ( m_aAtom.nFlyDirection ) { case 0x4: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("left-to-top"); // to left top break; case 0x5: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("right-to-top"); // to right top break; case 0x6: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("left-to-bottom"); // to left bottom break; case 0x7: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("right-to-bottom"); // to right bottom break; } } break; - case 0x0a: // --- roll/wipe --- + case 0x0a: // --- roll/wipe --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-right"); // from right break; case 0x1: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-bottom"); // from bottom break; case 0x2: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-left"); // from left break; @@ -416,7 +416,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0b: //--- fade in --- + case 0x0b: //--- fade in --- { switch ( m_aAtom.nFlyDirection ) { @@ -433,7 +433,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0c: // --- text effects --- + case 0x0c: // --- text effects --- { switch ( m_aAtom.nFlyDirection ) { @@ -441,7 +441,7 @@ void Ppt97Animation::UpdateCacheData() const //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); m_aSubType = rtl::OUString::createFromAscii("from-left"); - + break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP; @@ -481,7 +481,7 @@ void Ppt97Animation::UpdateCacheData() const case 0x8: // -- short text effects -- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); + m_aSubType = rtl::OUString::createFromAscii("from-left"); break; case 0x9: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM; @@ -597,12 +597,12 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0d: // --- open/close --- + case 0x0d: // --- open/close --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ??? + //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ??? m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split"); m_aSubType = rtl::OUString::createFromAscii("horizontal-out"); //horizontal open break; @@ -624,7 +624,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0e: // --- blink --- + case 0x0e: // --- blink --- { m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-flash-once"); switch ( m_aAtom.nFlyDirection ) @@ -706,7 +706,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // some effects need a different duration than that of the mapped preset effect double fDurationInSeconds = 1.0;//in secunden if( this->GetSpecialDuration( fDurationInSeconds ) ) - pEffect->setDuration( fDurationInSeconds ); + pEffect->setDuration( fDurationInSeconds ); // set after effect if( this->HasAfterEffect() ) @@ -724,11 +724,11 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // text iteration pEffect->setIterateType( this->GetTextAnimationType() ); - + // some effects need a different delay between text iteration than that of the mapped preset effect double fTextIterationDelay = 1.0; if( this->GetSpecialTextIterationDelay( fTextIterationDelay ) ) - pEffect->setIterateInterval( fTextIterationDelay ); + pEffect->setIterateInterval( fTextIterationDelay ); // is the effect started on click or after the last effect (Another possible value is EffectNodeType::WITH_PREVIOUS ) pEffect->setNodeType( this->GetEffectNodeType() ); @@ -755,16 +755,16 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) double fDelaySeconds = this->GetDelayTimeInSeconds(); sal_Bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text sal_Bool bTextReverse = this->HasReverseOrder(); - + // now create effects for each paragraph - ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> + ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> createTextGroup( pEffect, nParagraphLevel, fDelaySeconds, bAnimateAssociatedShape, bTextReverse ); - + if( pGroup ) { const ::sd::EffectSequence& rEffects = pGroup->getEffects(); ::sd::EffectSequence::const_iterator aIter = rEffects.begin(); - + ::sd::CustomAnimationEffectPtr pLastEffect; sal_Int32 nIndex = 0; for( ; aIter != rEffects.end(); aIter++ ) diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index b524add6d5fc..09d84ca7f8d4 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,22 +41,22 @@ class Ppt97AnimationInfoAtom friend class Ppt97Animation; //-- member - UINT32 nDimColor; - UINT32 nFlags; // 0x0004: time instead of click - UINT32 nSoundRef; - INT32 nDelayTime; // 1/1000 sec - UINT16 nOrderID; - UINT16 nSlideCount; - UINT8 nBuildType; - UINT8 nFlyMethod; - UINT8 nFlyDirection; - UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; - UINT8 nSubEffect; - UINT8 nOLEVerb; + UINT32 nDimColor; + UINT32 nFlags; // 0x0004: time instead of click + UINT32 nSoundRef; + INT32 nDelayTime; // 1/1000 sec + UINT16 nOrderID; + UINT16 nSlideCount; + UINT8 nBuildType; + UINT8 nFlyMethod; + UINT8 nFlyDirection; + UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; + UINT8 nSubEffect; + UINT8 nOLEVerb; // unknown, because whole size needs to be 28 - UINT8 nUnknown1; - UINT8 nUnknown2; + UINT8 nUnknown1; + UINT8 nUnknown2; //-- methods void ReadStream( SvStream& rIn ); @@ -69,7 +69,7 @@ class Ppt97AnimationInfoAtom 1088 0x00000440 10001000000 stop previous sound and mouseclick 1044 0x00000414 10000010100 play sound automatic 1041 0x00000411 10000010001 - | | | | | | + | | | | | | | | | | | reverse order | | | | after previous | | | sound diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index ed1d5f091510..df7f107e264f 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ class SvStream; namespace ppt -{ +{ // old transition types -#define PPT_TRANSITION_TYPE_NONE 0 +#define PPT_TRANSITION_TYPE_NONE 0 #define PPT_TRANSITION_TYPE_RANDOM 1 #define PPT_TRANSITION_TYPE_BLINDS 2 #define PPT_TRANSITION_TYPE_CHECKER 3 @@ -58,119 +58,119 @@ namespace ppt #define PPT_TRANSITION_TYPE_SPLIT 13 // effects, new in xp -#define PPT_TRANSITION_TYPE_DIAMOND 17 -#define PPT_TRANSITION_TYPE_PLUS 18 -#define PPT_TRANSITION_TYPE_WEDGE 19 -#define PPT_TRANSITION_TYPE_PUSH 20 -#define PPT_TRANSITION_TYPE_COMB 21 -#define PPT_TRANSITION_TYPE_NEWSFLASH 22 -#define PPT_TRANSITION_TYPE_SMOOTHFADE 23 -#define PPT_TRANSITION_TYPE_WHEEL 26 -#define PPT_TRANSITION_TYPE_CIRCLE 27 - - - -// atoms -#define DFF_msofbtAnimEvent 0xf125 -#define DFF_msofbtAnimNode 0xf127 -#define DFF_msofbtAnimTrigger 0xf128 -#define DFF_msofbtAnimValue 0xf129 -#define DFF_msofbtAnimateTarget 0xf12a -#define DFF_msofbtAnimate 0xf12b -#define DFF_msofbtAnimateColor 0xf12c -#define DFF_msofbtAnimateFilter 0xf12d -#define DFF_msofbtAnimateMotion 0xf12e -#define DFF_msofbtAnimateRotation 0xf12f -#define DFF_msofbtAnimateScale 0xf130 -#define DFF_msofbtAnimateSet 0xf131 -#define DFF_msofbtAnimCommand 0xf132 -#define DFF_msofbtAnimateTargetSettings 0xf133 -#define DFF_msofbtAnimateData 0xf134 -#define DFF_msofbtAnimateColorData 0xf135 -#define DFF_msofbtAnimateFilterData 0xf136 -#define DFF_msofbtAnimateMotionData 0xf137 -#define DFF_msofbtAnimateScaleData 0xf139 -#define DFF_msofbtAnimateSetData 0xf13a -#define DFF_msofbtCommandData 0xf13b -#define DFF_msofbtAnimateTargetElement 0xf13c -#define DFF_msofbtAnimPropertySet 0xf13d -#define DFF_msofbtAnimateAttributeNames 0xf13e -#define DFF_msofbtAnimKeyPoints 0xf13f -#define DFF_msofbtAnimIteration 0xf140 -#define DFF_msofbtAnimAction 0xf141 // correct name?? -#define DFF_msofbtAnimAttributeValue 0xf142 -#define DFF_msofbtAnimKeyTime 0xf143 -#define DFF_msofbtAnimGroup 0xf144 -#define DFF_msofbtAnimSubGoup 0xf145 -#define DFF_msofbtAnimateRotationData 0xf138 -#define DFF_msofbtAnimReference 0x2afb +#define PPT_TRANSITION_TYPE_DIAMOND 17 +#define PPT_TRANSITION_TYPE_PLUS 18 +#define PPT_TRANSITION_TYPE_WEDGE 19 +#define PPT_TRANSITION_TYPE_PUSH 20 +#define PPT_TRANSITION_TYPE_COMB 21 +#define PPT_TRANSITION_TYPE_NEWSFLASH 22 +#define PPT_TRANSITION_TYPE_SMOOTHFADE 23 +#define PPT_TRANSITION_TYPE_WHEEL 26 +#define PPT_TRANSITION_TYPE_CIRCLE 27 + + + +// atoms +#define DFF_msofbtAnimEvent 0xf125 +#define DFF_msofbtAnimNode 0xf127 +#define DFF_msofbtAnimTrigger 0xf128 +#define DFF_msofbtAnimValue 0xf129 +#define DFF_msofbtAnimateTarget 0xf12a +#define DFF_msofbtAnimate 0xf12b +#define DFF_msofbtAnimateColor 0xf12c +#define DFF_msofbtAnimateFilter 0xf12d +#define DFF_msofbtAnimateMotion 0xf12e +#define DFF_msofbtAnimateRotation 0xf12f +#define DFF_msofbtAnimateScale 0xf130 +#define DFF_msofbtAnimateSet 0xf131 +#define DFF_msofbtAnimCommand 0xf132 +#define DFF_msofbtAnimateTargetSettings 0xf133 +#define DFF_msofbtAnimateData 0xf134 +#define DFF_msofbtAnimateColorData 0xf135 +#define DFF_msofbtAnimateFilterData 0xf136 +#define DFF_msofbtAnimateMotionData 0xf137 +#define DFF_msofbtAnimateScaleData 0xf139 +#define DFF_msofbtAnimateSetData 0xf13a +#define DFF_msofbtCommandData 0xf13b +#define DFF_msofbtAnimateTargetElement 0xf13c +#define DFF_msofbtAnimPropertySet 0xf13d +#define DFF_msofbtAnimateAttributeNames 0xf13e +#define DFF_msofbtAnimKeyPoints 0xf13f +#define DFF_msofbtAnimIteration 0xf140 +#define DFF_msofbtAnimAction 0xf141 // correct name?? +#define DFF_msofbtAnimAttributeValue 0xf142 +#define DFF_msofbtAnimKeyTime 0xf143 +#define DFF_msofbtAnimGroup 0xf144 +#define DFF_msofbtAnimSubGoup 0xf145 +#define DFF_msofbtAnimateRotationData 0xf138 +#define DFF_msofbtAnimReference 0x2afb // property ids -#define DFF_ANIM_ID 1 -#define DFF_ANIM_RUNTIMECONTEXT 2 -#define DFF_ANIM_PATH_EDIT_MODE 3 -#define DFF_ANIM_COLORSPACE 4 -#define DFF_ANIM_DIRECTION 5 // TODO: Conflict? -#define DFF_ANIM_MASTERREL 5 // TODO: Conflict? -#define DFF_ANIM_OVERRIDE 6 -#define DFF_ANIM_PRESET_ID 9 -#define DFF_ANIM_PRESET_SUB_TYPE 10 -#define DFF_ANIM_PRESET_CLASS 11 -#define DFF_ANIM_AFTEREFFECT 13 -#define DFF_ANIM_ENDAFTERSLIDE 15 -#define DFF_ANIM_TIMEFILTER 16 -#define DFF_ANIM_EVENT_FILTER 17 -#define DFF_ANIM_GROUP_ID 19 -#define DFF_ANIM_NODE_TYPE 20 -#define DFF_ANIM_VOLUME 22 -#define DFF_ANIM_PROPERTY_ID_COUNT DFF_ANIM_VOLUME +#define DFF_ANIM_ID 1 +#define DFF_ANIM_RUNTIMECONTEXT 2 +#define DFF_ANIM_PATH_EDIT_MODE 3 +#define DFF_ANIM_COLORSPACE 4 +#define DFF_ANIM_DIRECTION 5 // TODO: Conflict? +#define DFF_ANIM_MASTERREL 5 // TODO: Conflict? +#define DFF_ANIM_OVERRIDE 6 +#define DFF_ANIM_PRESET_ID 9 +#define DFF_ANIM_PRESET_SUB_TYPE 10 +#define DFF_ANIM_PRESET_CLASS 11 +#define DFF_ANIM_AFTEREFFECT 13 +#define DFF_ANIM_ENDAFTERSLIDE 15 +#define DFF_ANIM_TIMEFILTER 16 +#define DFF_ANIM_EVENT_FILTER 17 +#define DFF_ANIM_GROUP_ID 19 +#define DFF_ANIM_NODE_TYPE 20 +#define DFF_ANIM_VOLUME 22 +#define DFF_ANIM_PROPERTY_ID_COUNT DFF_ANIM_VOLUME // property types -#define DFF_ANIM_PROP_TYPE_BYTE 0 -#define DFF_ANIM_PROP_TYPE_INT32 1 -#define DFF_ANIM_PROP_TYPE_FLOAT 2 -#define DFF_ANIM_PROP_TYPE_UNISTRING 3 - -#define DFF_ANIM_PATH_EDIT_MODE_FIXED 0 -#define DFF_ANIM_PATH_EDIT_MODE_RELATIVE 1 - -#define DFF_ANIM_PRESS_CLASS_USER_DEFINED 0 -#define DFF_ANIM_PRESS_CLASS_ENTRANCE 1 -#define DFF_ANIM_PRESS_CLASS_EXIT 2 -#define DFF_ANIM_PRESS_CLASS_EMPHASIS 3 -#define DFF_ANIM_PRESS_CLASS_MOTIONPATH 4 -#define DFF_ANIM_PRESS_CLASS_OLE_ACTION 5 -#define DFF_ANIM_PRESS_CLASS_MEDIACALL 6 - -#define DFF_ANIM_NODE_TYPE_ON_CLICK 1 -#define DFF_ANIM_NODE_TYPE_WITH_PREVIOUS 2 -#define DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS 3 -#define DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE 4 -#define DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ 5 -#define DFF_ANIM_NODE_TYPE_TIMING_ROOT 9 - -#define DFF_ANIM_PROPERTY_AFTEREFFECT 20 +#define DFF_ANIM_PROP_TYPE_BYTE 0 +#define DFF_ANIM_PROP_TYPE_INT32 1 +#define DFF_ANIM_PROP_TYPE_FLOAT 2 +#define DFF_ANIM_PROP_TYPE_UNISTRING 3 + +#define DFF_ANIM_PATH_EDIT_MODE_FIXED 0 +#define DFF_ANIM_PATH_EDIT_MODE_RELATIVE 1 + +#define DFF_ANIM_PRESS_CLASS_USER_DEFINED 0 +#define DFF_ANIM_PRESS_CLASS_ENTRANCE 1 +#define DFF_ANIM_PRESS_CLASS_EXIT 2 +#define DFF_ANIM_PRESS_CLASS_EMPHASIS 3 +#define DFF_ANIM_PRESS_CLASS_MOTIONPATH 4 +#define DFF_ANIM_PRESS_CLASS_OLE_ACTION 5 +#define DFF_ANIM_PRESS_CLASS_MEDIACALL 6 + +#define DFF_ANIM_NODE_TYPE_ON_CLICK 1 +#define DFF_ANIM_NODE_TYPE_WITH_PREVIOUS 2 +#define DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS 3 +#define DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE 4 +#define DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ 5 +#define DFF_ANIM_NODE_TYPE_TIMING_ROOT 9 + +#define DFF_ANIM_PROPERTY_AFTEREFFECT 20 /* constants for fill entry in AnimationNode */ -const sal_Int32 mso_Anim_GroupType_PAR = 0; -const sal_Int32 mso_Anim_GroupType_SEQ = 1; -const sal_Int32 mso_Anim_GroupType_NODE = 3; -const sal_Int32 mso_Anim_GroupType_MEDIA = 4; +const sal_Int32 mso_Anim_GroupType_PAR = 0; +const sal_Int32 mso_Anim_GroupType_SEQ = 1; +const sal_Int32 mso_Anim_GroupType_NODE = 3; +const sal_Int32 mso_Anim_GroupType_MEDIA = 4; /* constants for fill entry in AnimationNode */ -const sal_Int32 mso_Anim_Fill_ALWAYS = 1; -const sal_Int32 mso_Anim_Fill_WHENOFF = 2; -const sal_Int32 mso_Anim_Fill_NEVER = 3; +const sal_Int32 mso_Anim_Fill_ALWAYS = 1; +const sal_Int32 mso_Anim_Fill_WHENOFF = 2; +const sal_Int32 mso_Anim_Fill_NEVER = 3; /* constants for fill entry in AnimationNode */ -const sal_Int32 mso_Anim_Fill_REMOVE = 1; -const sal_Int32 mso_Anim_Fill_FREEZE = 2; -const sal_Int32 mso_Anim_Fill_HOLD = 3; +const sal_Int32 mso_Anim_Fill_REMOVE = 1; +const sal_Int32 mso_Anim_Fill_FREEZE = 2; +const sal_Int32 mso_Anim_Fill_HOLD = 3; /* constants for behaviour entry in PPtAnimationNode */ -const sal_Int32 mso_Anim_Behaviour_FILTER = 24; +const sal_Int32 mso_Anim_Behaviour_FILTER = 24; const sal_Int32 mso_Anim_Behaviour_ANIMATION= 25; typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertySetMap_t; @@ -195,7 +195,7 @@ enum MS_AttributeNames struct ImplAttributeNameConversion { - MS_AttributeNames meAttribute; + MS_AttributeNames meAttribute; const char* mpMSName; const char* mpAPIName; }; @@ -209,16 +209,16 @@ public: /** see mso_Anim_Restart_? */ sal_Int32 mnRestart; - + /** see mso_Anim_Fill_? */ sal_Int32 mnFill; - + /** see mso_Anim_Behaviour_? */ sal_Int32 mnNodeType; /** duration of this group in 1000th seconds */ sal_Int32 mnDuration; - + sal_Int32 mnU1, mnU3, mnU4; public: @@ -227,29 +227,29 @@ public: friend SvStream& operator<<(SvStream& rOut, AnimationNode& rAtom); }; -static const ImplAttributeNameConversion gImplConversionList[] = +static const ImplAttributeNameConversion gImplConversionList[] = { - { MS_PPT_X, "ppt_x", "X" }, - { MS_PPT_Y, "ppt_y", "Y" }, - { MS_PPT_W, "ppt_w", "Width" }, - { MS_PPT_H, "ppt_h", "Height" }, - { MS_PPT_C, "ppt_c", "DimColor" }, - { MS_R, "r", "Rotate" }, - { MS_XSHEAR, "xshear", "SkewX" }, - { MS_FILLCOLOR, "fillColor", "FillColor" }, - { MS_FILLCOLOR, "fillcolor", "FillColor" }, - { MS_FILLTYPE, "fill.type", "FillStyle" }, - { MS_STROKECOLOR, "stroke.color", "LineColor" }, - { MS_STROKEON, "stroke.on", "LineStyle" }, - { MS_STYLECOLOR, "style.color", "CharColor" }, - { MS_STYLEROTATION, "style.rotation", "Rotate" }, - { MS_FONTWEIGHT, "style.fontWeight", "CharWeight" }, - { MS_STYLEUNDERLINE, "style.textDecorationUnderline","CharUnderline" }, - { MS_STYLEFONTFAMILY, "style.fontFamily", "CharFontName" }, - { MS_STYLEFONTSIZE, "style.fontSize", "CharHeight" }, - { MS_STYLEFONTSTYLE, "style.fontStyle", "CharPosture" }, - { MS_STYLEVISIBILITY, "style.visibility", "Visibility" }, - { MS_STYLEOPACITY, "style.opacity", "Opacity" }, + { MS_PPT_X, "ppt_x", "X" }, + { MS_PPT_Y, "ppt_y", "Y" }, + { MS_PPT_W, "ppt_w", "Width" }, + { MS_PPT_H, "ppt_h", "Height" }, + { MS_PPT_C, "ppt_c", "DimColor" }, + { MS_R, "r", "Rotate" }, + { MS_XSHEAR, "xshear", "SkewX" }, + { MS_FILLCOLOR, "fillColor", "FillColor" }, + { MS_FILLCOLOR, "fillcolor", "FillColor" }, + { MS_FILLTYPE, "fill.type", "FillStyle" }, + { MS_STROKECOLOR, "stroke.color", "LineColor" }, + { MS_STROKEON, "stroke.on", "LineStyle" }, + { MS_STYLECOLOR, "style.color", "CharColor" }, + { MS_STYLEROTATION, "style.rotation", "Rotate" }, + { MS_FONTWEIGHT, "style.fontWeight", "CharWeight" }, + { MS_STYLEUNDERLINE, "style.textDecorationUnderline","CharUnderline" }, + { MS_STYLEFONTFAMILY, "style.fontFamily", "CharFontName" }, + { MS_STYLEFONTSIZE, "style.fontSize", "CharHeight" }, + { MS_STYLEFONTSTYLE, "style.fontStyle", "CharPosture" }, + { MS_STYLEVISIBILITY, "style.visibility", "Visibility" }, + { MS_STYLEOPACITY, "style.opacity", "Opacity" }, { MS_UNKNOWN, NULL, NULL } }; @@ -301,7 +301,7 @@ static const transition gTransitions[] = { "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, sal_True }, { "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, sal_True }, { "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, sal_True }, -{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, sal_True }, +{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, sal_True }, { "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, { "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, // TODO { NULL, 0, 0, sal_False } @@ -340,216 +340,216 @@ static const convert_subtype gConvertArray[] = struct preset_maping { - sal_Int32 mnPresetClass; - sal_Int32 mnPresetId; - const sal_Char* mpStrPresetId; + sal_Int32 mnPresetClass; + sal_Int32 mnPresetId; + const sal_Char* mpStrPresetId; }; static const preset_maping gPresetMaping[] = { - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 1 ,"ooo-entrance-appear" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 2 ,"ooo-entrance-fly-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 3 ,"ooo-entrance-venetian-blinds" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 4 ,"ooo-entrance-box" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 5 ,"ooo-entrance-checkerboard" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 6 ,"ooo-entrance-circle" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 7 ,"ooo-entrance-fly-in-slow" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 8 ,"ooo-entrance-diamond" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 9 ,"ooo-entrance-dissolve-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 10 ,"ooo-entrance-fade-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 11 ,"ooo-entrance-flash-once" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 12 ,"ooo-entrance-peek-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 13 ,"ooo-entrance-plus" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 14 ,"ooo-entrance-random-bars" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 15 ,"ooo-entrance-spiral-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 16 ,"ooo-entrance-split" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 17 ,"ooo-entrance-stretchy" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 18 ,"ooo-entrance-diagonal-squares" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 19 ,"ooo-entrance-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 20 ,"ooo-entrance-wedge" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 21 ,"ooo-entrance-wheel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 22 ,"ooo-entrance-wipe" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 23 ,"ooo-entrance-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 24 ,"ooo-entrance-random" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 25 ,"ooo-entrance-boomerang" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 26 ,"ooo-entrance-bounce" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 27 ,"ooo-entrance-colored-lettering" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 28 ,"ooo-entrance-movie-credits" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29 ,"ooo-entrance-ease-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30 ,"ooo-entrance-float" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31 ,"ooo-entrance-turn-and-grow" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-breaks" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35 ,"ooo-entrance-pinwheel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37 ,"ooo-entrance-rise-up" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38 ,"ooo-entrance-falling-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 39 ,"ooo-entrance-thread" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 40 ,"ooo-entrance-unfold" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 41 ,"ooo-entrance-whip" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 42 ,"ooo-entrance-ascend" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 43 ,"ooo-entrance-center-revolve" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 45 ,"ooo-entrance-fade-in-and-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 47 ,"ooo-entrance-descend" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 48 ,"ooo-entrance-sling" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 49 ,"ooo-entrance-spin-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 50 ,"ooo-entrance-compress" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 51 ,"ooo-entrance-magnify" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 52 ,"ooo-entrance-curve-up" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 53 ,"ooo-entrance-fade-in-and-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 54 ,"ooo-entrance-glide" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 55 ,"ooo-entrance-expand" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 56 ,"ooo-entrance-flip" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 58 ,"ooo-entrance-fold" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 1 ,"ooo-emphasis-fill-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 2 ,"ooo-emphasis-font" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 3 ,"ooo-emphasis-font-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 4 ,"ooo-emphasis-font-size" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 5 ,"ooo-emphasis-font-style" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 6 ,"ooo-emphasis-grow-and-shrink" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 7 ,"ooo-emphasis-line-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 8 ,"ooo-emphasis-spin" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 9 ,"ooo-emphasis-transparency" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 10 ,"ooo-emphasis-bold-flash" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 14 ,"ooo-emphasis-blast" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 15 ,"ooo-emphasis-bold-reveal" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 16 ,"ooo-emphasis-color-over-by-word" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 18 ,"ooo-emphasis-reveal-underline" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 19 ,"ooo-emphasis-color-blend" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 20 ,"ooo-emphasis-color-over-by-letter" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 21 ,"ooo-emphasis-complementary-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 22 ,"ooo-emphasis-complementary-color-2" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 23 ,"ooo-emphasis-contrasting-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 24 ,"ooo-emphasis-darken" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 25 ,"ooo-emphasis-desaturate" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 26 ,"ooo-emphasis-flash-bulb" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 27 ,"ooo-emphasis-flicker" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 28 ,"ooo-emphasis-grow-with-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 30 ,"ooo-emphasis-lighten" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 31 ,"ooo-emphasis-style-emphasis" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 32 ,"ooo-emphasis-teeter" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 33 ,"ooo-emphasis-vertical-highlight" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 34 ,"ooo-emphasis-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 35 ,"ooo-emphasis-blink" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 36 ,"ooo-emphasis-shimmer" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 1 ,"ooo-exit-disappear" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 2 ,"ooo-exit-fly-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 3 ,"ooo-exit-venetian-blinds" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 4 ,"ooo-exit-box" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 5 ,"ooo-exit-checkerboard" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 6 ,"ooo-exit-circle" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 7 ,"ooo-exit-crawl-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 8 ,"ooo-exit-diamond" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 9 ,"ooo-exit-dissolve" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 10 ,"ooo-exit-fade-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 11 ,"ooo-exit-flash-once" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 12 ,"ooo-exit-peek-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 13 ,"ooo-exit-plus" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 14 ,"ooo-exit-random-bars" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 15 ,"ooo-exit-spiral-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 16 ,"ooo-exit-split" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 17 ,"ooo-exit-collapse" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 18 ,"ooo-exit-diagonal-squares" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 19 ,"ooo-exit-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 20 ,"ooo-exit-wedge" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 21 ,"ooo-exit-wheel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 22 ,"ooo-exit-wipe" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 23 ,"ooo-exit-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 24 ,"ooo-exit-random" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 25 ,"ooo-exit-boomerang" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 26 ,"ooo-exit-bounce" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 27 ,"ooo-exit-colored-lettering" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 28 ,"ooo-exit-movie-credits" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 29 ,"ooo-exit-ease-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 30 ,"ooo-exit-float" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 31 ,"ooo-exit-turn-and-grow" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-breaks" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 35 ,"ooo-exit-pinwheel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 37 ,"ooo-exit-sink-down" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 38 ,"ooo-exit-swish" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 39 ,"ooo-exit-thread" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 40 ,"ooo-exit-unfold" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 41 ,"ooo-exit-whip" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 42 ,"ooo-exit-descend" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 43 ,"ooo-exit-center-revolve" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 45 ,"ooo-exit-fade-out-and-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 47 ,"ooo-exit-ascend" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 48 ,"ooo-exit-sling" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 53 ,"ooo-exit-fade-out-and-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 55 ,"ooo-exit-contract" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 49 ,"ooo-exit-spin-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 50 ,"ooo-exit-stretchy" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 51 ,"ooo-exit-magnify" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 52 ,"ooo-exit-curve-down" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 54 ,"ooo-exit-glide" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56 ,"ooo-exit-flip" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58 ,"ooo-exit-fold" }, - - - - - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16 ,"ooo-motionpath-4-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5 ,"ooo-motionpath-5-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11 ,"ooo-motionpath-6-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 17 ,"ooo-motionpath-8-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 1 ,"ooo-motionpath-circle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 6 ,"ooo-motionpath-crescent-moon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 3 ,"ooo-motionpath-diamond" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 13 ,"ooo-motionpath-equal-triangle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 12 ,"ooo-motionpath-oval" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 9 ,"ooo-motionpath-heart" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 4 ,"ooo-motionpath-hexagon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 10 ,"ooo-motionpath-octagon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 14 ,"ooo-motionpath-parallelogram" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 15 ,"ooo-motionpath-pentagon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 2 ,"ooo-motionpath-right-triangle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 7 ,"ooo-motionpath-square" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 18 ,"ooo-motionpath-teardrop" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 8 ,"ooo-motionpath-trapezoid" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 37 ,"ooo-motionpath-arc-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 51 ,"ooo-motionpath-arc-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 58 ,"ooo-motionpath-arc-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 44 ,"ooo-motionpath-arc-up" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 41 ,"ooo-motionpath-bounce-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 54 ,"ooo-motionpath-bounce-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 48 ,"ooo-motionpath-curvy-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 61 ,"ooo-motionpath-curvy-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 60 ,"ooo-motionpath-decaying-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 49 ,"ooo-motionpath-diagonal-down-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 56 ,"ooo-motionpath-diagonal-up-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 42 ,"ooo-motionpath-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 52 ,"ooo-motionpath-funnel" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 53 ,"ooo-motionpath-spring" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 62 ,"ooo-motionpath-stairs-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 50 ,"ooo-motionpath-turn-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 36 ,"ooo-motionpath-turn-down-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 43 ,"ooo-motionpath-turn-up" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 57 ,"ooo-motionpath-turn-up-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 64 ,"ooo-motionpath-up" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 47 ,"ooo-motionpath-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 38 ,"ooo-motionpath-zigzag" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 31 ,"ooo-motionpath-bean" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 25 ,"ooo-motionpath-buzz-saw" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 20 ,"ooo-motionpath-curved-square" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 21 ,"ooo-motionpath-curved-x" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 23 ,"ooo-motionpath-curvy-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 28 ,"ooo-motionpath-figure-8-four" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 26 ,"ooo-motionpath-horizontal-figure-8" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 34 ,"ooo-motionpath-inverted-square" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 33 ,"ooo-motionpath-inverted-triangle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 24 ,"ooo-motionpath-loop-de-loop" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 29 ,"ooo-motionpath-neutron" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 27 ,"ooo-motionpath-peanut" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 32 ,"ooo-motionpath-clover" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 19 ,"ooo-motionpath-pointy-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 30 ,"ooo-motionpath-swoosh" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 22 ,"ooo-motionpath-vertical-figure-8" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 35 ,"ooo-motionpath-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 63 ,"ooo-motionpath-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 55 ,"ooo-motionpath-spiral-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 46 ,"ooo-motionpath-spiral-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 40 ,"ooo-motionpath-sine-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 59 ,"ooo-motionpath-s-curve-1" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39 ,"ooo-motionpath-s-curve-2" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45 ,"ooo-motionpath-heartbeat" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 1 ,"ooo-entrance-appear" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 2 ,"ooo-entrance-fly-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 3 ,"ooo-entrance-venetian-blinds" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 4 ,"ooo-entrance-box" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 5 ,"ooo-entrance-checkerboard" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 6 ,"ooo-entrance-circle" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 7 ,"ooo-entrance-fly-in-slow" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 8 ,"ooo-entrance-diamond" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 9 ,"ooo-entrance-dissolve-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 10 ,"ooo-entrance-fade-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 11 ,"ooo-entrance-flash-once" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 12 ,"ooo-entrance-peek-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 13 ,"ooo-entrance-plus" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 14 ,"ooo-entrance-random-bars" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 15 ,"ooo-entrance-spiral-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 16 ,"ooo-entrance-split" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 17 ,"ooo-entrance-stretchy" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 18 ,"ooo-entrance-diagonal-squares" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 19 ,"ooo-entrance-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 20 ,"ooo-entrance-wedge" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 21 ,"ooo-entrance-wheel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 22 ,"ooo-entrance-wipe" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 23 ,"ooo-entrance-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 24 ,"ooo-entrance-random" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 25 ,"ooo-entrance-boomerang" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 26 ,"ooo-entrance-bounce" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 27 ,"ooo-entrance-colored-lettering" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 28 ,"ooo-entrance-movie-credits" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29 ,"ooo-entrance-ease-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30 ,"ooo-entrance-float" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31 ,"ooo-entrance-turn-and-grow" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-breaks" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35 ,"ooo-entrance-pinwheel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37 ,"ooo-entrance-rise-up" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38 ,"ooo-entrance-falling-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 39 ,"ooo-entrance-thread" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 40 ,"ooo-entrance-unfold" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 41 ,"ooo-entrance-whip" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 42 ,"ooo-entrance-ascend" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 43 ,"ooo-entrance-center-revolve" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 45 ,"ooo-entrance-fade-in-and-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 47 ,"ooo-entrance-descend" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 48 ,"ooo-entrance-sling" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 49 ,"ooo-entrance-spin-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 50 ,"ooo-entrance-compress" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 51 ,"ooo-entrance-magnify" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 52 ,"ooo-entrance-curve-up" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 53 ,"ooo-entrance-fade-in-and-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 54 ,"ooo-entrance-glide" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 55 ,"ooo-entrance-expand" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 56 ,"ooo-entrance-flip" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 58 ,"ooo-entrance-fold" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 1 ,"ooo-emphasis-fill-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 2 ,"ooo-emphasis-font" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 3 ,"ooo-emphasis-font-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 4 ,"ooo-emphasis-font-size" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 5 ,"ooo-emphasis-font-style" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 6 ,"ooo-emphasis-grow-and-shrink" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 7 ,"ooo-emphasis-line-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 8 ,"ooo-emphasis-spin" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 9 ,"ooo-emphasis-transparency" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 10 ,"ooo-emphasis-bold-flash" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 14 ,"ooo-emphasis-blast" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 15 ,"ooo-emphasis-bold-reveal" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 16 ,"ooo-emphasis-color-over-by-word" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 18 ,"ooo-emphasis-reveal-underline" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 19 ,"ooo-emphasis-color-blend" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 20 ,"ooo-emphasis-color-over-by-letter" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 21 ,"ooo-emphasis-complementary-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 22 ,"ooo-emphasis-complementary-color-2" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 23 ,"ooo-emphasis-contrasting-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 24 ,"ooo-emphasis-darken" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 25 ,"ooo-emphasis-desaturate" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 26 ,"ooo-emphasis-flash-bulb" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 27 ,"ooo-emphasis-flicker" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 28 ,"ooo-emphasis-grow-with-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 30 ,"ooo-emphasis-lighten" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 31 ,"ooo-emphasis-style-emphasis" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 32 ,"ooo-emphasis-teeter" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 33 ,"ooo-emphasis-vertical-highlight" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 34 ,"ooo-emphasis-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 35 ,"ooo-emphasis-blink" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 36 ,"ooo-emphasis-shimmer" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 1 ,"ooo-exit-disappear" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 2 ,"ooo-exit-fly-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 3 ,"ooo-exit-venetian-blinds" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 4 ,"ooo-exit-box" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 5 ,"ooo-exit-checkerboard" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 6 ,"ooo-exit-circle" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 7 ,"ooo-exit-crawl-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 8 ,"ooo-exit-diamond" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 9 ,"ooo-exit-dissolve" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 10 ,"ooo-exit-fade-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 11 ,"ooo-exit-flash-once" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 12 ,"ooo-exit-peek-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 13 ,"ooo-exit-plus" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 14 ,"ooo-exit-random-bars" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 15 ,"ooo-exit-spiral-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 16 ,"ooo-exit-split" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 17 ,"ooo-exit-collapse" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 18 ,"ooo-exit-diagonal-squares" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 19 ,"ooo-exit-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 20 ,"ooo-exit-wedge" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 21 ,"ooo-exit-wheel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 22 ,"ooo-exit-wipe" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 23 ,"ooo-exit-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 24 ,"ooo-exit-random" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 25 ,"ooo-exit-boomerang" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 26 ,"ooo-exit-bounce" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 27 ,"ooo-exit-colored-lettering" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 28 ,"ooo-exit-movie-credits" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 29 ,"ooo-exit-ease-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 30 ,"ooo-exit-float" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 31 ,"ooo-exit-turn-and-grow" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-breaks" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 35 ,"ooo-exit-pinwheel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 37 ,"ooo-exit-sink-down" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 38 ,"ooo-exit-swish" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 39 ,"ooo-exit-thread" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 40 ,"ooo-exit-unfold" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 41 ,"ooo-exit-whip" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 42 ,"ooo-exit-descend" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 43 ,"ooo-exit-center-revolve" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 45 ,"ooo-exit-fade-out-and-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 47 ,"ooo-exit-ascend" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 48 ,"ooo-exit-sling" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 53 ,"ooo-exit-fade-out-and-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 55 ,"ooo-exit-contract" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 49 ,"ooo-exit-spin-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 50 ,"ooo-exit-stretchy" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 51 ,"ooo-exit-magnify" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 52 ,"ooo-exit-curve-down" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 54 ,"ooo-exit-glide" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56 ,"ooo-exit-flip" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58 ,"ooo-exit-fold" }, + + + + + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16 ,"ooo-motionpath-4-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5 ,"ooo-motionpath-5-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11 ,"ooo-motionpath-6-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 17 ,"ooo-motionpath-8-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 1 ,"ooo-motionpath-circle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 6 ,"ooo-motionpath-crescent-moon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 3 ,"ooo-motionpath-diamond" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 13 ,"ooo-motionpath-equal-triangle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 12 ,"ooo-motionpath-oval" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 9 ,"ooo-motionpath-heart" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 4 ,"ooo-motionpath-hexagon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 10 ,"ooo-motionpath-octagon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 14 ,"ooo-motionpath-parallelogram" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 15 ,"ooo-motionpath-pentagon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 2 ,"ooo-motionpath-right-triangle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 7 ,"ooo-motionpath-square" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 18 ,"ooo-motionpath-teardrop" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 8 ,"ooo-motionpath-trapezoid" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 37 ,"ooo-motionpath-arc-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 51 ,"ooo-motionpath-arc-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 58 ,"ooo-motionpath-arc-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 44 ,"ooo-motionpath-arc-up" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 41 ,"ooo-motionpath-bounce-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 54 ,"ooo-motionpath-bounce-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 48 ,"ooo-motionpath-curvy-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 61 ,"ooo-motionpath-curvy-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 60 ,"ooo-motionpath-decaying-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 49 ,"ooo-motionpath-diagonal-down-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 56 ,"ooo-motionpath-diagonal-up-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 42 ,"ooo-motionpath-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 52 ,"ooo-motionpath-funnel" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 53 ,"ooo-motionpath-spring" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 62 ,"ooo-motionpath-stairs-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 50 ,"ooo-motionpath-turn-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 36 ,"ooo-motionpath-turn-down-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 43 ,"ooo-motionpath-turn-up" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 57 ,"ooo-motionpath-turn-up-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 64 ,"ooo-motionpath-up" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 47 ,"ooo-motionpath-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 38 ,"ooo-motionpath-zigzag" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 31 ,"ooo-motionpath-bean" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 25 ,"ooo-motionpath-buzz-saw" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 20 ,"ooo-motionpath-curved-square" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 21 ,"ooo-motionpath-curved-x" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 23 ,"ooo-motionpath-curvy-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 28 ,"ooo-motionpath-figure-8-four" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 26 ,"ooo-motionpath-horizontal-figure-8" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 34 ,"ooo-motionpath-inverted-square" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 33 ,"ooo-motionpath-inverted-triangle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 24 ,"ooo-motionpath-loop-de-loop" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 29 ,"ooo-motionpath-neutron" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 27 ,"ooo-motionpath-peanut" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 32 ,"ooo-motionpath-clover" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 19 ,"ooo-motionpath-pointy-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 30 ,"ooo-motionpath-swoosh" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 22 ,"ooo-motionpath-vertical-figure-8" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 35 ,"ooo-motionpath-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 63 ,"ooo-motionpath-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 55 ,"ooo-motionpath-spiral-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 46 ,"ooo-motionpath-spiral-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 40 ,"ooo-motionpath-sine-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 59 ,"ooo-motionpath-s-curve-1" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39 ,"ooo-motionpath-s-curve-2" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45 ,"ooo-motionpath-heartbeat" }, { 0,0,0 } diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp index dc309652a6fd..530fa3b7a66f 100644 --- a/sd/source/filter/ppt/pptatom.cpp +++ b/sd/source/filter/ppt/pptatom.cpp @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,13 +50,13 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream ) Atom* pLastAtom = NULL; - // retrieve file size (to allow sanity checks) + // retrieve file size (to allow sanity checks) const sal_Size nStreamPos = mrStream.Tell(); mrStream.Seek( STREAM_SEEK_TO_END ); const sal_Size nStreamSize = mrStream.Tell(); mrStream.Seek( nStreamPos ); - while( (mrStream.GetError() == 0 ) + while( (mrStream.GetError() == 0 ) && ( mrStream.Tell() < nStreamSize ) && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) ) { diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index a9b159f8a42e..235247572ce6 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2e0159a1fa13..b16f44592cde 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ #include <editeng/editstat.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfac.hxx> -#define MAX_USER_MOVE 2 +#define MAX_USER_MOVE 2 #include "pptinanimations.hxx" #include "ppt97animations.hxx" @@ -175,16 +175,16 @@ SdPPTImport::~SdPPTImport() } ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage_, SfxMedium& rMedium, PowerPointImportParam& rParam ) -: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() ) -, mrMed ( rMedium ) -, mrStorage ( rStorage_ ) -, mbDocumentFound ( FALSE ) -, mnFilterOptions ( 0 ) +: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() ) +, mrMed ( rMedium ) +, mrStorage ( rStorage_ ) +, mbDocumentFound ( FALSE ) +, mnFilterOptions ( 0 ) { mpDoc = pDocument; if ( bOk ) { - mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader + mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) ) mbDocumentFound = TRUE; @@ -299,10 +299,10 @@ sal_Bool ImplSdPPTImport::Import() aPropItem >> nSlideCount; if ( nSlideCount && pSection->GetProperty( PID_HEADINGPAIR, aPropItem ) ) { - UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0; - UINT32 nFontIndex, nFontCount = 0; - UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0; - UINT32 i, nTemp, nEntryCount = 0; + UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0; + UINT32 nFontIndex, nFontCount = 0; + UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0; + UINT32 i, nTemp, nEntryCount = 0; String aUString; @@ -405,7 +405,7 @@ sal_Bool ImplSdPPTImport::Import() { UINT32 i; - nPropCount /= 6; // 6 propertys a hyperlink + nPropCount /= 6; // 6 propertys a hyperlink SdHyperlinkEntry* pHyperlink = 0; for ( i = 0; i < nPropCount; i++ ) @@ -553,8 +553,8 @@ sal_Bool ImplSdPPTImport::Import() Size aVisAreaSize; switch ( aUserEditAtom.eLastViewType ) { - case 5 : // notes master - case 3 : // notes + case 5 : // notes master + case 3 : // notes aVisAreaSize = aDocAtom.GetNotesPageSize(); break; default : @@ -571,7 +571,7 @@ sal_Bool ImplSdPPTImport::Import() UINT32 nImportedPages = 0; { - UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE ); + UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE ); for ( USHORT nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ ) { @@ -633,7 +633,7 @@ sal_Bool ImplSdPPTImport::Import() aLayoutName += String::CreateFromInt32( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) ); ( (SdStyleSheetPool*)mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName ); } - else // Notizseite: Praesentationslayout von der Standardseite verwenden + else // Notizseite: Praesentationslayout von der Standardseite verwenden aLayoutName = ( (SdPage*)mpDoc->GetMasterPage( nMasterNum - 1 ) )->GetName(); } pPage->SetName( aLayoutName ); @@ -648,12 +648,12 @@ sal_Bool ImplSdPPTImport::Import() { UINT32 nTitleInstance = TSS_TYPE_PAGETITLE; UINT32 nOutlinerInstance = TSS_TYPE_BODY; -// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; -// if ( bSwapStyleSheet ) -// { -// nTitleInstance = TSS_TYPE_TITLE; -// nOutlinerInstance = TSS_TYPE_SUBTITLE; -// } +// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; +// if ( bSwapStyleSheet ) +// { +// nTitleInstance = TSS_TYPE_TITLE; +// nOutlinerInstance = TSS_TYPE_SUBTITLE; +// } ///////////////////// // titelstylesheet // ///////////////////// @@ -732,7 +732,7 @@ sal_Bool ImplSdPPTImport::Import() { SetPageNum( i, PPT_MASTERPAGE ); ///////////////////////////////////////////// - // importing master page objects // + // importing master page objects // ///////////////////////////////////////////// PptSlidePersistList* pList = GetPageList( eAktPageKind ); PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->Count() ) ) @@ -762,7 +762,7 @@ sal_Bool ImplSdPPTImport::Import() else pE = (*pList)[ nNextMaster ]; } - SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background + SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background if ( pObj ) pMPage->NbcInsertObject( pObj ); @@ -802,7 +802,7 @@ sal_Bool ImplSdPPTImport::Import() rStCtrl >> aHd2; if ( ( aHd2.nRecType == DFF_msofbtSpContainer ) || ( aHd2.nRecType == DFF_msofbtSpgrContainer ) ) { - if ( nObjCount++ ) // skipping the first object + if ( nObjCount++ ) // skipping the first object { Rectangle aEmpty; aHd2.SeekToBegOfRecord( rStCtrl ); @@ -879,7 +879,7 @@ sal_Bool ImplSdPPTImport::Import() } else { - // without StyleSheet, set attributes directly. This + // without StyleSheet, set attributes directly. This // should not be done at all and is an error (will be asserted by SdrPage) pMPage->getSdrPageProperties().ClearItem(); pMPage->getSdrPageProperties().PutItemSet(pObj->GetMergedItemSet()); @@ -895,12 +895,12 @@ sal_Bool ImplSdPPTImport::Import() pStbMgr->SetState( nImportedPages++ ); } //////////////////////////////////// - // importing slide pages // + // importing slide pages // //////////////////////////////////// { - UINT32 nFPosMerk = rStCtrl.Tell(); - PptPageKind ePageKind = eAktPageKind; - UINT16 nPageNum = nAktPageNum; + UINT32 nFPosMerk = rStCtrl.Tell(); + PptPageKind ePageKind = eAktPageKind; + UINT16 nPageNum = nAktPageNum; SdPage* pHandoutPage = (SdPage*)MakeBlancPage( FALSE ); pHandoutPage->SetPageKind( PK_HANDOUT ); @@ -927,8 +927,8 @@ sal_Bool ImplSdPPTImport::Import() pPage->SetLayoutName(((SdPage&)pPage->TRG_GetMasterPage()).GetLayoutName()); } pPage->SetPageKind( PK_STANDARD ); - pSdrModel->InsertPage( pPage ); // SJ: #i29625# because of form controls, the - ImportPage( pPage, pMasterPersist ); // page must be inserted before importing + pSdrModel->InsertPage( pPage ); // SJ: #i29625# because of form controls, the + ImportPage( pPage, pMasterPersist ); // page must be inserted before importing SetHeaderFooterPageSettings( pPage, pMasterPersist ); // CWS preseng01: pPage->SetPageKind( PK_STANDARD ); @@ -969,11 +969,11 @@ sal_Bool ImplSdPPTImport::Import() } break; - case PPT_PST_NewlyAddedAtomByXP11008 : // ??? + case PPT_PST_NewlyAddedAtomByXP11008 : // ??? break; - case PPT_PST_NewlyAddedAtomByXP12011 : // ??? don't know, this atom is always 8 bytes big - break; // and is appearing in nearly every l10 progtag + case PPT_PST_NewlyAddedAtomByXP12011 : // ??? don't know, this atom is always 8 bytes big + break; // and is appearing in nearly every l10 progtag } aProgTagContentHd.SeekToEndOfRecord( rStCtrl ); } @@ -1015,8 +1015,8 @@ sal_Bool ImplSdPPTImport::Import() } pNotesPage->SetPageKind( PK_NOTES ); pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum)); - pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the - ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing + pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the + ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing SetHeaderFooterPageSettings( pNotesPage, pMasterPersist2 ); pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, FALSE ); } @@ -1075,7 +1075,7 @@ sal_Bool ImplSdPPTImport::Import() rStCtrl.Seek( nFPosMerk ); } /////////////////////////////////////////////////////////////////// - // Handzettel und Notiz-Seiten erzeugen // + // Handzettel und Notiz-Seiten erzeugen // /////////////////////////////////////////////////////////////////// bOk = mpDoc->CreateMissingNotesAndHandoutPages(); if ( bOk ) @@ -1091,7 +1091,7 @@ sal_Bool ImplSdPPTImport::Import() const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); if ( pSlideLayout ) { - switch ( pSlideLayout->eLayout ) // Praesentationslayouts fuer Standard-Seiten + switch ( pSlideLayout->eLayout ) // Praesentationslayouts fuer Standard-Seiten { case PPT_LAYOUT_TITLEANDBODYSLIDE : { @@ -1189,11 +1189,11 @@ sal_Bool ImplSdPPTImport::Import() case PPT_LAYOUT_BOTTOMROW2COLUMNS : case PPT_LAYOUT_BLANCSLIDE : - case PPT_LAYOUT_MASTERSLIDE : // Layout der Standard- und Titel-MasterPage + case PPT_LAYOUT_MASTERSLIDE : // Layout der Standard- und Titel-MasterPage case PPT_LAYOUT_TITLEMASTERSLIDE : - case PPT_LAYOUT_MASTERNOTES : // Layout der Notizen-MasterPage - case PPT_LAYOUT_NOTESTITLEBODY : // Praesentationslayout fuer Notiz-Seiten - case PPT_LAYOUT_HANDOUTLAYOUT : // Praesentationslayout fuer Handzettelseiten + case PPT_LAYOUT_MASTERNOTES : // Layout der Notizen-MasterPage + case PPT_LAYOUT_NOTESTITLEBODY : // Praesentationslayout fuer Notiz-Seiten + case PPT_LAYOUT_HANDOUTLAYOUT : // Praesentationslayout fuer Handzettelseiten eAutoLayout = AUTOLAYOUT_NONE; break; } @@ -1202,7 +1202,7 @@ sal_Bool ImplSdPPTImport::Import() } } ////////////////////////////////////////////////////////////// - // Handzettel-MasterPage: Autolayout setzen // + // Handzettel-MasterPage: Autolayout setzen // ////////////////////////////////////////////////////////////// SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, TRUE, TRUE ); @@ -1239,44 +1239,44 @@ sal_Bool ImplSdPPTImport::Import() } if ( pFrameView ) { - sal_uInt16 nSelectedPage = 0; - PageKind ePageKind = PK_STANDARD; - EditMode eEditMode = EM_PAGE; + sal_uInt16 nSelectedPage = 0; + PageKind ePageKind = PK_STANDARD; + EditMode eEditMode = EM_PAGE; switch ( aUserEditAtom.eLastViewType ) { - case 7 : // outliner view + case 7 : // outliner view { SfxItemSet* pSet = mrMed.GetItemSet(); if ( pSet ) pSet->Put( SfxUInt16Item( SID_VIEW_ID, 3 ) ); } break; - case 8 : // slide sorter + case 8 : // slide sorter { SfxItemSet* pSet = mrMed.GetItemSet(); if ( pSet ) pSet->Put( SfxUInt16Item( SID_VIEW_ID, 2 ) ); } break; - case 10 : // titlemaster + case 10 : // titlemaster nSelectedPage = 1; - case 2 : // master + case 2 : // master { ePageKind = PK_STANDARD; eEditMode = EM_MASTERPAGE; } break; - case 5 : // notes master + case 5 : // notes master eEditMode = EM_MASTERPAGE; - case 3 : // notes + case 3 : // notes ePageKind = PK_NOTES; break; - case 4 : // handout + case 4 : // handout ePageKind = PK_HANDOUT; break; default : - case 1 : // normal + case 1 : // normal break; } pFrameView->SetPageKind( ePageKind ); @@ -1341,12 +1341,12 @@ sal_Bool ImplSdPPTImport::Import() } } // this is defaulted, maybe there is no SSDocInfoAtom - String aCustomShow; - sal_uInt32 nFlags = 1; // Bit 0: Auto advance - sal_uInt32 nPenColor = 0x1000000; - sal_Int32 nRestartTime = 0x7fffffff; - sal_uInt16 nStartSlide = 0; - sal_Int16 nEndSlide = 0; + String aCustomShow; + sal_uInt32 nFlags = 1; // Bit 0: Auto advance + sal_uInt32 nPenColor = 0x1000000; + sal_Int32 nRestartTime = 0x7fffffff; + sal_uInt16 nStartSlide = 0; + sal_Int16 nEndSlide = 0; // read the pres. configuration rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 ); @@ -1395,8 +1395,8 @@ sal_Bool ImplSdPPTImport::Import() rPresSettings.mbCustomShow = ( nFlags & 8 ) != 0; rPresSettings.mbEndless = ( nFlags & 0x80 ) != 0; rPresSettings.mbFullScreen = ( nFlags & 0x10 ) == 0; -// rPresSettings.mnPauseTimeout; -// rPresSettings.mbShowLogo; +// rPresSettings.mnPauseTimeout; +// rPresSettings.mbShowLogo; if ( nStartSlide && ( nStartSlide <= GetPageCount() ) ) { SdPage* pPage = mpDoc->GetSdPage( nStartSlide - 1, PK_STANDARD ); @@ -1531,7 +1531,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if ( pActualSlidePersist && ( eAktPageKind == PPT_SLIDEPAGE ) ) { - if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ? + if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ? { if(pPage->TRG_HasMasterPage()) { @@ -1569,12 +1569,12 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat sal_Int8 nDirection, nTransitionType, nByteDummy, nSpeed; sal_Int16 nBuildFlags; sal_Int32 nSlideTime, nSoundRef; - rStCtrl >> nSlideTime // Standzeit (in Ticks) - >> nSoundRef // Index in SoundCollection - >> nDirection // Richtung des Ueberblendeffekts - >> nTransitionType // Ueberblendeffekt - >> nBuildFlags // Buildflags (s.u.) - >> nSpeed // Geschwindigkeit (langsam, mittel, schnell) + rStCtrl >> nSlideTime // Standzeit (in Ticks) + >> nSoundRef // Index in SoundCollection + >> nDirection // Richtung des Ueberblendeffekts + >> nTransitionType // Ueberblendeffekt + >> nBuildFlags // Buildflags (s.u.) + >> nSpeed // Geschwindigkeit (langsam, mittel, schnell) >> nByteDummy >> nByteDummy >> nByteDummy; switch ( nTransitionType ) @@ -1598,21 +1598,21 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat case PPT_TRANSITION_TYPE_COVER : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_RIGHT ); // Von rechts ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_RIGHT ); // Von rechts ueberdecken else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_BOTTOM ); // Von unten ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_BOTTOM ); // Von unten ueberdecken else if ( nDirection == 2 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LEFT ); // Von links ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LEFT ); // Von links ueberdecken else if ( nDirection == 3 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_TOP ); // Von oben ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_TOP ); // Von oben ueberdecken else if ( nDirection == 4 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERRIGHT );// Von rechts unten ueberdecken ?? else if ( nDirection == 5 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERLEFT ); // Von links unten ueberdecken ?? + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERLEFT ); // Von links unten ueberdecken ?? else if ( nDirection == 6 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERRIGHT );// Von rechts oben ueberdecken else if ( nDirection == 7 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERLEFT ); // Von links oben ueberdecken ?? + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERLEFT ); // Von links oben ueberdecken ?? } break; case PPT_TRANSITION_TYPE_NONE : @@ -1620,7 +1620,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if ( nBuildFlags ) { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt else if ( nDirection == 1 ) { pPage->setTransitionType( animations::TransitionType::BARWIPE ); @@ -1633,22 +1633,22 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat } break; case PPT_TRANSITION_TYPE_DISSOLVE : - pPage->SetFadeEffect(::com::sun::star::presentation::FadeEffect_DISSOLVE); // Aufloesen + pPage->SetFadeEffect(::com::sun::star::presentation::FadeEffect_DISSOLVE); // Aufloesen break; case PPT_TRANSITION_TYPE_RANDOM_BARS : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_HORIZONTAL_LINES ); // Horizontale Linien + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_HORIZONTAL_LINES ); // Horizontale Linien else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_VERTICAL_LINES ); // Vertikale Linien + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_VERTICAL_LINES ); // Vertikale Linien } break; case PPT_TRANSITION_TYPE_SPLIT : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_VERTICAL ); // Horizontal oeffnen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_VERTICAL ); // Horizontal oeffnen else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_CLOSE_VERTICAL ); // Horizontal schliessen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_CLOSE_VERTICAL ); // Horizontal schliessen else if ( nDirection == 2 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_HORIZONTAL ); // Vertikal oeffnen else if ( nDirection == 3 ) @@ -1670,13 +1670,13 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat case PPT_TRANSITION_TYPE_PULL : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LEFT ); // Nach links aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LEFT ); // Nach links aufdecken else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_TOP ); // Nach oben aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_TOP ); // Nach oben aufdecken else if ( nDirection == 2 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_RIGHT ); // Nach rechts aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_RIGHT ); // Nach rechts aufdecken else if ( nDirection == 3 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_BOTTOM ); // Nach unten aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_BOTTOM ); // Nach unten aufdecken else if ( nDirection == 4 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_UPPERLEFT );// Nach links oben aufdecken else if ( nDirection == 5 ) @@ -1694,13 +1694,13 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat else if ( nDirection == 1 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_BOTTOM );// Von unten rollen else if ( nDirection == 2 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_LEFT ); // Von links rollen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_LEFT ); // Von links rollen else if ( nDirection == 3 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_TOP ); // Von oben rollen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_TOP ); // Von oben rollen } break; case PPT_TRANSITION_TYPE_RANDOM : - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_RANDOM ); // Automatisch + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_RANDOM ); // Automatisch break; case PPT_TRANSITION_TYPE_FADE : { @@ -1714,7 +1714,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if ( nDirection == 0 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_CENTER );// Von innen einblenden else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_TO_CENTER ); // Von aussen einblenden + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_TO_CENTER ); // Von aussen einblenden } break; case PPT_TRANSITION_TYPE_DIAMOND : @@ -1729,7 +1729,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat pPage->setTransitionSubtype( animations::TransitionSubType::CORNERSOUT ); } break; - case PPT_TRANSITION_TYPE_CIRCLE : + case PPT_TRANSITION_TYPE_CIRCLE : { pPage->setTransitionType( animations::TransitionType::ELLIPSEWIPE ); pPage->setTransitionSubtype( animations::TransitionSubType::CIRCLE ); @@ -1793,11 +1793,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat } if ( nSpeed == 0 ) - pPage->setTransitionDuration( 3.0 ); // langsam + pPage->setTransitionDuration( 3.0 ); // langsam else if ( nSpeed == 1 ) - pPage->setTransitionDuration( 2.0 ); // mittel + pPage->setTransitionDuration( 2.0 ); // mittel else if ( nSpeed == 2 ) - pPage->setTransitionDuration( 1.0 ); // schnell + pPage->setTransitionDuration( 1.0 ); // schnell if ( nBuildFlags & 0x400 ) // slidechange by time { // Standzeit (in Ticks) @@ -1807,20 +1807,20 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat else pPage->SetPresChange( mePresChange ); -// if ( nBuildFlags & 1 ) // slidechange by mouseclick -// pPage->SetPresChange( mePresChange ); +// if ( nBuildFlags & 1 ) // slidechange by mouseclick +// pPage->SetPresChange( mePresChange ); if ( nBuildFlags & 4 ) - pPage->SetExcluded( TRUE ); // Dia nicht anzeigen + pPage->SetExcluded( TRUE ); // Dia nicht anzeigen if ( nBuildFlags & 16 ) - { // Dia mit Soundeffekt + { // Dia mit Soundeffekt pPage->SetSound( TRUE ); String aSoundFile( ReadSound( nSoundRef ) ); pPage->SetSoundFile( aSoundFile ); } - if ( nBuildFlags & ( 1 << 6 ) ) // Loop until next sound + if ( nBuildFlags & ( 1 << 6 ) ) // Loop until next sound pPage->SetLoopSound( sal_True ); - if ( nBuildFlags & ( 1 << 8 ) ) // Stop the previous sound + if ( nBuildFlags & ( 1 << 8 ) ) // Stop the previous sound pPage->SetStopSound( sal_True ); break; } @@ -1942,16 +1942,16 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const // ueberpruefen, ob diese Sound-Datei schon // existiert. Wenn nicht, exportiere diese // in unser lokales Sound-Verzeichnis. - BOOL bSoundExists = FALSE; - List* pSoundList = new List(); + BOOL bSoundExists = FALSE; + List* pSoundList = new List(); GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, *pSoundList ); GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, *pSoundList ); for( ULONG n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ ) { - INetURLObject aURL( *(String*)pSoundList->GetObject( n ) ); - String aSoundName( aURL.GetName() ); + INetURLObject aURL( *(String*)pSoundList->GetObject( n ) ); + String aSoundName( aURL.GetName() ); if( aSoundName == aRetval ) { @@ -1971,8 +1971,8 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const DffRecordHeader aSoundDataRecHd; if ( SeekToRec( rStCtrl, PPT_PST_SoundData, nStrLen, &aSoundDataRecHd, 0 ) ) { - String aGalleryDir( SvtPathOptions().GetGalleryPath() ); - INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) ); + String aGalleryDir( SvtPathOptions().GetGalleryPath() ); + INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) ); aGalleryUserSound.Append( aRetval ); UINT32 nSoundDataLen = aSoundDataRecHd.nRecLen; @@ -2086,51 +2086,51 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv // Lokale Informationen in pInfo eintragen if( pIAtom->nSoundRef ) { - pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum Soundfile in MSDOS-Notation - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_SOUND; // RunProgramAction + pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum Soundfile in MSDOS-Notation + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_SOUND; // RunProgramAction } -// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren ) +// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren ) switch ( pIAtom->nAction ) { -// case 0x01 : // MacroAction -// { -// pInfo->meClickAction = ::com::sun::star::presentation::::com::sun::star::presentation::ClickAction_MACRO; -// // aMacro liegt in folgender Form vor: -// // "Macroname.Modulname.Libname.Dokumentname" oder -// // "Macroname.Modulname.Libname.Applikationsname" -// pInfo->maBookmark = aMacroName; -// } -// break; - case 0x02 : // RunProgramAction +// case 0x01 : // MacroAction +// { +// pInfo->meClickAction = ::com::sun::star::presentation::::com::sun::star::presentation::ClickAction_MACRO; +// // aMacro liegt in folgender Form vor: +// // "Macroname.Modulname.Libname.Dokumentname" oder +// // "Macroname.Modulname.Libname.Applikationsname" +// pInfo->maBookmark = aMacroName; +// } +// break; + case 0x02 : // RunProgramAction { pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PROGRAM; - pInfo->SetBookmark( aMacroName ); // Programmname in aBookmark + pInfo->SetBookmark( aMacroName ); // Programmname in aBookmark } break; - case 0x03 : // JumpAction + case 0x03 : // JumpAction { switch( pIAtom->nJump ) { case 0x01 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NEXTPAGE; // Next slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NEXTPAGE; // Next slide break; case 0x02 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Previous slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Previous slide break; case 0x03 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_FIRSTPAGE; // First slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_FIRSTPAGE; // First slide break; case 0x04 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_LASTPAGE; // last Slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_LASTPAGE; // last Slide break; case 0x05 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Last slide viewed + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Last slide viewed break; case 0x06 : pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_STOPPRESENTATION; // End show break; default : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NONE; // 0x00: no action, else unknown + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NONE; // 0x00: no action, else unknown break; } } @@ -2148,7 +2148,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv switch( pIAtom->nHyperlinkType ) { case 9: - case 8: // hyperlink : URL + case 8: // hyperlink : URL { if ( pPtr->aTarget.Len() ) { @@ -2172,7 +2172,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv case 10: break; - case 7: // hyperlink auf eine Seite + case 7: // hyperlink auf eine Seite { if ( pPtr->aConvSubString.Len() ) { @@ -2185,10 +2185,10 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv } } break; - case 0x05 : // OLEAction ( OLEVerb to use, 0==first, 1==secnd, .. ) - case 0x06 : // MediaAction - case 0x07 : // CustomShowAction - default : // 0x00: no action, else unknown action + case 0x05 : // OLEAction ( OLEVerb to use, 0==first, 1==secnd, .. ) + case 0x06 : // MediaAction + case 0x07 : // CustomShowAction + default : // 0x00: no action, else unknown action break; } } @@ -2196,9 +2196,9 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj, SdPage* pPage, SfxStyleSheet* pSheet, SfxStyleSheet** ppStyleSheetAry ) const { - SfxStyleSheet* pStyleSheetAry[ 9 ]; - SdrTextObj* pText = pObj; - SdrObject* pRet = pText; + SfxStyleSheet* pStyleSheetAry[ 9 ]; + SdrTextObj* pText = pObj; + SdrObject* pRet = pText; ppStyleSheetAry = NULL; @@ -2217,7 +2217,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj aPresentationText = pPage->GetPresObjText( ePresKind ); } break; - case PPT_PLACEHOLDER_MASTERBODY : + case PPT_PLACEHOLDER_MASTERBODY : { ePresKind = PRESOBJ_OUTLINE; aPresentationText = pPage->GetPresObjText( ePresKind ); @@ -2235,10 +2235,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj aPresentationText = pPage->GetPresObjText( ePresKind ); } break; - case PPT_PLACEHOLDER_MASTERDATE : ePresKind = PRESOBJ_DATETIME; break; - case PPT_PLACEHOLDER_MASTERSLIDENUMBER : ePresKind = PRESOBJ_SLIDENUMBER;break; - case PPT_PLACEHOLDER_MASTERFOOTER : ePresKind = PRESOBJ_FOOTER; break; - case PPT_PLACEHOLDER_MASTERHEADER : ePresKind = PRESOBJ_HEADER; break; + case PPT_PLACEHOLDER_MASTERDATE : ePresKind = PRESOBJ_DATETIME; break; + case PPT_PLACEHOLDER_MASTERSLIDENUMBER : ePresKind = PRESOBJ_SLIDENUMBER;break; + case PPT_PLACEHOLDER_MASTERFOOTER : ePresKind = PRESOBJ_FOOTER; break; + case PPT_PLACEHOLDER_MASTERHEADER : ePresKind = PRESOBJ_HEADER; break; } } switch ( pTextObj->GetDestinationInstance() ) @@ -2395,15 +2395,15 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj bEmptyPresObj = sal_False; switch ( nPlaceholderId ) { - case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; + case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PPT_PLACEHOLDER_VERTICALTEXTTITLE : bVertical = sal_True; // PASSTHROUGH !!! - case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; + case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; case PPT_PLACEHOLDER_VERTICALTEXTBODY : bVertical = sal_True; // PASSTHROUGH !!! - case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; - case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; - case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE + case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; + case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; + case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE default : { @@ -2460,7 +2460,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj Rectangle aTitleRect; Rectangle aOutlineRect; - Size aOutlineSize; + Size aOutlineSize; if ( pTitleObj ) aTitleRect = pTitleObj->GetLogicRect(); @@ -2470,11 +2470,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj aOutlineSize = aOutlineRect.GetSize(); } Rectangle aLogicRect( pPresObj->GetLogicRect() ); - Size aLogicSize( aLogicRect.GetSize() ); + Size aLogicSize( aLogicRect.GetSize() ); switch ( pSlideLayout->aPlacementId[ i ] ) { - case 0 : // Lage im Titelbereich + case 0 : // Lage im Titelbereich { if ( aLogicRect != aTitleRect ) pPresObj->SetUserCall( NULL ); @@ -2484,23 +2484,23 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case 1: { if ( pSlideLayout->eLayout == PPT_LAYOUT_TITLEANDBODYSLIDE ) - { // Lage im Outlinebereich + { // Lage im Outlinebereich if ( aLogicRect != aOutlineRect ) pPresObj->SetUserCall( NULL ); } else if ( pSlideLayout->eLayout == PPT_LAYOUT_2COLUMNSANDTITLE ) - { // Lage im Outlinebereich links - if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || - Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || + { // Lage im Outlinebereich links + if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || + Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || - aLogicSize.Width() / aOutlineSize.Width() < 0.48 || - aLogicSize.Width() / aOutlineSize.Width() > 0.5) + aLogicSize.Width() / aOutlineSize.Width() < 0.48 || + aLogicSize.Width() / aOutlineSize.Width() > 0.5) { pPresObj->SetUserCall(NULL); } } else if ( pSlideLayout->eLayout == PPT_LAYOUT_2ROWSANDTITLE ) - { // Lage im Outlinebereich oben + { // Lage im Outlinebereich oben if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE) @@ -2510,7 +2510,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } else if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE) - { // Lage im Outlinebereich links oben + { // Lage im Outlinebereich links oben pPresObj->SetUserCall( NULL ); } } @@ -2519,36 +2519,36 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case 2: { if ( pSlideLayout->eLayout == PPT_LAYOUT_2COLUMNSANDTITLE ) - { // Lage im Outlinebereich rechts - if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || - Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || + { // Lage im Outlinebereich rechts + if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || + Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || - aLogicSize.Width() / aOutlineSize.Width() < 0.48 || - aLogicSize.Width() / aOutlineSize.Width() > 0.5) + aLogicSize.Width() / aOutlineSize.Width() < 0.48 || + aLogicSize.Width() / aOutlineSize.Width() > 0.5) { pPresObj->SetUserCall( NULL ); } } else if ( pSlideLayout->eLayout == PPT_LAYOUT_2ROWSANDTITLE ) - { // Lage im Outlinebereich unten - if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || + { // Lage im Outlinebereich unten + if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || - Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE) + Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE) { pPresObj->SetUserCall( NULL ); } } else if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || - Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE) - { // Lage im Outlinebereich rechts oben + Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE) + { // Lage im Outlinebereich rechts oben pPresObj->SetUserCall(NULL); } } break; case 3: - { // Lage im Outlinebereich links unten - if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || + { // Lage im Outlinebereich links unten + if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE) { pPresObj->SetUserCall( NULL ); @@ -2557,8 +2557,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; case 4: - { // Lage im Outlinebereich rechts unten - if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || + { // Lage im Outlinebereich rechts unten + if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE) { pObj->SetUserCall( NULL ); @@ -2567,7 +2567,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; } } - pRet = NULL; // return zero cause this obj was already inserted by CreatePresObj + pRet = NULL; // return zero cause this obj was already inserted by CreatePresObj } } else if ( !pTextObj->Count() ) @@ -2711,7 +2711,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi } //-- - SdrObject::Free( pObj ), pObj = pMediaObj; // SJ: hoping that pObj is not inserted in any list + SdrObject::Free( pObj ), pObj = pMediaObj; // SJ: hoping that pObj is not inserted in any list pMediaObj->setURL( aMediaURL ); } } diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index f45505d75e1f..f7bebc216285 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,34 +57,34 @@ typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVect class ImplSdPPTImport : public SdrPowerPointImport { - SfxMedium& mrMed; - SvStorage& mrStorage; -// SvStream* mpPicStream; - DffRecordHeader maDocHd; - List maSlideNameList; - BOOL mbDocumentFound; - sal_uInt32 mnFilterOptions; - SdDrawDocument* mpDoc; - PresChange mePresChange; - SdrLayerID mnBackgroundLayerID; - SdrLayerID mnBackgroundObjectsLayerID; + SfxMedium& mrMed; + SvStorage& mrStorage; +// SvStream* mpPicStream; + DffRecordHeader maDocHd; + List maSlideNameList; + BOOL mbDocumentFound; + sal_uInt32 mnFilterOptions; + SdDrawDocument* mpDoc; + PresChange mePresChange; + SdrLayerID mnBackgroundLayerID; + SdrLayerID mnBackgroundObjectsLayerID; tAnimationMap maAnimations; - void SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist ); - void ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ); + void SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist ); + void ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ); void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, String aMacroName ); - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); - virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); + virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, SfxStyleSheet*, SfxStyleSheet** ) const; public: - String ReadSound( sal_uInt32 nSoundRef ) const; - String ReadMedia( sal_uInt32 nMediaRef ) const; - + String ReadSound( sal_uInt32 nSoundRef ) const; + String ReadMedia( sal_uInt32 nMediaRef ) const; + ImplSdPPTImport( SdDrawDocument* pDoc, SvStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& ); ~ImplSdPPTImport(); diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 21a776ef77c1..8e13691fa848 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -266,7 +266,7 @@ void AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRe processAfterEffectNodes(); } } - + #ifdef DBG_ANIM_LOG fclose( mpFile ); #endif @@ -367,7 +367,7 @@ static bool is_random( const AnimationNode& rNode, const PropertySet& rSet, sal_ switch( nPresetClass ) { - case DFF_ANIM_PRESS_CLASS_ENTRANCE: rPresetClass = EffectPresetClass::ENTRANCE; return true; + case DFF_ANIM_PRESS_CLASS_ENTRANCE: rPresetClass = EffectPresetClass::ENTRANCE; return true; case DFF_ANIM_PRESS_CLASS_EXIT: rPresetClass = EffectPresetClass::EXIT; return true; } return false; @@ -423,7 +423,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer dump( "<par" ); dump( aNode ); dump( aSet ); - importTimeContainer( pAtom, xNode ); + importTimeContainer( pAtom, xNode ); dump( "</par>\n" ); // for iteration containers, map target from childs to iteration @@ -474,7 +474,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer dump( "<seq" ); dump( aNode ); dump( aSet ); - importTimeContainer( pAtom, xNode ); + importTimeContainer( pAtom, xNode ); dump( "</seq>\n" ); if( aSet.hasProperty( DFF_ANIM_NODE_TYPE ) ) @@ -555,7 +555,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer dump( "<audio" ); dump( aNode ); dump( aSet ); - importAudioContainer( pAtom, xNode ); + importAudioContainer( pAtom, xNode ); dump( "</audio>\n" ); } break; @@ -814,7 +814,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& if( nMasterRel != 2 ) { Event aEvent; - + aEvent.Source <<= xParent; aEvent.Trigger = EventTrigger::END_EVENT; aEvent.Repeat = 0; @@ -1086,7 +1086,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId // strips switch( nPresetSubType ) { - case 3: pStr = "right-to-top"; break; + case 3: pStr = "right-to-top"; break; case 6: pStr = "right-to-bottom"; break; case 9: pStr = "left-to-top"; break; case 12: pStr = "left-to-bottom"; break; @@ -1185,11 +1185,11 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim sal_Int16 nNodeType = ::com::sun::star::presentation::EffectNodeType::DEFAULT; switch( nPPTNodeType ) { - case DFF_ANIM_NODE_TYPE_ON_CLICK: nNodeType = ::com::sun::star::presentation::EffectNodeType::ON_CLICK; break; - case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS; break; - case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::AFTER_PREVIOUS; break; - case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: nNodeType = ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE; break; - case DFF_ANIM_NODE_TYPE_TIMING_ROOT: nNodeType = ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; break; + case DFF_ANIM_NODE_TYPE_ON_CLICK: nNodeType = ::com::sun::star::presentation::EffectNodeType::ON_CLICK; break; + case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS; break; + case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::AFTER_PREVIOUS; break; + case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: nNodeType = ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE; break; + case DFF_ANIM_NODE_TYPE_TIMING_ROOT: nNodeType = ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; break; case DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ:nNodeType = ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE; break; } @@ -1222,12 +1222,12 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim { switch( nPresetClass ) { - case DFF_ANIM_PRESS_CLASS_ENTRANCE: nEffectPresetClass = EffectPresetClass::ENTRANCE; break; - case DFF_ANIM_PRESS_CLASS_EXIT: nEffectPresetClass = EffectPresetClass::EXIT; break; - case DFF_ANIM_PRESS_CLASS_EMPHASIS: nEffectPresetClass = EffectPresetClass::EMPHASIS; break; - case DFF_ANIM_PRESS_CLASS_MOTIONPATH: nEffectPresetClass = EffectPresetClass::MOTIONPATH; break; - case DFF_ANIM_PRESS_CLASS_OLE_ACTION: nEffectPresetClass = EffectPresetClass::OLEACTION; break; - case DFF_ANIM_PRESS_CLASS_MEDIACALL: nEffectPresetClass = EffectPresetClass::MEDIACALL; break; + case DFF_ANIM_PRESS_CLASS_ENTRANCE: nEffectPresetClass = EffectPresetClass::ENTRANCE; break; + case DFF_ANIM_PRESS_CLASS_EXIT: nEffectPresetClass = EffectPresetClass::EXIT; break; + case DFF_ANIM_PRESS_CLASS_EMPHASIS: nEffectPresetClass = EffectPresetClass::EMPHASIS; break; + case DFF_ANIM_PRESS_CLASS_MOTIONPATH: nEffectPresetClass = EffectPresetClass::MOTIONPATH; break; + case DFF_ANIM_PRESS_CLASS_OLE_ACTION: nEffectPresetClass = EffectPresetClass::OLEACTION; break; + case DFF_ANIM_PRESS_CLASS_MEDIACALL: nEffectPresetClass = EffectPresetClass::MEDIACALL; break; } sal_Int32 nSize = aUserData.getLength(); aUserData.realloc(nSize+1); @@ -1343,7 +1343,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim if( aString.getLength() ) { sal_Int32 nElements = 1; // a non empty string has at least one value - + sal_Int32 fromIndex = 0; while(true) { @@ -1354,7 +1354,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim fromIndex++; nElements++; } - + Sequence< TimeFilterPair > aTimeFilter( nElements ); TimeFilterPair* pValues = aTimeFilter.getArray(); @@ -1373,7 +1373,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim } xAnim->setTimeFilter( aTimeFilter ); - } + } } } @@ -1480,7 +1480,7 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< switch( nTextUnitEffect ) { case 1: nIterateType = TextAnimationType::BY_WORD; break; - case 2: nIterateType = TextAnimationType::BY_LETTER; break; + case 2: nIterateType = TextAnimationType::BY_LETTER; break; } xIter->setIterateType( nIterateType ); xIter->setIterateInterval( (double)fInterval ); @@ -1518,7 +1518,7 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< pChildAtom = pAtom->findNextChildAtom( pChildAtom ); } - } + } } // -------------------------------------------------------------------- @@ -1572,7 +1572,7 @@ void AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const R case DFF_msofbtAnimateMotion: importAnimateMotionContainer( pChildAtom, xNode ); break; - + case DFF_msofbtAnimCommand: importCommandContainer( pChildAtom, xNode ); break; @@ -1587,8 +1587,8 @@ void AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const R } pChildAtom = pAtom->findNextChildAtom( pChildAtom ); - } - } + } + } } // -------------------------------------------------------------------- @@ -1739,7 +1739,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom sal_Int16 nTemp = AnimationAdditiveMode::BASE; switch( nAdditive ) { - case 1: nTemp = AnimationAdditiveMode::SUM; break; + case 1: nTemp = AnimationAdditiveMode::SUM; break; case 2: nTemp = AnimationAdditiveMode::REPLACE; break; case 3: nTemp = AnimationAdditiveMode::MULTIPLY; break; case 4: nTemp = AnimationAdditiveMode::NONE; break; @@ -2246,7 +2246,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen switch( nType ) { - case 0: // event + case 0: // event case 1: // call if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "onstopaudio" ) ) ) { @@ -2544,7 +2544,7 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const pChildAtom = pAtom->findNextChildAtom( pChildAtom ); } - } + } } // -------------------------------------------------------------------- @@ -2756,8 +2756,8 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen dump( ";" ); if( aValues[i] >>= aStr ) - dump( "%s", - ::rtl::OUStringToOString( aStr, + dump( "%s", + ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValues[i] >>= nVal ) dump( "%f", nVal ); @@ -2768,8 +2768,8 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen if( aValues[i] >>= aValuePair ) { if( aValuePair.First >>= aStr ) - dump( "%s", - ::rtl::OUStringToOString( aStr, + dump( "%s", + ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.First >>= nVal ) dump( "%f", nVal ); @@ -2777,8 +2777,8 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen dump( "%X", (sal_Int32)&aValuePair.First ); if( aValuePair.Second >>= aStr ) - dump( ",%s", - ::rtl::OUStringToOString( aStr, + dump( ",%s", + ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.Second >>= nVal ) dump( ",%f", nVal ); @@ -2827,7 +2827,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) break; case DFF_ANIM_PROP_TYPE_INT32 : - { + { if ( nRecLen == 5 ) { sal_uInt32 nInt32; @@ -3067,10 +3067,10 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An switch( nRefMode ) { -// default case 0: rSubType = ShapeAnimationSubType::AS_WHOLE; break; +// default case 0: rSubType = ShapeAnimationSubType::AS_WHOLE; break; case 6: rSubType = ShapeAnimationSubType::ONLY_BACKGROUND; break; case 8: rSubType = ShapeAnimationSubType::ONLY_TEXT; break; - case 2: // one paragraph + case 2: // one paragraph { if( ((begin == -1) && (end == -1)) || !pSdrObject->ISA( SdrTextObj ) ) break; @@ -3113,7 +3113,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An case 2: // sound { - OUString aSoundURL( ((ImplSdPPTImport*)mpPPTImport)->ReadSound( nRefId ) ); + OUString aSoundURL( ((ImplSdPPTImport*)mpPPTImport)->ReadSound( nRefId ) ); rTarget <<= aSoundURL; dump( " srcRef=\"%s\"", aSoundURL ); } @@ -3133,14 +3133,14 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An } -// dump( " ref=\"%s\"", nRefMode == 3 ? "source" : ( nRefMode == 0 ? "target" : "unknown" ) ); -// dump( " type=\"%s\"", nRefType == 1 ? "shape" : ( nRefType == 2 ? "sound": "unknown" ) ); -// dump( " id=\"%lu\"", (sal_Int32)nRefId ); +// dump( " ref=\"%s\"", nRefMode == 3 ? "source" : ( nRefMode == 0 ? "target" : "unknown" ) ); +// dump( " type=\"%s\"", nRefType == 1 ? "shape" : ( nRefType == 2 ? "sound": "unknown" ) ); +// dump( " id=\"%lu\"", (sal_Int32)nRefId ); #ifdef DBG_ANIM_LOG if((begin != -1) || (end != -1) ) { -// dump( " text_begin=\"%ld\"", begin ); -// dump( " text_end=\"%ld\"", end ); +// dump( " text_begin=\"%ld\"", begin ); +// dump( " text_end=\"%ld\"", end ); } #endif } @@ -3149,9 +3149,9 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An { sal_Int32 nU1; mrStCtrl >> nU1; - + // HINT: nU1 == 1 : target document. ? -// dump( " unknown_0x2b01=\"%#lx\"", nU1 ); +// dump( " unknown_0x2b01=\"%#lx\"", nU1 ); } break; default: @@ -3209,7 +3209,7 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA { case DFF_msofbtAnimEvent: pTitle = "AnimEvent"; break; case DFF_msofbtAnimTrigger: pTitle = "AnimTrigger"; break; - case DFF_msofbtAnimateMotion: pTitle = "AnimateMotion"; break; + case DFF_msofbtAnimateMotion: pTitle = "AnimateMotion"; break; case DFF_msofbtAnimPropertySet: pTitle = "AnimPropertySet"; break; case DFF_msofbtAnimateAttributeNames: pTitle = "AnimAttributeName"; break; case DFF_msofbtAnimAttributeValue: pTitle = "AnimAttributeValue"; break; @@ -3244,7 +3244,7 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA { fprintf(mpFile, "<%s", pTitle ); - fprintf(mpFile, " instance=\"%hu\"%s", + fprintf(mpFile, " instance=\"%hu\"%s", pAtom->getInstance(), bAppend ? "" : ">\n"); } @@ -3325,7 +3325,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) else { if( pChildAtom->seekToContent() ) - { + { fprintf(mpFile, " value=\"" ); dump_atom( pChildAtom, false ); fprintf(mpFile, "\""); @@ -3419,7 +3419,7 @@ void AnimationImporter::dump( const AnimationNode& rNode ) fprintf(mpFile," restart=\"%s\"", rNode.mnRestart == 1 ? "always" : (rNode.mnRestart == 2 ? "whenOff" : (rNode.mnRestart == 3 ? "never" : "unknown")) ); } - + if( rNode.mnFill ) { fprintf(mpFile," fill=\"%s\"", @@ -3436,7 +3436,7 @@ void AnimationImporter::dump( const AnimationNode& rNode ) { fprintf(mpFile, " dur=\"indefinite\"" ); } - + if( rNode.mnU1 ) fprintf(mpFile," u1=\"%#lx\"", rNode.mnU1); if( rNode.mnU3 ) fprintf(mpFile," u3=\"%#lx\"", rNode.mnU3); if( rNode.mnU4 ) fprintf(mpFile," u4=\"%#lx\"", rNode.mnU4); @@ -3487,7 +3487,7 @@ void AnimationImporter::dump( Any& rAny ) } else if( rAny >>= aEvent ) { - static const char* triggers[] = + static const char* triggers[] = { "none","onbegin","onend","begin", "end","onclick","ondoubleclick","onmouseenter", @@ -3543,7 +3543,7 @@ void AnimationImporter::dump( const PropertySet& rSet ) break; case DFF_ANIM_DIRECTION: -// case DFF_ANIM_MASTERREL: +// case DFF_ANIM_MASTERREL: { sal_Bool bDirection; if( aAny >>= bDirection ) @@ -3557,13 +3557,13 @@ void AnimationImporter::dump( const PropertySet& rSet ) if( aAny >>= nMasterRel ) { fprintf( mpFile, " direction=\"%s\"", nMasterRel == 0 ? "sameClick" : ( nMasterRel == 2 ? "nextClick" : "lastClick" ) ); - bKnown = true; + bKnown = true; } } } break; - case DFF_ANIM_OVERRIDE: // TODO + case DFF_ANIM_OVERRIDE: // TODO { sal_Int32 nOverride; if( aAny >>= nOverride ) @@ -3615,13 +3615,13 @@ void AnimationImporter::dump( const PropertySet& rSet ) const char* pMode; switch( nPresetClass ) { - case DFF_ANIM_PRESS_CLASS_USER_DEFINED: pMode = "userdefined"; break; - case DFF_ANIM_PRESS_CLASS_ENTRANCE: pMode = "entrance"; break; - case DFF_ANIM_PRESS_CLASS_EXIT: pMode = "exit"; break; - case DFF_ANIM_PRESS_CLASS_EMPHASIS: pMode = "emphasis"; break; - case DFF_ANIM_PRESS_CLASS_MOTIONPATH: pMode = "motionpath"; break; - case DFF_ANIM_PRESS_CLASS_OLE_ACTION: pMode = "oleaction"; break; - case DFF_ANIM_PRESS_CLASS_MEDIACALL: pMode = "mediacall"; break; + case DFF_ANIM_PRESS_CLASS_USER_DEFINED: pMode = "userdefined"; break; + case DFF_ANIM_PRESS_CLASS_ENTRANCE: pMode = "entrance"; break; + case DFF_ANIM_PRESS_CLASS_EXIT: pMode = "exit"; break; + case DFF_ANIM_PRESS_CLASS_EMPHASIS: pMode = "emphasis"; break; + case DFF_ANIM_PRESS_CLASS_MOTIONPATH: pMode = "motionpath"; break; + case DFF_ANIM_PRESS_CLASS_OLE_ACTION: pMode = "oleaction"; break; + case DFF_ANIM_PRESS_CLASS_MEDIACALL: pMode = "mediacall"; break; default: { static char buffer[128]; @@ -3645,11 +3645,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) const char* pNode; switch( nNodeType ) { - case DFF_ANIM_NODE_TYPE_ON_CLICK: pNode = "onclick"; break; - case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: pNode = "withprevious"; break; - case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: pNode = "afterprevious"; break; - case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: pNode = "mainsequence"; break; - case DFF_ANIM_NODE_TYPE_TIMING_ROOT: pNode = "timingroot"; break; + case DFF_ANIM_NODE_TYPE_ON_CLICK: pNode = "onclick"; break; + case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: pNode = "withprevious"; break; + case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: pNode = "afterprevious"; break; + case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: pNode = "mainsequence"; break; + case DFF_ANIM_NODE_TYPE_TIMING_ROOT: pNode = "timingroot"; break; case DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ:pNode = "interactivesequence"; break; default : { diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 4275904698ae..c984bea6d221 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class SvStream; class ImplSdPPTImport; namespace ppt -{ +{ class PropertySet; class Atom; @@ -93,19 +93,19 @@ private: void fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); - + void processAfterEffectNodes(); - ::com::sun::star::uno::Any implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); - sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); + ::com::sun::star::uno::Any implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); + sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode; ImplSdPPTImport* mpPPTImport; - SvStream& mrStCtrl; + SvStream& mrStCtrl; - sd::AfterEffectNodeList maAfterEffectNodes; + sd::AfterEffectNodeList maAfterEffectNodes; #ifdef DBG_ANIM_LOG FILE * mpFile; diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index e711263291c8..3da9b256f0b2 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,32 +38,32 @@ struct PropEntry { - sal_uInt32 mnId; - sal_uInt32 mnSize; - sal_uInt16 mnTextEnc; - sal_uInt8* mpBuf; + sal_uInt32 mnId; + sal_uInt32 mnSize; + sal_uInt16 mnTextEnc; + sal_uInt8* mpBuf; PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc ); PropEntry( const PropEntry& rProp ); ~PropEntry() { delete[] mpBuf; } ; - const PropEntry& operator=(const PropEntry& rPropEntry); + const PropEntry& operator=(const PropEntry& rPropEntry); }; PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc ) : - mnId ( nId ), - mnSize ( nBufSize ), - mnTextEnc ( nTextEnc ), - mpBuf ( new sal_uInt8[ nBufSize ] ) + mnId ( nId ), + mnSize ( nBufSize ), + mnTextEnc ( nTextEnc ), + mpBuf ( new sal_uInt8[ nBufSize ] ) { memcpy( (void*)mpBuf, (void*)pBuf, nBufSize ); }; PropEntry::PropEntry( const PropEntry& rProp ) : - mnId ( rProp.mnId ), - mnSize ( rProp.mnSize ), - mnTextEnc ( rProp.mnTextEnc ), - mpBuf ( new sal_uInt8[ mnSize ] ) + mnId ( rProp.mnId ), + mnSize ( rProp.mnSize ), + mnTextEnc ( rProp.mnTextEnc ), + mpBuf ( new sal_uInt8[ mnSize ] ) { memcpy( (void*)mpBuf, (void*)rProp.mpBuf, mnSize ); }; @@ -82,7 +82,7 @@ const PropEntry& PropEntry::operator=(const PropEntry& rPropEntry) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void PropItem::Clear() { @@ -90,7 +90,7 @@ void PropItem::Clear() delete[] (sal_uInt8*)SwitchBuffer(); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize) { @@ -105,8 +105,8 @@ static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize) BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) { - sal_uInt32 i, nItemSize, nType, nItemPos; - sal_Bool bRetValue = sal_False; + sal_uInt32 i, nItemSize, nType, nItemPos; + sal_Bool bRetValue = sal_False; nItemPos = Tell(); @@ -160,7 +160,7 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) } } if ( bAlign ) - SeekRel( ( 4 - ( nItemSize & 3 ) ) & 3 ); // dword align + SeekRel( ( 4 - ( nItemSize & 3 ) ) & 3 ); // dword align } break; @@ -189,7 +189,7 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) } } if ( bAlign && ( nItemSize & 1 ) ) - SeekRel( 2 ); // dword align + SeekRel( 2 ); // dword align } break; } @@ -198,7 +198,7 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) return bRetValue; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropItem& PropItem::operator=( PropItem& rPropItem ) { @@ -216,17 +216,17 @@ PropItem& PropItem::operator=( PropItem& rPropItem ) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- struct Dict { - sal_uInt32 mnId; - String aString; + sal_uInt32 mnId; + String aString; Dict( sal_uInt32 nId, String rString ) { mnId = nId; aString = rString; }; }; -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Dictionary::~Dictionary() { @@ -234,11 +234,11 @@ Dictionary::~Dictionary() delete (Dict*)pPtr; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void Dictionary::AddProperty( sal_uInt32 nId, const String& rString ) { - if ( rString.Len() ) // eindeutige namen bei properties + if ( rString.Len() ) // eindeutige namen bei properties { // pruefen, ob es die Propertybeschreibung in der Dictionary schon gibt for ( Dict* pDict = (Dict*)First(); pDict; pDict = (Dict*)Next() ) @@ -253,7 +253,7 @@ void Dictionary::AddProperty( sal_uInt32 nId, const String& rString ) } } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- UINT32 Dictionary::GetProperty( const String& rString ) { @@ -265,7 +265,7 @@ UINT32 Dictionary::GetProperty( const String& rString ) return 0; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Dictionary& Dictionary::operator=( Dictionary& rDictionary ) { @@ -282,7 +282,7 @@ Dictionary& Dictionary::operator=( Dictionary& rDictionary ) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section::Section( Section& rSection ) : List() @@ -294,7 +294,7 @@ Section::Section( Section& rSection ) Insert( new PropEntry( *pProp ), LIST_APPEND ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section::Section( const sal_uInt8* pFMTID ) { @@ -303,7 +303,7 @@ Section::Section( const sal_uInt8* pFMTID ) aFMTID[ i ] = pFMTID[ i ]; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) { @@ -327,7 +327,7 @@ sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) return sal_False; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ) { @@ -353,7 +353,7 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu Insert( new PropEntry( nId, pBuf, nBufSize, mnTextEnc ), LIST_APPEND ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- sal_Bool Section::GetDictionary( Dictionary& rDict ) { @@ -412,7 +412,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict ) return bRetValue; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section::~Section() { @@ -420,7 +420,7 @@ Section::~Section() delete pProp; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void Section::Read( SvStorageStream *pStrm ) { @@ -438,7 +438,7 @@ void Section::Read( SvStorageStream *pStrm ) *pStrm >> nPropId >> nPropOfs; nCurrent = pStrm->Tell(); pStrm->Seek( nPropOfs + nSecOfs ); - if ( nPropId ) // dictionary wird nicht eingelesen + if ( nPropId ) // dictionary wird nicht eingelesen { *pStrm >> nPropType; @@ -601,7 +601,7 @@ void Section::Read( SvStorageStream *pStrm ) pStrm->Seek( nSecOfs + nSecSize ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section& Section::operator=( Section& rSection ) { @@ -619,14 +619,14 @@ Section& Section::operator=( Section& rSection ) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropRead::PropRead( SvStorage& rStorage, const String& rName ) : - mbStatus ( sal_False ), - mnByteOrder ( 0xfffe ), - mnFormat ( 0 ), - mnVersionLo ( 4 ), - mnVersionHi ( 2 ) + mbStatus ( sal_False ), + mnByteOrder ( 0xfffe ), + mnFormat ( 0 ), + mnVersionLo ( 4 ), + mnVersionHi ( 2 ) { if ( rStorage.IsStream( rName ) ) { @@ -640,14 +640,14 @@ PropRead::PropRead( SvStorage& rStorage, const String& rName ) : } } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void PropRead::AddSection( Section& rSection ) { Insert( new Section( rSection ), LIST_APPEND ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) { @@ -661,7 +661,7 @@ const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) return pSection; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropRead::~PropRead() { @@ -669,7 +669,7 @@ PropRead::~PropRead() delete pSection; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void PropRead::Read() { @@ -678,16 +678,16 @@ void PropRead::Read() Clear(); if ( mbStatus ) { - sal_uInt32 nSections; - sal_uInt32 nSectionOfs; - sal_uInt32 nCurrent; + sal_uInt32 nSections; + sal_uInt32 nSectionOfs; + sal_uInt32 nCurrent; *mpSvStream >> mnByteOrder >> mnFormat >> mnVersionLo >> mnVersionHi; if ( mnByteOrder == 0xfffe ) { - sal_uInt8* pSectCLSID = new sal_uInt8[ 16 ]; + sal_uInt8* pSectCLSID = new sal_uInt8[ 16 ]; mpSvStream->Read( mApplicationCLSID, 16 ); *mpSvStream >> nSections; - if ( nSections > 2 ) // sj: PowerPoint documents are containing max 2 sections + if ( nSections > 2 ) // sj: PowerPoint documents are containing max 2 sections { mbStatus = sal_False; } @@ -707,7 +707,7 @@ void PropRead::Read() } } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropRead& PropRead::operator=( PropRead& rPropRead ) { diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index b268fb3d019d..9ce6b9eb33f4 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,86 +39,86 @@ #include <tools/string.hxx> // SummaryInformation -#define PID_TITLE 0x02 -#define PID_SUBJECT 0x03 -#define PID_AUTHOR 0x04 -#define PID_KEYWORDS 0x05 -#define PID_COMMENTS 0x06 -#define PID_TEMPLATE 0x07 -#define PID_LASTAUTHOR 0x08 -#define PID_REVNUMBER 0x09 -#define PID_EDITTIME 0x0a -#define PID_LASTPRINTED_DTM 0x0b -#define PID_CREATE_DTM 0x0c -#define PID_LASTSAVED_DTM 0x0d +#define PID_TITLE 0x02 +#define PID_SUBJECT 0x03 +#define PID_AUTHOR 0x04 +#define PID_KEYWORDS 0x05 +#define PID_COMMENTS 0x06 +#define PID_TEMPLATE 0x07 +#define PID_LASTAUTHOR 0x08 +#define PID_REVNUMBER 0x09 +#define PID_EDITTIME 0x0a +#define PID_LASTPRINTED_DTM 0x0b +#define PID_CREATE_DTM 0x0c +#define PID_LASTSAVED_DTM 0x0d // DocumentSummaryInformation -#define PID_CATEGORY 0x02 -#define PID_PRESFORMAT 0x03 -#define PID_BYTECOUNT 0x04 -#define PID_LINECOUNT 0x05 -#define PID_PARACOUNT 0x06 -#define PID_SLIDECOUNT 0x07 -#define PID_NOTECOUNT 0x08 -#define PID_HIDDENCOUNT 0x09 -#define PID_MMCLIPCOUNT 0x0a -#define PID_SCALE 0x0b -#define PID_HEADINGPAIR 0x0c -#define PID_DOCPARTS 0x0d -#define PID_MANAGER 0x0e -#define PID_COMPANY 0x0f -#define PID_LINKSDIRTY 0x10 - -#define VT_EMPTY 0 -#define VT_NULL 1 -#define VT_I2 2 -#define VT_I4 3 -#define VT_R4 4 -#define VT_R8 5 -#define VT_CY 6 -#define VT_DATE 7 -#define VT_BSTR 8 -#define VT_UI4 9 -#define VT_ERROR 10 -#define VT_BOOL 11 -#define VT_VARIANT 12 -#define VT_DECIMAL 14 -#define VT_I1 16 -#define VT_UI1 17 -#define VT_UI2 18 -#define VT_I8 20 -#define VT_UI8 21 -#define VT_INT 22 -#define VT_UINT 23 -#define VT_LPSTR 30 -#define VT_LPWSTR 31 -#define VT_FILETIME 64 -#define VT_BLOB 65 -#define VT_STREAM 66 -#define VT_STORAGE 67 -#define VT_STREAMED_OBJECT 68 -#define VT_STORED_OBJECT 69 -#define VT_BLOB_OBJECT 70 -#define VT_CF 71 -#define VT_CLSID 72 -#define VT_VECTOR 0x1000 -#define VT_ARRAY 0x2000 -#define VT_BYREF 0x4000 -#define VT_TYPEMASK 0xFFF +#define PID_CATEGORY 0x02 +#define PID_PRESFORMAT 0x03 +#define PID_BYTECOUNT 0x04 +#define PID_LINECOUNT 0x05 +#define PID_PARACOUNT 0x06 +#define PID_SLIDECOUNT 0x07 +#define PID_NOTECOUNT 0x08 +#define PID_HIDDENCOUNT 0x09 +#define PID_MMCLIPCOUNT 0x0a +#define PID_SCALE 0x0b +#define PID_HEADINGPAIR 0x0c +#define PID_DOCPARTS 0x0d +#define PID_MANAGER 0x0e +#define PID_COMPANY 0x0f +#define PID_LINKSDIRTY 0x10 + +#define VT_EMPTY 0 +#define VT_NULL 1 +#define VT_I2 2 +#define VT_I4 3 +#define VT_R4 4 +#define VT_R8 5 +#define VT_CY 6 +#define VT_DATE 7 +#define VT_BSTR 8 +#define VT_UI4 9 +#define VT_ERROR 10 +#define VT_BOOL 11 +#define VT_VARIANT 12 +#define VT_DECIMAL 14 +#define VT_I1 16 +#define VT_UI1 17 +#define VT_UI2 18 +#define VT_I8 20 +#define VT_UI8 21 +#define VT_INT 22 +#define VT_UINT 23 +#define VT_LPSTR 30 +#define VT_LPWSTR 31 +#define VT_FILETIME 64 +#define VT_BLOB 65 +#define VT_STREAM 66 +#define VT_STORAGE 67 +#define VT_STREAMED_OBJECT 68 +#define VT_STORED_OBJECT 69 +#define VT_BLOB_OBJECT 70 +#define VT_CF 71 +#define VT_CLSID 72 +#define VT_VECTOR 0x1000 +#define VT_ARRAY 0x2000 +#define VT_BYREF 0x4000 +#define VT_TYPEMASK 0xFFF // ------------------------------------------------------------------------ class PropItem : public SvMemoryStream { - sal_uInt16 mnTextEnc; + sal_uInt16 mnTextEnc; public : PropItem(){}; - void Clear(); + void Clear(); - void SetTextEncoding( sal_uInt16 nTextEnc ){ mnTextEnc = nTextEnc; }; - sal_Bool Read( String& rString, sal_uInt32 nType = VT_EMPTY, sal_Bool bDwordAlign = sal_True ); - PropItem& operator=( PropItem& rPropItem ); + void SetTextEncoding( sal_uInt16 nTextEnc ){ mnTextEnc = nTextEnc; }; + sal_Bool Read( String& rString, sal_uInt32 nType = VT_EMPTY, sal_Bool bDwordAlign = sal_True ); + PropItem& operator=( PropItem& rPropItem ); using SvStream::Read; }; @@ -129,62 +129,62 @@ class Dictionary : protected List { friend class Section; - void AddProperty( UINT32 nId, const String& rString ); + void AddProperty( UINT32 nId, const String& rString ); public : Dictionary(){}; ~Dictionary(); Dictionary& operator=( Dictionary& rDictionary ); - UINT32 GetProperty( const String& rPropName ); + UINT32 GetProperty( const String& rPropName ); }; // ------------------------------------------------------------------------ class Section : private List { - sal_uInt16 mnTextEnc; + sal_uInt16 mnTextEnc; protected: - BYTE aFMTID[ 16 ]; + BYTE aFMTID[ 16 ]; - void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ); + void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ); public: Section( const sal_uInt8* pFMTID ); Section( Section& rSection ); ~Section(); - Section& operator=( Section& rSection ); - sal_Bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); - sal_Bool GetDictionary( Dictionary& rDict ); - const sal_uInt8* GetFMTID() const { return aFMTID; }; - void Read( SvStorageStream* pStrm ); + Section& operator=( Section& rSection ); + sal_Bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); + sal_Bool GetDictionary( Dictionary& rDict ); + const sal_uInt8* GetFMTID() const { return aFMTID; }; + void Read( SvStorageStream* pStrm ); }; // ------------------------------------------------------------------------ class PropRead : private List { - sal_Bool mbStatus; - SvStorageStream* mpSvStream; + sal_Bool mbStatus; + SvStorageStream* mpSvStream; - sal_uInt16 mnByteOrder; - sal_uInt16 mnFormat; - sal_uInt16 mnVersionLo; - sal_uInt16 mnVersionHi; - sal_uInt8 mApplicationCLSID[ 16 ]; + sal_uInt16 mnByteOrder; + sal_uInt16 mnFormat; + sal_uInt16 mnVersionLo; + sal_uInt16 mnVersionHi; + sal_uInt8 mApplicationCLSID[ 16 ]; - void AddSection( Section& rSection ); + void AddSection( Section& rSection ); public: PropRead( SvStorage& rSvStorage, const String& rName ); ~PropRead(); - PropRead& operator=( PropRead& rPropRead ); - const Section* GetSection( const BYTE* pFMTID ); - sal_Bool IsValid() const { return mbStatus; }; - void Read(); + PropRead& operator=( PropRead& rPropRead ); + const Section* GetSection( const BYTE* pFMTID ); + sal_Bool IsValid() const { return mbStatus; }; + void Read(); }; diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 731ad5db0616..c985bdc85361 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,13 +59,13 @@ using namespace ::com::sun::star::frame; // - SdFilter - // ------------ -SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) -: mxModel( rDocShell.GetModel() ) -, mrMedium( rMedium ) -, mrDocShell( rDocShell ) -, mrDocument( *rDocShell.GetDoc() ) -, mbIsDraw( rDocShell.GetDocumentType() == DOCUMENT_TYPE_DRAW ) -, mbShowProgress( bShowProgress ) +SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) +: mxModel( rDocShell.GetModel() ) +, mrMedium( rMedium ) +, mrDocShell( rDocShell ) +, mrDocument( *rDocShell.GetDoc() ) +, mbIsDraw( rDocShell.GetDocumentType() == DOCUMENT_TYPE_DRAW ) +, mbShowProgress( bShowProgress ) { } @@ -108,28 +108,28 @@ void SdFilter::CreateStatusIndicator() if ( pStatusBarItem ) pStatusBarItem->GetValue() >>= mxStatusIndicator; -// try -// { -// if (mxModel.is()) -// { -// Reference< XController > xController( mxModel->getCurrentController()); -// if( xController.is()) -// { -// Reference< XFrame > xFrame( xController->getFrame()); -// if( xFrame.is()) -// { -// Reference< XStatusIndicatorFactory > xFactory( xFrame, UNO_QUERY ); -// if( xFactory.is()) -// { -// mxStatusIndicator = xFactory->createStatusIndicator(); -// } -// } -// } -// } -// } -// catch( Exception& ) -// { -// } +// try +// { +// if (mxModel.is()) +// { +// Reference< XController > xController( mxModel->getCurrentController()); +// if( xController.is()) +// { +// Reference< XFrame > xFrame( xController->getFrame()); +// if( xFrame.is()) +// { +// Reference< XStatusIndicatorFactory > xFactory( xFrame, UNO_QUERY ); +// if( xFactory.is()) +// { +// mxStatusIndicator = xFactory->createStatusIndicator(); +// } +// } +// } +// } +// } +// catch( Exception& ) +// { +// } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index a36441a0aee4..a0ae7d2b9eba 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ), - pBas ( NULL ) + pBas ( NULL ) { } @@ -76,14 +76,14 @@ SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal SdPPTFilter::~SdPPTFilter() { - delete pBas; // deleting the compressed basic storage + delete pBas; // deleting the compressed basic storage } // ----------------------------------------------------------------------------- sal_Bool SdPPTFilter::Import() { - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), FALSE ); if( !pStorage->GetError() ) { @@ -137,14 +137,14 @@ sal_Bool SdPPTFilter::Import() sal_Bool SdPPTFilter::Export() { ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; if( pLibrary ) { if( mxModel.is() ) { SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE ); - ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") )); + ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") )); /* !!! if ( pViewShell && pViewShell->GetView() ) @@ -152,7 +152,7 @@ sal_Bool SdPPTFilter::Export() */ if( PPTExport && xStorRef.Is() ) { - sal_uInt32 nCnvrtFlags = 0; + sal_uInt32 nCnvrtFlags = 0; SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get(); if ( pFilterOptions ) { diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index ce40a88b0fc3..ec8d9b5f2e01 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ public: bool removeAlienAttributes( SfxItemSet& rSet ); bool removeAlienAttributes( SfxItemSet& rSet, sal_uInt16 nWhich ); - SdDrawDocument& mrDocument; + SdDrawDocument& mrDocument; SdrOutliner& mrOutliner; const OUString msEnableNumbering; const OUString msTextNamespace; @@ -150,7 +150,7 @@ void SdTransformOOo2xDocument::transformStyles( SfxStyleFamily eFam ) { transformStyle( *pSheet ); pSheet = aIter.Next(); - } + } } void SdTransformOOo2xDocument::transformStyle( SfxStyleSheetBase& rSheet ) @@ -264,7 +264,7 @@ void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape ) bChange = true; } - bItemChange |= transformItemSet( aParaSet, bState ); + bItemChange |= transformItemSet( aParaSet, bState ); bItemChange |= removeAlienAttributes( aParaSet ); @@ -300,7 +300,7 @@ bool SdTransformOOo2xDocument::getBulletState( const SfxItemSet& rSet, SfxStyleS bool SdTransformOOo2xDocument::getBulletState( const SfxItemSet& rSet, sal_uInt16 nWhich, bool& rState ) { if( (rSet.GetItemState( nWhich ) == SFX_ITEM_SET) ) - { + { const SvXMLAttrContainerItem& rAttr = *static_cast< const SvXMLAttrContainerItem* >( rSet.GetItem( nWhich ) ); const sal_uInt16 nCount = rAttr.GetAttrCount(); @@ -356,7 +356,7 @@ bool SdTransformOOo2xDocument::removeAlienAttributes( SfxItemSet& rSet, sal_uInt { rSet.ClearItem( nWhich ); } - else + else { SvXMLAttrContainerItem aNewItem( nWhich ); diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 91560d821582..b18b0908b83b 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -466,7 +466,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) RTL_LOGFILE_CONTEXT_TRACE1( aLog, "importing %s", aFile.GetBuffer() ); #endif - sal_uInt32 nRet = 0; + sal_uInt32 nRet = 0; // Get service factory Reference< lang::XMultiServiceFactory > xServiceFactory = @@ -494,11 +494,11 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) PropertyMapEntry aImportInfoMap[] = { // #80365# necessary properties for XML progress bar at load time - { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "Preview" ), 0, &::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "PageLayouts" ), 0, SEQTYPE(::getCppuType((const uno::Reference< container::XNameAccess >*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "Preview" ), 0, &::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "PageLayouts" ), 0, SEQTYPE(::getCppuType((const uno::Reference< container::XNameAccess >*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (Reference<XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -841,9 +841,9 @@ sal_Bool SdXMLFilter::Export() RTL_LOGFILE_CONTEXT_TRACE1( aLog, "exporting %s", aFile.GetBuffer() ); #endif - SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; - SvXMLGraphicHelper* pGraphicHelper = NULL; - sal_Bool bDocRet = FALSE; + SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; + SvXMLGraphicHelper* pGraphicHelper = NULL; + sal_Bool bDocRet = FALSE; if( !mxModel.is() ) { @@ -880,18 +880,18 @@ sal_Bool SdXMLFilter::Export() DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" ); return FALSE; } - uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); + uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); /** property map for export info set */ PropertyMapEntry aExportInfoMap[] = { // #82003# - { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "UsePrettyPrinting"),0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "UsePrettyPrinting"),0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "PageLayoutNames" ), 0, SEQTYPE(::getCppuType((const OUString*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "PageLayoutNames" ), 0, SEQTYPE(::getCppuType((const OUString*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -957,7 +957,7 @@ sal_Bool SdXMLFilter::Export() { uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; - uno::Reference< document::XGraphicObjectResolver > xGrfResolver; + uno::Reference< document::XGraphicObjectResolver > xGrfResolver; // create helper for graphic and ole export if we have a storage if( xStorage.is() ) @@ -1062,9 +1062,9 @@ sal_Bool SdXMLFilter::Export() uno::Sequence< uno::Any > aArgs( 2 + ( mxStatusIndicator.is() ? 1 : 0 ) + ( xGrfResolver.is() ? 1 : 0 ) + ( xObjectResolver.is() ? 1 : 0 ) ); uno::Any* pArgs = aArgs.getArray(); *pArgs++ <<= xInfoSet; - if( xGrfResolver.is() ) *pArgs++ <<= xGrfResolver; - if( xObjectResolver.is() ) *pArgs++ <<= xObjectResolver; - if( mxStatusIndicator.is() ) *pArgs++ <<= mxStatusIndicator; + if( xGrfResolver.is() ) *pArgs++ <<= xGrfResolver; + if( xObjectResolver.is() ) *pArgs++ <<= xObjectResolver; + if( mxStatusIndicator.is() ) *pArgs++ <<= mxStatusIndicator; *pArgs <<= xHandler; |