Whitespace cleanup

No code changes.

1 files changed, 484 insertions, 339 deletions

diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index adc885cda3e1..c45e7bfb6b42 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -173,10 +173,10 @@ enum PPT_TextHeader
 #define TSS_TYPE_QUARTERBODY    (8)
 
 // Inventor-Id fuer PPT UserData
-const sal_uInt32 PPTInventor =sal_uInt32('P')*0x00000001+
-                          sal_uInt32('P')*0x00000100+
-                          sal_uInt32('T')*0x00010000+
-                          sal_uInt32('0')*0x01000000;
+const sal_uInt32 PPTInventor = sal_uInt32('P') * 0x00000001
+                             + sal_uInt32('P') * 0x00000100
+                             + sal_uInt32('T') * 0x00010000
+                             + sal_uInt32('0') * 0x01000000;
 
 // Object-Ids fuer StarDraw UserData
 #define PPT_OBJECTINFO_ID       (1)
@@ -186,9 +186,9 @@ struct MSFILTER_DLLPUBLIC PptDocumentAtom
     Size            aSlidesPageSize;                    // Seitengroesse der Slides in 576DPI
     Size            aNotesPageSize;                     // Seitengroesse der Notes in 576DPI
     // RatioAtom erstmal weggelassen
-    sal_uInt32          nNotesMasterPersist;                // 0=nicht vorhanden
-    sal_uInt32          nHandoutMasterPersist;              // 0=nicht vorhanden
-    sal_uInt16          n1stPageNumber;                     // Seitennummer des ersten Slides
+    sal_uInt32      nNotesMasterPersist;                // 0=nicht vorhanden
+    sal_uInt32      nHandoutMasterPersist;              // 0=nicht vorhanden
+    sal_uInt16      n1stPageNumber;                     // Seitennummer des ersten Slides
     PptPageFormat   eSlidesPageFormat;                  // Seitenformat der Slides
     sal_Bool        bEmbeddedTrueType           : 1;    // TrueType direkt im File?
     sal_Bool        bTitlePlaceholdersOmitted   : 1;
