diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 11:22:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 11:22:54 +0000 |
| commit | 5acedf9c0bd886fd774f68355597455c69b1dd1a (patch) | |
| tree | b5b40ff6ae3293015315ba04178e6de3caec3f5f /writerfilter | |
| parent | 024dcac204729161427378c4145669f68134702c (diff) | |
INTEGRATION: CWS xmlfilter04 (1.5.14); FILE MERGED
2008/03/19 14:33:09 hbrinkm 1.5.14.3: RESYNC: (1.5-1.6); FILE MERGED
2008/03/06 08:21:34 hbrinkm 1.5.14.2: removed getInputStream, new: getStorageStream, getTarget
2008/02/21 12:33:26 hbrinkm 1.5.14.1: joined changes from xmlfilter03
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index 6709c0d6ba8c..f6733e9c405f 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OOXMLStreamImpl.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -46,8 +46,8 @@ class OOXMLStreamImpl : public OOXMLStream void init(); uno::Reference<uno::XComponentContext> mxContext; + uno::Reference<io::XInputStream> mxStorageStream; uno::Reference<embed::XStorage> mxStorage; - uno::Reference<io::XInputStream> mxInputStream; uno::Reference<embed::XRelationshipAccess> mxRelationshipAccess; uno::Reference<io::XStream> mxDocumentStream; uno::Reference<xml::sax::XFastParser> mxFastParser; @@ -57,12 +57,13 @@ class OOXMLStreamImpl : public OOXMLStream rtl::OUString msId; rtl::OUString msPath; + rtl::OUString msTarget; - bool getTarget(uno::Reference<embed::XRelationshipAccess> - xRelationshipAccess, - StreamType_t nStreamType, - const ::rtl::OUString & rId, - ::rtl::OUString & rDocumentTarget); + bool lcl_getTarget(uno::Reference<embed::XRelationshipAccess> + xRelationshipAccess, + StreamType_t nStreamType, + const ::rtl::OUString & rId, + ::rtl::OUString & rDocumentTarget); public: typedef boost::shared_ptr<OOXMLStreamImpl> Pointer_t; @@ -70,12 +71,12 @@ public: (OOXMLStreamImpl & rStream, StreamType_t nType); OOXMLStreamImpl (uno::Reference<uno::XComponentContext> xContext, - uno::Reference<embed::XStorage> xStorage, + uno::Reference<io::XInputStream> xStorageStream, StreamType_t nType); OOXMLStreamImpl(OOXMLStreamImpl & rStream, const rtl::OUString & rId); OOXMLStreamImpl (uno::Reference<uno::XComponentContext> xContext, - uno::Reference<embed::XStorage> xStorage, + uno::Reference<io::XInputStream> xStorageStream, const rtl::OUString & rId); virtual ~OOXMLStreamImpl(); @@ -83,9 +84,11 @@ public: virtual uno::Reference<xml::sax::XParser> getParser(); virtual uno::Reference<xml::sax::XFastParser> getFastParser(); virtual uno::Reference<io::XInputStream> getDocumentStream(); - virtual uno::Reference<io::XInputStream> getInputStream(); + virtual uno::Reference<io::XInputStream> getStorageStream(); virtual uno::Reference<uno::XComponentContext> getContext(); - ::rtl::OUString getTargetForId(const ::rtl::OUString & rId); + virtual ::rtl::OUString getTargetForId(const ::rtl::OUString & rId); + virtual const ::rtl::OUString & getTarget() const; + virtual uno::Reference<xml::sax::XFastTokenHandler> getFastTokenHandler(uno::Reference<uno::XComponentContext> rContext); |