From f26d188ffa00ee6184490fc5c179da16e17301bb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 5 Oct 2012 18:23:16 +0300 Subject: Bin unused leftover "dummy" fields Change-Id: If16fcbb58234a9f1b7e07718f77909273f1fbbd4 --- filter/inc/filter/msfilter/msdffimp.hxx | 3 --- filter/inc/filter/msfilter/svdfppt.hxx | 10 ---------- 2 files changed, 13 deletions(-) (limited to 'filter/inc') diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index f69f076a28f3..e9e1b148346d 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -600,9 +600,6 @@ protected : virtual sal_Bool ShapeHasText(sal_uLong nShapeId, sal_uLong nFilePos) const; public: - void* pSvxMSDffDummy1; - void* pSvxMSDffDummy2; - void* pSvxMSDffDummy3; std::map aEscherBlipCache; DffRecordManager maShapeRecords; diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 8250c7279cdc..79272f57adf5 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -328,7 +328,6 @@ struct PptSlidePersistEntry SdrObject* pBObj; sal_Bool bBObjIsTemporary; - void* pDummy2; PptPageKind ePageKind; // sal_Bool bNotesMaster : 1; // for NotesMaster @@ -379,11 +378,8 @@ struct PPTOleEntry struct PptExOleObjAtom { sal_uInt32 nAspect; - sal_uInt32 nDummy1; sal_uInt32 nId; - sal_uInt32 nDummy2; sal_uInt32 nPersistPtr; - sal_uInt32 nDummy4; public: @@ -429,11 +425,6 @@ public: PowerPointImportParam& rImportParam; - void* pSdrEscherDummy1; - void* pSdrEscherDummy2; - void* pSdrEscherDummy3; - void* pSdrEscherDummy4; - SdrEscherImport( PowerPointImportParam&, const String& rBaseURL ); virtual ~SdrEscherImport(); virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const; @@ -858,7 +849,6 @@ struct PPTStyleSheet : public PPTNumberFormatCreator PPTCharSheet* mpCharSheet[ PPT_STYLESHEETENTRYS ]; PPTParaSheet* mpParaSheet[ PPT_STYLESHEETENTRYS ]; SvxNumBulletItem* mpNumBulletItem[ PPT_STYLESHEETENTRYS ]; - void* mpDummy; PPTStyleSheet( const DffRecordHeader& rSlideHd, -- cgit