@@ -206,12 +206,11 @@ public:
 
 struct PptSlideLayoutAtom
 {
-    sal_Int32               eLayout;                // 0..18
-    sal_uInt8               aPlaceholderId[ 8 ];
-    sal_uLong               aPlacementId[ 8 ];
+    sal_Int32           eLayout;                // 0..18
+    sal_uInt8           aPlaceholderId[ 8 ];
+    sal_uLong           aPlacementId[ 8 ];
 
 public:
-
                         PptSlideLayoutAtom() { Clear(); }
     void                Clear();
 
@@ -222,12 +221,11 @@ public:
 struct PptSlideAtom
 {
     PptSlideLayoutAtom  aLayout;
-    sal_uInt32              nMasterId;
-    sal_uInt32              nNotesId;
-    sal_uInt16              nFlags;
+    sal_uInt32          nMasterId;
+    sal_uInt32          nNotesId;
+    sal_uInt16          nFlags;
 
 public:
-
                         PptSlideAtom() { Clear(); }
     void                Clear();
 
@@ -236,14 +234,13 @@ public:
 
 struct PptSlidePersistAtom
 {
-    sal_uInt32              nPsrReference;
-    sal_uInt32              nFlags;
-    sal_uInt32              nNumberTexts;
-    sal_uInt32              nSlideId;
-    sal_uInt32              nReserved;                  // we will use nReserved temporarly to set the offset to SSSlideInfoAtom ( if possible )
+    sal_uInt32          nPsrReference;
+    sal_uInt32          nFlags;
+    sal_uInt32          nNumberTexts;
+    sal_uInt32          nSlideId;
+    sal_uInt32          nReserved;                  // we will use nReserved temporarly to set the offset to SSSlideInfoAtom ( if possible )
 
 public:
-
                         PptSlidePersistAtom() { Clear(); }
     void                Clear();
 
@@ -252,11 +249,10 @@ public:
 
 struct PptNotesAtom
 {
-    sal_uInt32              nSlideId;
-    sal_uInt16              nFlags;
+    sal_uInt32          nSlideId;
+    sal_uInt16          nFlags;
 
 public:
-
                         PptNotesAtom() { Clear(); }
     void                Clear();
 
@@ -265,7 +261,7 @@ public:
 
 struct PptColorSchemeAtom
 {
-    sal_uInt8               aData[32];
+    sal_uInt8           aData[32];
 
 public:
                         PptColorSchemeAtom () { Clear(); }
@@ -295,16 +291,15 @@ class PptFontCollection;
 struct PptUserEditAtom
 {
     DffRecordHeader     aHd;
-    sal_Int32               nLastSlideID;            // ID of last visible slide
-    sal_uInt32              nVersion;                // This is major/minor/build which did the edit
-    sal_uInt32              nOffsetLastEdit;         // File offset of prev PptUserEditAtom
-    sal_uInt32              nOffsetPersistDirectory; // Offset to PersistPtrs for this file version.
-    sal_uInt32              nDocumentRef;
-    sal_uInt32              nMaxPersistWritten;      // Gesamtanzahl der Persisteintraege bis hierher.
-    sal_Int16               eLastViewType;           // enum view type
+    sal_Int32           nLastSlideID;            // ID of last visible slide
+    sal_uInt32          nVersion;                // This is major/minor/build which did the edit
+    sal_uInt32          nOffsetLastEdit;         // File offset of prev PptUserEditAtom
+    sal_uInt32          nOffsetPersistDirectory; // Offset to PersistPtrs for this file version.
+    sal_uInt32          nDocumentRef;
+    sal_uInt32          nMaxPersistWritten;      // Gesamtanzahl der Persisteintraege bis hierher.
+    sal_Int16           eLastViewType;           // enum view type
 
 public:
-
     PptUserEditAtom() : nOffsetPersistDirectory( 0 ) {}
 
     friend SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom );
@@ -312,12 +307,11 @@ public:
 
 struct PptOEPlaceholderAtom
 {
-    sal_uInt32              nPlacementId;
-    sal_uInt8               nPlaceholderId;
-    sal_uInt8               nPlaceholderSize; // 0=Full size, 1=Half size, 2=Quarter of Slide
+    sal_uInt32          nPlacementId;
+    sal_uInt8           nPlaceholderId;
+    sal_uInt8           nPlaceholderSize; // 0=Full size, 1=Half size, 2=Quarter of Slide
 
 public:
-
                         PptOEPlaceholderAtom() { Clear(); }
     void                Clear();
 
@@ -356,7 +350,7 @@ struct PptSlidePersistEntry
 public:
                         PptSlidePersistEntry();
                         ~PptSlidePersistEntry();
-    sal_uInt32              GetSlideId() const { return aPersistAtom.nSlideId; }
+    sal_uInt32          GetSlideId() const { return aPersistAtom.nSlideId; }
 };
 
 SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16,16)
@@ -365,21 +359,19 @@ SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16,16)
 
 class MSFILTER_DLLPUBLIC PptSlidePersistList: public _PptSlidePersistList
 {
-
-    public:
-
-        sal_uInt16          FindPage( sal_uInt32 nId ) const;
+public:
+    sal_uInt16          FindPage( sal_uInt32 nId ) const;
 };
 
 class  SfxObjectShell;
 struct PPTOleEntry
 {
-    sal_uInt32              nId;                        // OleId
-    sal_uInt32              nPersistPtr;                // PersistPtr
-    sal_uInt32              nRecHdOfs;                  // points to the record header: ExObjListHd
-    SfxObjectShell*         pShell;
-    sal_uInt16              nType;                      // maybe PPT_PST_ExEmbed or PPT_PST_ExControl
-    sal_uInt32              nAspect;                    // the aspect of the OLE object
+    sal_uInt32          nId;                        // OleId
+    sal_uInt32          nPersistPtr;                // PersistPtr
+    sal_uInt32          nRecHdOfs;                  // points to the record header: ExObjListHd
+    SfxObjectShell*     pShell;
+    sal_uInt16          nType;                      // maybe PPT_PST_ExEmbed or PPT_PST_ExControl
+    sal_uInt32          nAspect;                    // the aspect of the OLE object
 
     PPTOleEntry( sal_uInt32 nid, sal_uInt32 nOfs, SfxObjectShell* pSh, sal_uInt16 nT, sal_uInt32 nAsp ) :
         nId             ( nid ),
@@ -406,7 +398,6 @@ public:
 class PPTExtParaProv;
 class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager
 {
-
 protected:
 
     friend class PPTTextObj;
@@ -415,10 +406,10 @@ protected:
     friend class ImplSdPPTImport;
 
     PptDocumentAtom     aDocAtom;
-    DffRecordManager    aDocRecManager;                         // contains all first level container and atoms of the document container
+    DffRecordManager    aDocRecManager;             // contains all first level container and atoms of the document container
 
     List                aHFMasterList;
-    List                aOleObjectList;                         // contains PPTOleEntrys
+    List                aOleObjectList;             // contains PPTOleEntrys
 
     PptFontCollection*  pFonts;
 
@@ -442,6 +433,7 @@ protected:
     void                CheckTimesNewRoman() const;
 
 public:
+    using SvxMSDffManager::ReadObjText;
 
     PowerPointImportParam& rImportParam;
 
@@ -452,13 +444,12 @@ public:
 
                         SdrEscherImport( PowerPointImportParam&, const String& rBaseURL );
     virtual             ~SdrEscherImport();
-    virtual bool    GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const;
-    virtual sal_Bool        SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const;
+    virtual bool        GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const;
+    virtual sal_Bool    SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const;
     PptFontEntityAtom*  GetFontEnityAtom( sal_uInt32 nNum ) const;
     CharSet             GetCharSet( sal_uInt32 nNum ) const;
-    sal_Bool                IsFontAvailable( sal_uInt32 nNum ) const;
+    sal_Bool            IsFontAvailable( sal_uInt32 nNum ) const;
     void                RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph );
-    using SvxMSDffManager::ReadObjText;
     virtual SdrObject*  ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const;
     virtual SdrObject*  ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj );
     virtual void        ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj );
@@ -479,17 +470,21 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry
 {
     sal_uInt16          nPos;
     sal_uInt16          nTextRangeEnd;
-    SvxFieldItem*   pField1;
-    SvxFieldItem*   pField2;
-    String*         pString;
+    SvxFieldItem*       pField1;
+    SvxFieldItem*       pField2;
+    String*             pString;
 
     PPTFieldEntry() : nPos( 0 ), nTextRangeEnd( 0 ), pField1( NULL ), pField2( NULL ), pString( NULL ) {};
     ~PPTFieldEntry();
 
-    void            SetDateTime( sal_uInt32 nType );
+    void                SetDateTime( sal_uInt32 nType );
 
-                    // converting PPT date time format:
-    static void     GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateFormat, SvxTimeFormat& eTimeFormat );
+                        // converting PPT date time format:
+    static void         GetDateTime(
+                            const sal_uInt32 nVal,
+                            SvxDateFormat& eDateFormat,
+                            SvxTimeFormat& eTimeFormat
+                        );
 };
 
 struct MSFILTER_DLLPUBLIC HeaderFooterEntry
@@ -500,7 +495,10 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
 
     sal_uInt32          GetMaskForInstance( sal_uInt32 nInstance );
     sal_uInt32          IsToDisplay( sal_uInt32 nInstance );
-    sal_uInt32          NeedToImportInstance( const sal_uInt32 nInstance, const PptSlidePersistEntry& rSlidePersist );
+    sal_uInt32          NeedToImportInstance(
+                            const sal_uInt32 nInstance,
+                            const PptSlidePersistEntry& rSlidePersist
+                        );
 
                         HeaderFooterEntry( const PptSlidePersistEntry* pMaster = NULL );
                         ~HeaderFooterEntry();
@@ -527,7 +525,6 @@ class SdrTextObj;
 class SfxObjectShell;
 class MSFILTER_DLLPUBLIC SdrPowerPointImport : public SdrEscherImport
 {
-
 protected:
 
     friend class PPTTextObj;
@@ -536,83 +533,115 @@ protected:
     friend class PPTNumberFormatCreator;
 
     sal_Bool                bOk;
-    PptUserEditAtom     aUserEditAtom;
-    PptColorSchemeAtom  aPageColors;
-    List                aHyperList;
+    PptUserEditAtom         aUserEditAtom;
+    PptColorSchemeAtom      aPageColors;
+    List                    aHyperList;
     sal_uInt32*             pPersistPtr;
     sal_uLong               nPersistPtrAnz;
 
-    const PPTStyleSheet* pPPTStyleSheet;    // this is the current stylesheet;
-    const PPTStyleSheet* pDefaultSheet;     // this is a sheet we are using if no masterpage can be found, but that should
+    const PPTStyleSheet*    pPPTStyleSheet; // this is the current stylesheet;
+    const PPTStyleSheet*    pDefaultSheet;  // this is a sheet we are using if no masterpage can be found, but that should
                                             // never happen just preventing a crash
-    PptSlidePersistList* pMasterPages;
-    PptSlidePersistList* pSlidePages;
-    PptSlidePersistList* pNotePages;
+    PptSlidePersistList*    pMasterPages;
+    PptSlidePersistList*    pSlidePages;
+    PptSlidePersistList*    pNotePages;
     sal_uInt16              nAktPageNum;
     sal_uLong               nDocStreamPos;
     sal_uInt16              nPageColorsNum;
-    PptPageKind         ePageColorsKind;
-    PptPageKind         eAktPageKind;
+    PptPageKind             ePageColorsKind;
+    PptPageKind             eAktPageKind;
 
 protected:
-
-    sal_Bool    SeekToAktPage(DffRecordHeader* pRecHd=NULL) const;
-    sal_Bool    SeekToDocument(DffRecordHeader* pRecHd=NULL) const;
-    sal_Bool    SeekToContentOfProgTag( sal_Int32 nVersion, SvStream& rSt, const DffRecordHeader& rProgTagBinaryDataHd,
-                                            DffRecordHeader& rContentHd );
-    virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, SfxStyleSheet*, SfxStyleSheet** ) const;
     using SdrEscherImport::ReadObjText;
-    virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const;
+
+    sal_Bool                SeekToAktPage(DffRecordHeader* pRecHd=NULL) const;
+    sal_Bool                SeekToDocument(DffRecordHeader* pRecHd=NULL) const;
+    sal_Bool                SeekToContentOfProgTag(
+                                sal_Int32 nVersion,
+                                SvStream& rSt,
+                                const DffRecordHeader& rProgTagBinaryDataHd,
+                                DffRecordHeader& rContentHd
+                            );
+    virtual SdrObject*      ApplyTextObj(
+                                PPTTextObj* pTextObj,
+                                SdrTextObj* pText,
+                                SdPage* pPage,
+                                SfxStyleSheet*,
+                                SfxStyleSheet** )
+                             const;
+    virtual SdrObject*      ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const;
     // #i32596# - new parameter <_nCalledByGroup>, which
     // indicates, if the OLE object is imported inside a group object.
-    virtual SdrObject* ImportOLE( long nOLEId,
-                                  const Graphic& rGraf,
-                                  const Rectangle& rBoundRect,
-                                  const Rectangle& rVisArea,
-                                  const int _nCalledByGroup,
-                                  sal_Int64 nAspect ) const;
-    SvMemoryStream* ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const;
-    SdrPage*   MakeBlancPage(sal_Bool bMaster) const;
-    sal_Bool   ReadFontCollection();
-    sal_Bool   ForceFontCollection() const { return pFonts!=NULL?sal_True:((SdrPowerPointImport*)this)->ReadFontCollection(); }
-    PptSlidePersistList* GetPageList(PptPageKind ePageKind) const;
-    sal_uInt32     GetAktPageId();
-    sal_uInt32     GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const;
-    sal_uInt32     GetNotesPageId(sal_uInt16 nPageNum ) const;
-    SdrOutliner* GetDrawOutliner( SdrTextObj* pSdrText ) const;
-    void        SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOptions );
+    virtual SdrObject*      ImportOLE(
+                                long nOLEId,
+                                const Graphic& rGraf,
+                                const Rectangle& rBoundRect,
+                                const Rectangle& rVisArea,
+                                const int _nCalledByGroup,
+                                sal_Int64 nAspect
+                            ) const;
+    SvMemoryStream*         ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const;
+    SdrPage*                MakeBlancPage(sal_Bool bMaster) const;
+    sal_Bool                ReadFontCollection();
+    sal_Bool                ForceFontCollection() const
+                            { return pFonts!=NULL?sal_True:((SdrPowerPointImport*)this)->ReadFontCollection(); }
+    PptSlidePersistList*    GetPageList(PptPageKind ePageKind) const;
+    sal_uInt32              GetAktPageId();
+    sal_uInt32              GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const;
+    sal_uInt32              GetNotesPageId(sal_uInt16 nPageNum ) const;
+    SdrOutliner*            GetDrawOutliner( SdrTextObj* pSdrText ) const;
+    void                    SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOptions );
 
 public:
