diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:36 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:36 +0200 |
| commit | 102d51ec7c35c0b90fff89093d1d2d8c47ea0b7c (patch) | |
| tree | fbf7ceecacb8233b9cf8f65baf210d2bf011f1a6 /filter/inc | |
| parent | e959581b2d44bff812ffddd34b750e4f9f29e187 (diff) | |
| parent | 6c80a64574879415a093e8c3054528ce037beaf4 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/filters
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index a3043b04934d..e2deb12c0fac 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -503,7 +503,7 @@ protected : bool ReadGraphic( SvStream& rSt, sal_uLong nIndex, Graphic& rGraphic ) const; SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const; - SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ) const; + SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ); // #i32596# - pass <nCalledByGroup> to method // Needed in the Writer Microsoft Word import to avoid import of OLE objects // inside groups. Instead a graphic object is created. @@ -560,7 +560,7 @@ public: void* pSvxMSDffDummy1; void* pSvxMSDffDummy2; void* pSvxMSDffDummy3; - List* pEscherBlipCache; + std::map<sal_uInt32,ByteString> aEscherBlipCache; DffRecordManager maShapeRecords; ColorData mnDefaultColor; @@ -650,7 +650,7 @@ public: Rueckgabewert: sal_True, im Erfolgsfalls, sal_False bei Fehler */ - sal_Bool GetBLIP( sal_uLong nIdx, Graphic& rData, Rectangle* pVisArea = NULL ) const; + sal_Bool GetBLIP( sal_uLong nIdx, Graphic& rData, Rectangle* pVisArea = NULL ); /* GetBLIPDirect() -Einlesen eines BLIP aus schon positioniertem Stream |