#87246#: OLE object support through SAX interface

svx/inc/xmleohlp.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmleohlp.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $
+ *  last change: $Author: mib $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _XMLEOHLP_HXX
 #define _XMLEOHLP_HXX
 
-#ifndef _CPPUHELPER_COMPBASE1_HXX_
-#include <cppuhelper/compbase1.hxx>
+#ifndef _CPPUHELPER_COMPBASE2_HXX_
+#include <cppuhelper/compbase2.hxx>
 #endif
 #ifndef _OSL_MUTEX_HXX_
 #include <osl/mutex.hxx>
@@ -71,13 +71,16 @@
 #ifndef _SVSTOR_HXX
 #include <so3/svstor.hxx>
 #endif
-#ifndef __SGI_STL_VECTOR
-#include <vector>
+#ifndef __SGI_STL_MAP
+#include <map>
 #endif
 
 #ifndef _COM_SUN_STAR_DOCUMENT_XEMBEDDEDOBJECTRESOLVER_HPP_
 #include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
 #endif
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
+#include <com/sun/star/container/XNameAccess.hpp>
+#endif
 
 // -----------------------------
 // - SvXMLEmbeddedObjectHelper -
@@ -95,39 +98,38 @@ enum SvXMLEmbeddedObjectHelperMode
 
 class SvPersist;
 class SvGlobalName;
+struct OUStringLess;
+class OutputStorageWrapper_Impl;
 
-class SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImplHelper1<  ::com::sun::star::document::XEmbeddedObjectResolver >
+class SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImplHelper2<
+    ::com::sun::star::document::XEmbeddedObjectResolver,
+    ::com::sun::star::container::XNameAccess >
 {
+    typedef ::_STL::map< ::rtl::OUString, OutputStorageWrapper_Impl*,
+                         OUStringLess > SvXMLEmbeddedObjectHelper_Impl;
 private:
 
-    typedef ::_STL::vector< ::rtl::OUString >                       URLVector;
-
     ::osl::Mutex                maMutex;
 
     const ::rtl::OUString       maDefaultContainerStorageName;
     ::rtl::OUString             maCurContainerStorageName;
 
-    URLVector                   maEmbeddedObjectURLs;
 
     SvStorage*                  mpRootStorage;  // package
     SvPersist*                  mpDocPersist;
     SvStorageRef                mxContainerStorage; // container sub package for
                                                 // objects
-    SvGlobalName**              mpGlobalNameMap;
-
 
     SvXMLEmbeddedObjectHelperMode       meCreateMode;
-    void*                       mpDummy1;
+    SvXMLEmbeddedObjectHelper_Impl      *mpStreamMap;
     void*                       mpDummy2;
-    BOOL                        mbDirect : 1;
 
     sal_Bool                    ImplGetStorageNames(
                                     const ::rtl::OUString& rURLStr,
                                     ::rtl::OUString& rContainerStorageName,
                                     ::rtl::OUString& rObjectStorageName,
                                     sal_Bool bInternalToExternal ) const;
-    sal_uInt16                  ImplGetFlags(
-                                    const SvGlobalName& rClassId ) const;
+
     SvStorageRef                ImplGetContainerStorage(
                                     const ::rtl::OUString& rStorageName );
     SvStorageRef                ImplGetObjectStorage(
@@ -138,11 +140,10 @@ private:
                                                      const sal_Char* p ) const;
     sal_Bool                    ImplReadObject(
                                     const ::rtl::OUString& rContainerStorageName,
-                                    const ::rtl::OUString& rObjName,
-                                    const SvGlobalName *pClassId );
-    sal_Bool                    ImplWriteObject(
-                                    const ::rtl::OUString& rContainerStorageName,
-                                    const ::rtl::OUString& rObjName );
+                                    ::rtl::OUString& rObjName,
+                                    const SvGlobalName *pClassId,
+                                    SvStorage *pTempStor );
+
     ::rtl::OUString             ImplInsertEmbeddedObjectURL(
                                     const ::rtl::OUString& rURLStr );
 
@@ -150,10 +151,9 @@ protected:
 
                                 SvXMLEmbeddedObjectHelper();
                                 ~SvXMLEmbeddedObjectHelper();
-    void                        Init( SvStorage& rRootStorage,
+    void                        Init( SvStorage *pRootStorage,
                                       SvPersist& rDocPersist,
-                                      SvXMLEmbeddedObjectHelperMode eCreateMode,
-                                      sal_Bool bDirect );
+                                      SvXMLEmbeddedObjectHelperMode eCreateMode );
 
 public:
 
@@ -162,12 +162,24 @@ public:
                                     SvPersist& rDocPersist,
                                     SvXMLEmbeddedObjectHelperMode eCreateMode,
                                     sal_Bool bDirect = sal_True );
+    static SvXMLEmbeddedObjectHelper*   Create(
+                                    SvPersist& rDocPersist,
+                                    SvXMLEmbeddedObjectHelperMode eCreateMode );
     static void                 Destroy( SvXMLEmbeddedObjectHelper* pSvXMLEmbeddedObjectHelper );
 
     void                        Flush();
 
     // XEmbeddedObjectResolver
     virtual ::rtl::OUString SAL_CALL resolveEmbeddedObjectURL( const ::rtl::OUString& aURL ) throw(::com::sun::star::uno::RuntimeException);
+
+    // XNameAccess
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XNameAccess
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException);
 };
 
 #endif

xmloff/inc/XMLBase64Export.hxx

+/*************************************************************************
+ *
+ *  $RCSfile: XMLBase64Export.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: mib $ $Date: 2001-05-18 13:13:00 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef _XMLOFF_XMLBASE64EXPORT_HXX
+#define _XMLOFF_XMLBASE64EXPORT_HXX
+
+namespace com { namespace sun { namespace star { namespace io {
+    class XInputStream; } } } }
+class SvXMLExport;
+
+class XMLBase64Export
+{
+    SvXMLExport&        rExport;
+
+protected:
+
+    SvXMLExport& GetExport() { return rExport; }
+
+public:
+
+    XMLBase64Export( SvXMLExport& rExport );
+
+    sal_Bool exportXML( const ::com::sun::star::uno::Reference <
+            ::com::sun::star::io::XInputStream > & rIn );
+};
+
+
+#endif