-                SdrPowerPointImport( PowerPointImportParam&, const String& rBaseURL );
-    virtual     ~SdrPowerPointImport();
-    sal_uInt16      GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const;
-    void        SetPageNum( sal_uInt16 nPageNum, PptPageKind = PPT_SLIDEPAGE );
-    sal_uInt16      GetPageNum() const { return nAktPageNum; }
-    PptPageKind GetPageKind() const { return eAktPageKind; }
-    Size        GetPageSize() const;
-    SdrObject*  ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, sal_Bool bForce );
-    sal_Bool    IsNoteOrHandout( sal_uInt16 nPageNum, PptPageKind ePageKind ) const;
-    sal_Bool    HasMasterPage( sal_uInt16 nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const;
-    sal_uInt16      GetMasterPageIndex( sal_uInt16 nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const;
-
-    void        ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL );
-    virtual bool    GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const;
+                            SdrPowerPointImport( PowerPointImportParam&, const String& rBaseURL );
+    virtual                 ~SdrPowerPointImport();
+    sal_uInt16              GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const;
+    void                    SetPageNum( sal_uInt16 nPageNum, PptPageKind = PPT_SLIDEPAGE );
+    sal_uInt16              GetPageNum() const { return nAktPageNum; }
+    PptPageKind             GetPageKind() const { return eAktPageKind; }
+    Size                    GetPageSize() const;
+    SdrObject*              ImportPageBackgroundObject(
+                                const SdrPage& rPage,
+                                sal_uInt32& nBgFileOffset,
+                                sal_Bool bForce
+                            );
+    sal_Bool                IsNoteOrHandout( sal_uInt16 nPageNum, PptPageKind ePageKind ) const;
+    sal_Bool                HasMasterPage(
+                                sal_uInt16 nPageNum,
+                                PptPageKind ePageKind = PPT_SLIDEPAGE
+                            ) const;
+    sal_uInt16              GetMasterPageIndex(
+                                sal_uInt16 nPageNum,
+                                PptPageKind ePageKind = PPT_SLIDEPAGE
+                            ) const;
+
+    void                    ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL );
+    virtual bool            GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const;
     virtual sal_Bool        SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const;
-    sal_Unicode         PPTSubstitute( sal_uInt16 nFont, sal_Unicode nChar,
-                                        sal_uInt32& nMappedFontId, Font& rFont, char nDefault ) const;
-    const PptDocumentAtom&              GetDocumentAtom() const { return aDocAtom; }
+    sal_Unicode             PPTSubstitute(
+                                sal_uInt16 nFont,
+                                sal_Unicode nChar,
+                                sal_uInt32& nMappedFontId,
+                                Font& rFont,
+                                char nDefault
+                            ) const;
+    const PptDocumentAtom&  GetDocumentAtom() const { return aDocAtom; }
     virtual const PptSlideLayoutAtom*   GetSlideLayoutAtom() const;
