INTEGRATION: CWS mav09 (1.2.264); FILE MERGED

2004/09/16 19:00:53 mav 1.2.264.3: RESYNC: (1.2-1.3); FILE MERGED
2004/06/18 14:07:59 mba 1.2.264.2: #i27773#: new API for Applets
2004/05/18 16:43:01 mba 1.2.264.1: RESYNC to m39

1 files changed, 12 insertions, 16 deletions

diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 27c996c98532..2538a3221222 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SwAppletImpl.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-08-12 11:58:39 $
+ *  last change: $Author: kz $ $Date: 2004-10-04 18:57:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,11 @@
 #define SWHTML_OPTTYPE_PARAM 2
 #define SWHTML_OPTTYPE_SIZE 3
 
+#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
+#endif
+
+
 #ifndef _STRING_HXX //autogen
 #include <tools/string.hxx>
 #endif
@@ -77,28 +82,19 @@
 #ifndef _FRMHTML_HXX //autogen
 #include <sfx2/frmhtml.hxx>
 #endif
-#ifndef _FRAMEOBJ_HXX //autogen
-#include <sfx2/frameobj.hxx>
-#endif
 #ifndef _FRMHTMLW_HXX //autogen
 #include <sfx2/frmhtmlw.hxx>
 #endif
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
-#ifndef _SVSTOR_HXX //autogen
-#include <so3/svstor.hxx>
-#endif
-#ifndef _APPLET_HXX //autogen
-#include <so3/applet.hxx>
-#endif
-#ifndef _PLUGIN_HXX //autogen
-#include <so3/plugin.hxx>
-#endif
+#include <sot/storage.hxx>
 #ifndef _SFXITEMSET_HXX
 #include <svtools/itemset.hxx>
 #endif
 
+#include <svtools/ownlist.hxx>
+
 class SfxItemSet;
 
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_O_hidden, "HIDDEN" );
@@ -109,7 +105,7 @@ extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_O_object, "OBJECT" );
 
 class SwApplet_Impl
 {
-    SvAppletObjectRef xApplet;      // das aktuelle Applet
+    com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > xApplet;
     SvCommandList     aCommandList; // und die szugehorige Command-List
     SfxItemSet        aItemSet;
     String            sAlt;
@@ -126,7 +122,7 @@ public:
     void AppendParam( const String& rName, const String& rValue );
 #endif
     void FinishApplet();
-    SvAppletObject* GetApplet() { return &xApplet; }
+    com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetApplet() { return xApplet; }
     SfxItemSet& GetItemSet() { return aItemSet; }
     const String& GetAltText() { return sAlt; }
     void          SetAltText( const String& rAlt ) {sAlt = rAlt;}