From a34836f4554424db0dadff46d7eb1de7076e2642 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 18 Oct 2005 12:53:28 +0000 Subject: INTEGRATION: CWS os62 (1.14.6); FILE MERGED 2005/09/16 08:58:27 os 1.14.6.1: #i43196# each substorage has to be committed and closed after writing a graphic --- svx/inc/xmlgrhlp.hxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'svx/inc/xmlgrhlp.hxx') diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/xmlgrhlp.hxx index 32f8d4705f2d..4446264174cd 100644 --- a/svx/inc/xmlgrhlp.hxx +++ b/svx/inc/xmlgrhlp.hxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlgrhlp.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:50:03 $ + * last change: $Author: rt $ $Date: 2005-10-18 13:53:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,6 +76,11 @@ enum SvXMLGraphicHelperMode // ---------------------- // - SvXMLGraphicHelper - // ---------------------- +struct SvxGraphicHelperStream_Impl +{ + ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > xStorage; + ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream; +}; class SVX_DLLPUBLIC SvXMLGraphicHelper : public ::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver, ::com::sun::star::document::XBinaryStreamResolver > @@ -90,7 +95,6 @@ private: ::osl::Mutex maMutex; ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > mxRootStorage; - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > mxGraphicStorage; ::rtl::OUString maCurStorageName; URLPairVector maGrfURLs; GraphicObjectVector maGrfObjs; @@ -103,7 +107,7 @@ private: ::rtl::OUString& rPictureStorageName, ::rtl::OUString& rPictureStreamName ); SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName ); - SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, + SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName, BOOL bTruncate ); SVX_DLLPRIVATE String ImplGetGraphicMimeType( const String& rFileName ) const; @@ -133,8 +137,6 @@ public: static void Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ); - void Flush(); - public: // XGraphicObjectResolver -- cgit