-    SdrObject*  CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
+    SdrObject*              CreateTable(
+                                SdrObject* pGroupObject,
+                                sal_uInt32* pTableArry,
+                                SvxMSDffSolverContainer*
+                            );
 };
 
 struct PPTTextCharacterStyleAtomInterpreter
 {
-    sal_uInt16  nFlags1;
-    sal_uInt16  nFlags2;
-    sal_uInt16  nFlags3;
-    sal_Int32   n1;
-    sal_uInt16  nFontHeight;
-    sal_Int32   nFontColor;
+    sal_uInt16      nFlags1;
+    sal_uInt16      nFlags2;
+    sal_uInt16      nFlags3;
+    sal_Int32       n1;
+    sal_uInt16      nFontHeight;
+    sal_Int32       nFontColor;
 
                     PPTTextCharacterStyleAtomInterpreter();
                     ~PPTTextCharacterStyleAtomInterpreter();
@@ -653,8 +682,12 @@ struct  PPTTextSpecInfoAtomInterpreter
                     PPTTextSpecInfoAtomInterpreter();
                     ~PPTTextSpecInfoAtomInterpreter();
 
-    sal_Bool        Read( SvStream& rIn, const DffRecordHeader& rRecHd,
-                            sal_uInt16 nRecordType, const PPTTextSpecInfo* pTextSpecDefault = NULL );
+    sal_Bool        Read(
+                        SvStream& rIn,
+                        const DffRecordHeader& rRecHd,
+                        sal_uInt16 nRecordType,
+                        const PPTTextSpecInfo* pTextSpecDefault = NULL
+                    );
 
 };
 
@@ -662,27 +695,27 @@ struct  PPTTextSpecInfoAtomInterpreter
 
 struct PPTExtParaLevel
 {
-        sal_uInt32  mnExtParagraphMask;
-        sal_uInt16  mnBuBlip;
-        sal_uInt16  mnHasAnm;
-        sal_uInt32  mnAnmScheme;
-        sal_uInt32  mpfPP10Ext;
-        sal_uInt32  mnExtCharacterMask;
-        sal_uInt32  mcfPP10Ext;
-        sal_Bool    mbSet;
-
-        PPTExtParaLevel();
-        friend SvStream& operator>>( SvStream& rIn, PPTExtParaLevel& rL );
+    sal_uInt32  mnExtParagraphMask;
+    sal_uInt16  mnBuBlip;
+    sal_uInt16  mnHasAnm;
+    sal_uInt32  mnAnmScheme;
+    sal_uInt32  mpfPP10Ext;
+    sal_uInt32  mnExtCharacterMask;
+    sal_uInt32  mcfPP10Ext;
+    sal_Bool    mbSet;
+
+    PPTExtParaLevel();
+    friend SvStream& operator>>( SvStream& rIn, PPTExtParaLevel& rL );
 };
 
 struct PPTExtParaSheet
 {
-        PPTExtParaLevel aExtParaLevel[ 5 ];
+    PPTExtParaLevel aExtParaLevel[ 5 ];
 };
 
 struct PPTBuGraEntry
 {
-    sal_uInt32      nInstance;
+    sal_uInt32  nInstance;
     Graphic     aBuGra;
 
                 PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInstance );
@@ -690,20 +723,23 @@ struct PPTBuGraEntry
 
 class PPTExtParaProv
 {
-        List                aBuGraList;
+    List                aBuGraList;
 
-    public :
-        sal_Bool                bStyles;
-        sal_Bool                bGraphics;
-        DffRecordManager    aExtendedPresRules;
+public :
+    sal_Bool            bStyles;
+    sal_Bool            bGraphics;
+    DffRecordManager    aExtendedPresRules;
 
-        PPTExtParaSheet     aExtParaSheet[ PPT_STYLESHEETENTRYS ];
+    PPTExtParaSheet     aExtParaSheet[ PPT_STYLESHEETENTRYS ];
 
-        sal_Bool                GetGraphic( sal_uInt32 nInstance, Graphic& rGraphic ) const;
+    sal_Bool            GetGraphic( sal_uInt32 nInstance, Graphic& rGraphic ) const;
 
-                            PPTExtParaProv( SdrPowerPointImport& rManager, SvStream& rSt,
-                                                const DffRecordHeader* pMainMasterHd );
-                            ~PPTExtParaProv();
+                        PPTExtParaProv(
+                            SdrPowerPointImport& rManager,
+                            SvStream& rSt,
+                            const DffRecordHeader* pMainMasterHd
+                        );
+                        ~PPTExtParaProv();
 };
 
 struct PPTCharLevel
@@ -719,12 +755,12 @@ struct PPTCharLevel
 
 struct PPTCharSheet
 {
-                PPTCharLevel    maCharLevel[ 5 ];
+    PPTCharLevel    maCharLevel[ 5 ];
 
-                PPTCharSheet( sal_uInt32 nInstance );
-                PPTCharSheet( const PPTCharSheet& rCharSheet );
+                    PPTCharSheet( sal_uInt32 nInstance );
+                    PPTCharSheet( const PPTCharSheet& rCharSheet );
 
-    void        Read( SvStream& rIn, sal_Bool bMasterStyle, sal_uInt32 nLevel, sal_Bool bFirst );
+    void            Read( SvStream& rIn, sal_Bool bMasterStyle, sal_uInt32 nLevel, sal_Bool bFirst );
 };
 
 struct PPTParaLevel
@@ -750,47 +786,74 @@ struct PPTParaLevel
 
 struct PPTParaSheet
 {
-    public:
+public:
 
-                PPTParaLevel    maParaLevel[ 5 ];
+    PPTParaLevel    maParaLevel[ 5 ];
 
-                PPTParaSheet( sal_uInt32 nInstance );
-                PPTParaSheet( const PPTParaSheet& rParaSheet );
+                    PPTParaSheet( sal_uInt32 nInstance );
+                    PPTParaSheet( const PPTParaSheet& rParaSheet );
 
-    void        Read( SdrPowerPointImport& rMan, SvStream& rIn, sal_Bool bMasterStyle,
-                        sal_uInt32 nLevel, sal_Bool bFirst );
+    void            Read(
+                        SdrPowerPointImport& rMan,
+                        SvStream& rIn,
+                        sal_Bool bMasterStyle,
+                        sal_uInt32 nLevel,
+                        sal_Bool bFirst
+                    );
 };
 
 class PPTParagraphObj;
 class PPTNumberFormatCreator
 {
-        sal_uInt32 nIsBullet;
-        sal_uInt32 nBulletChar;
-        sal_uInt32 nBulletFont;
-        sal_uInt32 nBulletHeight;
-        sal_uInt32 nBulletColor;
-        sal_uInt32 nTextOfs;
-        sal_uInt32 nBulletOfs;
+    sal_uInt32 nIsBullet;
+    sal_uInt32 nBulletChar;
+    sal_uInt32 nBulletFont;
+    sal_uInt32 nBulletHeight;
+    sal_uInt32 nBulletColor;
+    sal_uInt32 nTextOfs;
+    sal_uInt32 nBulletOfs;
+
+    void        ImplGetNumberFormat(
+                    SdrPowerPointImport& rMan,
+                    SvxNumberFormat& rNumberFormat,
+                    sal_uInt32 nLevel
+                );
+    sal_Bool    ImplGetExtNumberFormat(
+                    SdrPowerPointImport& rMan,
+                    SvxNumberFormat& rNumberFormat,
+                    sal_uInt32 nLevel,
+                    sal_uInt32 nInstance,
+                    sal_uInt32 nInstanceInSheet,
+                    boost::optional< sal_Int16 >& rStartNumbering,
+                    sal_uInt32 nFontHeight,
+                    PPTParagraphObj* pPara
+                );
 
-        void    ImplGetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel );
-        sal_Bool    ImplGetExtNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel,
-                            sal_uInt32 nInstance, sal_uInt32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering,
-                                sal_uInt32 nFontHeight, PPTParagraphObj* pPara );
-
-    protected :
-
-        PPTNumberFormatCreator( PPTExtParaProv* );
-        ~PPTNumberFormatCreator();
-
-    public :
+protected:
 
