diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-10-05 18:23:16 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-10-06 22:35:58 +0300 |
commit | f26d188ffa00ee6184490fc5c179da16e17301bb (patch) | |
tree | ed2cb6a350f44da80b1ab94535917b56b45f2e26 /filter | |
parent | prevent creating cond formats without a attached range (diff) | |
download | core-f26d188ffa00ee6184490fc5c179da16e17301bb.tar.gz core-f26d188ffa00ee6184490fc5c179da16e17301bb.zip |
Bin unused leftover "dummy" fields
Change-Id: If16fcbb58234a9f1b7e07718f77909273f1fbbd4
Diffstat (limited to 'filter')
-rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 3 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 10 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 10 |
3 files changed, 7 insertions, 16 deletions
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<sal_uInt32,rtl::OString> 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, diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 677a2ae48fd6..9e0fbc076e73 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -221,12 +221,16 @@ SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom ) SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom ) { + sal_uInt32 nDummy1; + sal_uInt32 nDummy2; + sal_uInt32 nDummy4; + rIn >> rAtom.nAspect - >> rAtom.nDummy1 + >> nDummy1 >> rAtom.nId - >> rAtom.nDummy2 + >> nDummy2 >> rAtom.nPersistPtr - >> rAtom.nDummy4; + >> nDummy4; return rIn; } |