-        PPTExtParaProv*  pExtParaProv;
+    PPTNumberFormatCreator( PPTExtParaProv* );
+    ~PPTNumberFormatCreator();
 
-        void    GetNumberFormat(  SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel,
-                    const PPTParaLevel& rParaLevel, const PPTCharLevel& rCharLevel, sal_uInt32 nInstance );
+public:
 
-        sal_Bool    GetNumberFormat(  SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat,
-                    PPTParagraphObj* pPara, sal_uInt32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering );
+    PPTExtParaProv*  pExtParaProv;
+
+    void        GetNumberFormat(
+                    SdrPowerPointImport& rMan,
+                    SvxNumberFormat& rNumberFormat,
+                    sal_uInt32 nLevel,
+                    const PPTParaLevel& rParaLevel,
+                    const PPTCharLevel& rCharLevel,
+                    sal_uInt32 nInstance
+                );
+
+    sal_Bool    GetNumberFormat(
+                    SdrPowerPointImport& rMan,
+                    SvxNumberFormat& rNumberFormat,
+                    PPTParagraphObj* pPara,
+                    sal_uInt32 nInstanceInSheet,
+                    boost::optional< sal_Int16 >& rStartNumbering
+                );
 };
 
 class SvxNumBulletItem;
@@ -802,9 +865,14 @@ struct PPTStyleSheet : public PPTNumberFormatCreator
     SvxNumBulletItem*   mpNumBulletItem[ PPT_STYLESHEETENTRYS ];
     void*               mpDummy;
 
-                PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rSt, SdrPowerPointImport&,
-                                const PPTTextCharacterStyleAtomInterpreter&, const PPTTextParagraphStyleAtomInterpreter&, const PPTTextSpecInfo& );
-                ~PPTStyleSheet();
+                        PPTStyleSheet(
+                            const DffRecordHeader& rSlideHd,
+                            SvStream& rSt, SdrPowerPointImport&,
+                            const PPTTextCharacterStyleAtomInterpreter&,
+                            const PPTTextParagraphStyleAtomInterpreter&,
+                            const PPTTextSpecInfo&
+                        );
+                        ~PPTStyleSheet();
 };
 
 struct ImplPPTParaPropSet
@@ -825,7 +893,8 @@ struct ImplPPTParaPropSet
     sal_uInt32  nDontKnow2;
     sal_uInt16  nDontKnow2bit06;
 
-            ImplPPTParaPropSet(){ mnRefCount = 1; mnAttrSet = 0; mnExtParagraphMask = 0; mnDepth = 0; };
+                ImplPPTParaPropSet()
+                { mnRefCount = 1; mnAttrSet = 0; mnExtParagraphMask = 0; mnDepth = 0; };
 };
 
 struct PPTParaPropSet
@@ -878,9 +947,8 @@ struct PPTCharPropSet
 
     PPTCharPropSet&     operator=( PPTCharPropSet& rCharPropSet );
 
-    private :
-
-        void            ImplMakeUnique();
+private:
+    void                ImplMakeUnique();
 };
 
 struct PPTTabEntry
@@ -897,7 +965,7 @@ struct PPTRuler
         sal_uInt16          nDefaultTab;
         sal_uInt16          nTextOfs[ 5 ];
         sal_uInt16          nBulletOfs[ 5 ];
-        PPTTabEntry*    pTab;
+        PPTTabEntry*        pTab;
         sal_uInt16          nTabCount;
 
         PPTRuler();
@@ -910,15 +978,24 @@ struct PPTTextRulerInterpreter
 
                     PPTTextRulerInterpreter();
                     PPTTextRulerInterpreter( PPTTextRulerInterpreter& rRuler );
-                    PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerPointImport&, DffRecordHeader& rHd, SvStream& rIn );
+                    PPTTextRulerInterpreter(
+                        sal_uInt32 nFileOfs,
+                        SdrPowerPointImport&,
+                        DffRecordHeader& rHd,
+                        SvStream& rIn
+                    );
                     ~PPTTextRulerInterpreter();
 
-        sal_uInt16  GetTabOffsetByIndex( sal_uInt16 nIndex ) const { return mpImplRuler->pTab[ nIndex ].nOffset; };
-        sal_uInt16  GetTabStyleByIndex( sal_uInt16 nIndex ) const { return mpImplRuler->pTab[ nIndex ].nStyle; };
-        sal_uInt16      GetTabCount() const { return mpImplRuler->nTabCount; };
-        sal_Bool        GetDefaultTab( sal_uInt32 nLevel, sal_uInt16& nValue ) const;
-        sal_Bool        GetTextOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const;
-        sal_Bool        GetBulletOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const;
+        sal_uInt16  GetTabOffsetByIndex( sal_uInt16 nIndex ) const
+                    { return mpImplRuler->pTab[ nIndex ].nOffset; };
+
+        sal_uInt16  GetTabStyleByIndex( sal_uInt16 nIndex ) const
+                    { return mpImplRuler->pTab[ nIndex ].nStyle; };
+
+        sal_uInt16  GetTabCount() const { return mpImplRuler->nTabCount; };
+        sal_Bool    GetDefaultTab( sal_uInt32 nLevel, sal_uInt16& nValue ) const;
+        sal_Bool    GetTextOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const;
+        sal_Bool    GetBulletOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const;
 
         PPTTextRulerInterpreter& operator=( PPTTextRulerInterpreter& rRuler );
 };
@@ -941,16 +1018,16 @@ struct StyleTextProp9
     sal_uInt16  mfBidi;
 
     StyleTextProp9()
-    : mnExtParagraphMask( 0 )
-    , mnBuBlip( 0 )
-    , mnHasAnm( 0 )
-    , mnAnmScheme( 0 )
-    , mpfPP10Ext( 0 )
-    , mnExtCharacterMask( 0 )
-    , mncfPP10Ext( 0 )
-    , mnSpecialInfoMask( 0 )
-    , mnPP10Ext( 0 )
-    , mfBidi( 0 )
+        : mnExtParagraphMask( 0 )
+        , mnBuBlip( 0 )
+        , mnHasAnm( 0 )
+        , mnAnmScheme( 0 )
+        , mpfPP10Ext( 0 )
+        , mnExtCharacterMask( 0 )
+        , mncfPP10Ext( 0 )
+        , mnSpecialInfoMask( 0 )
+        , mnPP10Ext( 0 )
+        , mfBidi( 0 )
     {
     }
     void Read( SvStream& rSt );
@@ -962,22 +1039,47 @@ struct PPTStyleTextPropReader
     List    aParaPropList;
     List    aCharPropList;
 
-    PPTStyleTextPropReader( SvStream& rIn, SdrPowerPointImport&, const DffRecordHeader& rClientTextBoxHd,
-        PPTTextRulerInterpreter& rInterpreter, const DffRecordHeader& rExtParaHd, sal_uInt32 nTextInstance );
-
-    void Init( SvStream& rIn, SdrPowerPointImport&, const DffRecordHeader& rClientTextBoxHd,
-               PPTTextRulerInterpreter& rInterpreter, const DffRecordHeader& rExtParaHd, sal_uInt32 nTextInstance );
-    void ReadParaProps( SvStream& rIn, SdrPowerPointImport& rMan, const DffRecordHeader& rTextHeader,
-                        const String& aString, PPTTextRulerInterpreter& rRuler,
-                        sal_uInt32& nCharCount, sal_Bool& bTextPropAtom );
-    void ReadCharProps( SvStream& rIn, PPTCharPropSet& aCharPropSet, const String& aString,
-                        sal_uInt32& nCharCount, sal_uInt32 nCharAnzRead,
-                        sal_Bool& bTextPropAtom, sal_uInt32 nExtParaPos,
-                        const std::vector< StyleTextProp9 >& aStyleTextProp9,
-                        sal_uInt32& nExtParaFlags, sal_uInt16& nBuBlip,
-                        sal_uInt16& nHasAnm, sal_uInt32& nAnmScheme );
-
-    ~PPTStyleTextPropReader();
+            PPTStyleTextPropReader(
+                SvStream& rIn,
+                SdrPowerPointImport&,
+                const DffRecordHeader& rClientTextBoxHd,
+                PPTTextRulerInterpreter& rInterpreter,
+                const DffRecordHeader& rExtParaHd,
+                sal_uInt32 nTextInstance
+            );
+            ~PPTStyleTextPropReader();
+
+    void    Init(
+                SvStream& rIn,
+                SdrPowerPointImport&,
+                const DffRecordHeader& rClientTextBoxHd,
+                PPTTextRulerInterpreter& rInterpreter,
+                const DffRecordHeader& rExtParaHd,
+                sal_uInt32 nTextInstance
+            );
+    void    ReadParaProps(
+                SvStream& rIn,
+                SdrPowerPointImport& rMan,
+                const DffRecordHeader& rTextHeader,
+                const String& aString,
+                PPTTextRulerInterpreter& rRuler,
+                sal_uInt32& nCharCount,
+                sal_Bool& bTextPropAtom
+            );
+    void    ReadCharProps(
+                SvStream& rIn,
+                PPTCharPropSet& aCharPropSet,
+                const String& aString,
+                sal_uInt32& nCharCount,
+                sal_uInt32 nCharAnzRead,
+                sal_Bool& bTextPropAtom,
+                sal_uInt32 nExtParaPos,
+                const std::vector< StyleTextProp9 >& aStyleTextProp9,
+                sal_uInt32& nExtParaFlags,
+                sal_uInt16& nBuBlip,
+                sal_uInt16& nHasAnm,
+                sal_uInt32& nAnmScheme
+            );
 };
 
 class SvxFieldItem;
@@ -986,60 +1088,92 @@ class MSFILTER_DLLPUBLIC PPTPortionObj : public PPTCharPropSet
 
     friend class PPTParagraphObj;
 
-        const PPTStyleSheet&    mrStyleSheet;
-        sal_uInt32                  mnInstance;
-        sal_uInt32                  mnDepth;
-
-    public :
+    const PPTStyleSheet&    mrStyleSheet;
+    sal_uInt32              mnInstance;
+    sal_uInt32              mnDepth;
 
-        sal_Bool            GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet );
-        SvxFieldItem*   GetTextField();
-
-                        PPTPortionObj( const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt32 nDepth );
-                        PPTPortionObj( PPTCharPropSet&, const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt32 nDepth );
-                        PPTPortionObj( PPTPortionObj& );
-                        ~PPTPortionObj();
+public:
 
-        // the following function should be removed during next full update
-        void            ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, sal_uInt32 nInstanceInSheet );
-        void            ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, sal_uInt32 nInstanceInSheet, const PPTTextObj* pTextObj );
-        sal_uInt32          Count() const { return ( mpFieldItem ) ? 1 : maString.Len(); };
-        sal_Bool            HasTabulator();
+    sal_Bool        GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet );
+    SvxFieldItem*   GetTextField();
+
+                    PPTPortionObj( const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt32 nDepth );
+                    PPTPortionObj(
+                        PPTCharPropSet&,
+                        const PPTStyleSheet&,
+                        sal_uInt32 nInstance,
+                        sal_uInt32 nDepth
+                    );
+                    PPTPortionObj( PPTPortionObj& );
+                    ~PPTPortionObj();
+
+    // the following function should be removed during next full update
+    void            ApplyTo(
+                        SfxItemSet& rSet,
+                        SdrPowerPointImport& rManager,
+                        sal_uInt32 nInstanceInSheet
+                    );
+    void            ApplyTo(
+                        SfxItemSet& rSet,
+                        SdrPowerPointImport& rManager,
+                        sal_uInt32 nInstanceInSheet,
+                        const PPTTextObj* pTextObj
+                    );
+    sal_uInt32      Count() const { return ( mpFieldItem ) ? 1 : maString.Len(); };
+    sal_Bool        HasTabulator();
 };
 
-class MSFILTER_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumberFormatCreator, public PPTTextRulerInterpreter
+class MSFILTER_DLLPUBLIC PPTParagraphObj
+    :   public PPTParaPropSet,
+        public PPTNumberFormatCreator,
+        public PPTTextRulerInterpreter
 {
     friend class PPTTextObj;
     friend class PPTNumberFormatCreator;
 
-        const PPTStyleSheet&    mrStyleSheet;
-        sal_uInt32                  mnInstance;
-
-    protected :
+    const PPTStyleSheet&    mrStyleSheet;
+    sal_uInt32              mnInstance;
 
-        void                    ImplClear();
-
-    public :
-
-        sal_Bool                    mbTab;          // if true, this paragraph has tabulators in text
-
-        sal_uInt32                  mnCurrentObject;
-        sal_uInt32                  mnPortionCount;
-        PPTPortionObj**         mpPortionList;
-
-        void                    UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const;
-        sal_Bool                    GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet );
+protected:
 
-                                PPTParagraphObj( const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt16 nDepth );
-                                PPTParagraphObj( PPTStyleTextPropReader&, const PPTStyleSheet&, sal_uInt32 nInstance, PPTTextRulerInterpreter& rRuler );
-                                ~PPTParagraphObj();
+    void                    ImplClear();
 
-        sal_uInt32                  GetTextSize();
-        PPTPortionObj*          First();
-        PPTPortionObj*          Next();
+public:
 
-        void                    AppendPortion( PPTPortionObj& rPortion );
-        void                    ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& rStartNumbering, SdrPowerPointImport& rManager, sal_uInt32 nInstanceInSheet, const PPTParagraphObj* pPrev );
+    sal_Bool                mbTab;          // if true, this paragraph has tabulators in text
+
+    sal_uInt32              mnCurrentObject;
+    sal_uInt32              mnPortionCount;
+    PPTPortionObj**         mpPortionList;
+
+    void                    UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const;
+    sal_Bool                GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet );
+
+                            PPTParagraphObj(
+                                const PPTStyleSheet&,
+                                sal_uInt32 nInstance,
+                                sal_uInt16 nDepth
+                            );
+                            PPTParagraphObj(
+                                PPTStyleTextPropReader&,
+                                const PPTStyleSheet&,
+                                sal_uInt32 nInstance,
+                                PPTTextRulerInterpreter& rRuler
+                            );
+                            ~PPTParagraphObj();
+
+    sal_uInt32              GetTextSize();
+    PPTPortionObj*          First();
+    PPTPortionObj*          Next();
+
+    void                    AppendPortion( PPTPortionObj& rPortion );
+    void                    ApplyTo(
+                                SfxItemSet& rSet,
+                                boost::optional< sal_Int16 >& rStartNumbering,
+                                SdrPowerPointImport& rManager,
+                                sal_uInt32 nInstanceInSheet,
+                                const PPTParagraphObj* pPrev
+                            );
 };
 
 #define PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT      1
@@ -1050,16 +1184,16 @@ class MSFILTER_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumb
 
 struct ImplPPTTextObj
 {
-    sal_uInt32                      mnRefCount;
-    sal_uInt32                      mnShapeId;
-    sal_uInt32                      mnShapeMaster;
+    sal_uInt32                  mnRefCount;
+    sal_uInt32                  mnShapeId;
+    sal_uInt32                  mnShapeMaster;
     PptOEPlaceholderAtom*       mpPlaceHolderAtom;
-    sal_uInt16                      mnInstance;
-    sal_uInt16                      mnDestinationInstance;
+    sal_uInt16                  mnInstance;
+    sal_uInt16                  mnDestinationInstance;
     MSO_SPT                     meShapeType;
 
-    sal_uInt32                      mnCurrentObject;
-    sal_uInt32                      mnParagraphCount;
+    sal_uInt32                  mnCurrentObject;
+    sal_uInt32                  mnParagraphCount;
     PPTParagraphObj**           mpParagraphList;
     PptSlidePersistEntry&       mrPersistEntry;
 
@@ -1070,55 +1204,69 @@ struct ImplPPTTextObj
 
 class PPTTextObj
 {
-        ImplPPTTextObj*         mpImplTextObj;
-        void                    ImplClear();
-
-                                PPTTextObj(){};
-    public :
-                                PPTTextObj( SvStream& rSt, SdrPowerPointImport&, PptSlidePersistEntry&, DffObjData* );
-                                PPTTextObj( PPTTextObj& rTextObj );
-                                ~PPTTextObj();
-
-        sal_uInt32                  GetCurrentIndex() const { return mpImplTextObj->mnCurrentObject; };
-        sal_uInt32                  Count() const { return mpImplTextObj->mnParagraphCount; };
-        PPTParagraphObj*        First();
-        PPTParagraphObj*        Next();
-        MSO_SPT                 GetShapeType() const { return mpImplTextObj->meShapeType; };
-        sal_uInt32                  GetInstance() const { return mpImplTextObj->mnInstance; };
-        void                    SetInstance( sal_uInt16 nInstance ) { mpImplTextObj->mnInstance = nInstance; };
-        sal_uInt32                  GetDestinationInstance() const { return mpImplTextObj->mnDestinationInstance; };
-        void                    SetDestinationInstance( sal_uInt16 nInstance ) { mpImplTextObj->mnDestinationInstance = nInstance; };
-        PptOEPlaceholderAtom*   GetOEPlaceHolderAtom() const { return mpImplTextObj->mpPlaceHolderAtom; };
-        sal_uInt32              GetTextFlags() const { return mpImplTextObj->mnTextFlags; };
-        void                    SetVertical( sal_Bool bVertical )
-                                {
-                                    if ( bVertical )
-                                        mpImplTextObj->mnTextFlags |= PPT_TEXTOBJ_FLAGS_VERTICAL;
-                                    else
-                                        mpImplTextObj->mnTextFlags &= ~PPT_TEXTOBJ_FLAGS_VERTICAL;
-                                }
-        sal_Bool                GetVertical() const { return ( mpImplTextObj->mnTextFlags & PPT_TEXTOBJ_FLAGS_VERTICAL ) != 0; };
-        const SfxItemSet*       GetBackground() const;
-
-        PPTTextObj&         operator=( PPTTextObj& rTextObj );
+    ImplPPTTextObj*         mpImplTextObj;
+    void                    ImplClear();
+
+                            PPTTextObj(){};
+public:
+                            PPTTextObj(
+                                SvStream& rSt,
+                                SdrPowerPointImport&,
+                                PptSlidePersistEntry&,
+                                DffObjData*
+                            );
+                            PPTTextObj( PPTTextObj& rTextObj );
+                            ~PPTTextObj();
+
+    sal_uInt32              GetCurrentIndex() const { return mpImplTextObj->mnCurrentObject; };
+    sal_uInt32              Count() const { return mpImplTextObj->mnParagraphCount; };
+    PPTParagraphObj*        First();
+    PPTParagraphObj*        Next();
+    MSO_SPT                 GetShapeType() const { return mpImplTextObj->meShapeType; };
+    sal_uInt32              GetInstance() const { return mpImplTextObj->mnInstance; };
+    void                    SetInstance( sal_uInt16 nInstance )
+                            { mpImplTextObj->mnInstance = nInstance; }
+
+    sal_uInt32              GetDestinationInstance() const
+                            { return mpImplTextObj->mnDestinationInstance; }
+
+    void                    SetDestinationInstance( sal_uInt16 nInstance )
+                            { mpImplTextObj->mnDestinationInstance = nInstance; }
+
+    PptOEPlaceholderAtom*   GetOEPlaceHolderAtom() const { return mpImplTextObj->mpPlaceHolderAtom; }
+    sal_uInt32              GetTextFlags() const { return mpImplTextObj->mnTextFlags; }
+    void                    SetVertical( sal_Bool bVertical )
+                            {
+                                if ( bVertical )
+                                    mpImplTextObj->mnTextFlags |= PPT_TEXTOBJ_FLAGS_VERTICAL;
+                                else
+                                    mpImplTextObj->mnTextFlags &= ~PPT_TEXTOBJ_FLAGS_VERTICAL;
+                            }
+    sal_Bool                GetVertical() const
+                            { return ( mpImplTextObj->mnTextFlags & PPT_TEXTOBJ_FLAGS_VERTICAL ) != 0; }
+
+    const SfxItemSet*       GetBackground() const;
+
+    PPTTextObj&             operator=( PPTTextObj& rTextObj );
 };
 
 class PPTConvertOCXControls : public SvxMSConvertOCXControls
 {
-        virtual const   ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage();
-        PptPageKind     ePageKind;
-    public :
-
-        PPTConvertOCXControls( SfxObjectShell* pDSh, PptPageKind ePKind ) :
-            SvxMSConvertOCXControls ( pDSh, NULL ),
-            ePageKind               ( ePKind ){};
-
-        virtual sal_Bool InsertControl(
-            const com::sun::star::uno::Reference<
-            com::sun::star::form::XFormComponent > &rFComp,
-            const com::sun::star::awt::Size& rSize,
-            com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape,
-            sal_Bool bFloatingCtrl );
+    virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage();
+    PptPageKind     ePageKind;
+public :
+
+    PPTConvertOCXControls( SfxObjectShell* pDSh, PptPageKind ePKind ) :
+        SvxMSConvertOCXControls ( pDSh, NULL ),
+        ePageKind               ( ePKind )
+    {};
+
+    virtual sal_Bool InsertControl(
+        const com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > &rFComp,
+        const com::sun::star::awt::Size& rSize,
+        com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape,
+        sal_Bool bFloatingCtrl
+    );
 };
 
 // Powerpoint Recordtypen
@@ -1287,34 +1435,34 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls
 #define PPT_PST_ExOleObjStg                     4113
 #define PPT_PST_ExCDAudioAtom                   4114
 #define PPT_PST_ExWAVAudioEmbeddedAtom          4115
-#define PPT_PST_AnimationInfo               4116
-#define PPT_PST_RTFDateTimeMCAtom           4117
-#define PPT_PST_ProgTags                    5000
-#define PPT_PST_ProgStringTag               5001
-#define PPT_PST_ProgBinaryTag               5002
-#define PPT_PST_BinaryTagData               5003
-#define PPT_PST_PrintOptions                6000
-#define PPT_PST_PersistPtrFullBlock         6001
-#define PPT_PST_PersistPtrIncrementalBlock  6002
+#define PPT_PST_AnimationInfo                   4116
+#define PPT_PST_RTFDateTimeMCAtom               4117
+#define PPT_PST_ProgTags                        5000
+#define PPT_PST_ProgStringTag                   5001
+#define PPT_PST_ProgBinaryTag                   5002
+#define PPT_PST_BinaryTagData                   5003
+#define PPT_PST_PrintOptions                    6000
+#define PPT_PST_PersistPtrFullBlock             6001
+#define PPT_PST_PersistPtrIncrementalBlock      6002
 
 // these atoms first was seen in ppt2000 in a private Tag atom
 #define PPT_PST_NewlyAddedAtomByPPT2000_6010    6010
 #define PPT_PST_NewlyAddedAtomByPPT2000_6011    6011
 
-#define PPT_PST_RulerIndentAtom            10000
-#define PPT_PST_GscalingAtom               10001
-#define PPT_PST_GrColorAtom                10002
-#define PPT_PST_GLPointAtom                10003
-#define PPT_PST_GlineAtom                  10004
-
-#define PPT_PST_NewlyAddedAtomByXP11008     11008
-#define PPT_PST_NewlyAddedAtomByXP11010     11010
-#define PPT_PST_Comment10                   12000
-#define PPT_PST_CommentAtom10               12001
-#define PPT_PST_NewlyAddedAtomByXP12004     12004
-#define PPT_PST_NewlyAddedAtomByXP12010     12010
-#define PPT_PST_NewlyAddedAtomByXP12011     12011
-#define PPT_PST_NewlyAddedAtomByXP14001     14001
+#define PPT_PST_RulerIndentAtom                 10000
+#define PPT_PST_GscalingAtom                    10001
+#define PPT_PST_GrColorAtom                     10002
+#define PPT_PST_GLPointAtom                     10003
+#define PPT_PST_GlineAtom                       10004
+
+#define PPT_PST_NewlyAddedAtomByXP11008         11008
+#define PPT_PST_NewlyAddedAtomByXP11010         11010
+#define PPT_PST_Comment10                       12000
+#define PPT_PST_CommentAtom10                   12001
+#define PPT_PST_NewlyAddedAtomByXP12004         12004
+#define PPT_PST_NewlyAddedAtomByXP12010         12010
+#define PPT_PST_NewlyAddedAtomByXP12011         12011
+#define PPT_PST_NewlyAddedAtomByXP14001         14001
 
 // Attribute fuer PptTextStyleSheet
 #define PPT_ParaAttr_BulletOn       0   //00000001
@@ -1325,17 +1473,14 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls
 #define PPT_ParaAttr_BulletColor    5   //00000020
 #define PPT_ParaAttr_BulletHeight   6   //00000040
 #define PPT_ParaAttr_BulletChar     7   //00000080
-
 #define PPT_ParaAttr_DontKnow1      8   //00000100
 #define PPT_ParaAttr_DontKnow2      9   //00000200
 #define PPT_ParaAttr_DontKnow3      10  //00000400
 #define PPT_ParaAttr_Adjust         11  //00000800 0000=Left, 0001=Center, 0002=Right, 0003=Block
-
 #define PPT_ParaAttr_LineFeed       12  //00001000
 #define PPT_ParaAttr_UpperDist      13  //00002000 ist bei Textframes default immer auf 0032 gesetzt
 #define PPT_ParaAttr_LowerDist      14  //00004000
 #define PPT_ParaAttr_TextOfs        15  //00008000
-
 #define PPT_ParaAttr_BulletOfs      16  //00010000
 #define PPT_ParaAttr_DefaultTab     17  //00020000
 #define PPT_ParaAttr_AsianLB_1      18