#78595# deprecated interface XTextEmbeddedObject no longer supported

3 files changed, 15 insertions, 412 deletions

diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index fff9dd43f080..fd8a1c05473d 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoframe.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:29 $
+ *  last change: $Author: os $ $Date: 2000-10-16 13:28:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -287,7 +287,7 @@ public:
 --------------------------------------------------*/
 typedef cppu::WeakImplHelper2
 <
-    ::com::sun::star::text::XTextEmbeddedObject,
+    ::com::sun::star::text::XTextContent,
     ::com::sun::star::document::XEmbeddedObjectSupplier
 >SwXTextEmbeddedObjectBaseClass;
 
@@ -319,10 +319,6 @@ public:
     //XEmbeddedObjectSupplier,
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >  SAL_CALL getEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException );
 
-    //XEmbeddedObject
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getObject(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject ) throw(::com::sun::star::uno::RuntimeException);
-
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 8928659ce901..0c23c08b9552 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unocoll.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:28 $
+ *  last change: $Author: os $ $Date: 2000-10-16 13:33:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,6 +161,7 @@
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::container;
@@ -814,8 +815,8 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
                 break;
                 case FLYCNTTYPE_OLE:
                 {
-                    uno::Reference< XTextEmbeddedObject >  xRef = (SwXTextEmbeddedObject*)pFrm;
-                    aRet.setValue(&xRef, ::getCppuType((uno::Reference<XTextEmbeddedObject>*)0));
+                    Reference< XEmbeddedObjectSupplier >  xRef = (SwXTextEmbeddedObject*)pFrm;
+                    aRet.setValue(&xRef, ::getCppuType((Reference<XEmbeddedObjectSupplier>*)0));
                 }
                 break;
             }
@@ -870,8 +871,8 @@ uno::Any SwXFrames::getByName(const OUString& rName)
         break;
         case FLYCNTTYPE_OLE:
         {
-            uno::Reference< XTextEmbeddedObject >  xRef = (SwXTextEmbeddedObject*)pFrm;
-            aRet.setValue(&xRef, ::getCppuType((uno::Reference<XTextEmbeddedObject>*)0));
+            Reference< XEmbeddedObjectSupplier >  xRef = (SwXTextEmbeddedObject*)pFrm;
+            aRet.setValue(&xRef, ::getCppuType((Reference<XEmbeddedObjectSupplier>*)0));
         }
         break;
     }
@@ -2023,386 +2024,4 @@ void SwUnoCollection::Invalidate()
     bObjectValid = sal_False;
     pDoc = 0;
 }
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.122  2000/09/18 16:04:31  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.121  2000/09/15 07:20:32  os
-    service of graphic: ...text.GraphicObject
-
-    Revision 1.120  2000/09/05 15:18:41  os
-    new: SwXFootnotes::GetObject
-
-    Revision 1.119  2000/08/25 08:48:33  os
-    service NumberingRules added
-
-    Revision 1.118  2000/08/23 10:49:07  os
-    new service: ...style.ConditionalParagraphStyle
-
-    Revision 1.117  2000/08/17 10:08:24  os
-    several fixes/extensions for XML
-
-    Revision 1.116  2000/08/10 10:55:22  os
-    #76830# new service com.sun.star.TextField.InputUser
-
-    Revision 1.115  2000/07/11 13:43:42  os
-    #76708# insert/remove paragraphs before/behind tables
-
-    Revision 1.114  2000/06/29 15:00:42  os
-    SwXDocumentIndex holds a SwTOXBase in its descriptor
-
-    Revision 1.113  2000/05/30 13:41:03  os
-    #75867# typo corrected
-
-    Revision 1.112  2000/04/27 10:46:56  os
-    UNICODE
-
-    Revision 1.111  2000/04/26 11:35:19  os
-    GetName() returns String&
-
-    Revision 1.110  2000/04/11 08:31:03  os
-    UNICODE
-
-    Revision 1.109  2000/03/27 10:21:09  os
-    UNO III
-
-    Revision 1.108  2000/03/24 10:31:59  os
-    #65681# SwXReferenceMarks::getObject: search at UnoCallBack
-
-    Revision 1.107  2000/03/21 15:42:23  os
-    UNOIII
-
-    Revision 1.106  2000/02/11 14:35:20  hr
-    #70473# changes for unicode ( patched by automated patchtool )
-
-    Revision 1.105  1999/11/19 16:40:18  os
-    modules renamed
-
-    Revision 1.104  1999/11/10 14:47:45  os
-    new index types
-
-    Revision 1.103  1999/10/26 14:35:33  os
-    LinkTargetSupplier
-
-    Revision 1.102  1999/08/23 14:18:10  OS
-    #68353# create SwXPageStyle in ServiceProvider too
-
-
-      Rev 1.101   23 Aug 1999 16:18:10   OS
-   #68353# create SwXPageStyle in ServiceProvider too
-
-      Rev 1.100   30 Jul 1999 14:37:02   OS
-   TOXBase in sections
-
-      Rev 1.99   29 Jul 1999 13:35:06   OS
-   chg: ::util::XProtectable::getIsProtected -> isProtected
-
-      Rev 1.98   18 May 1999 15:24:24   OS
-   #62019# einzelne Services fuer DocInfo-Felder
-
-      Rev 1.97   23 Apr 1999 15:57:44   OS
-   #65257# Bereiche erzeugen
-
-      Rev 1.96   22 Apr 1999 16:13:38   OS
-   #65194# throw -> throw; #65124# not impl. nur noch warning; EventListener
-
-      Rev 1.95   21 Apr 1999 14:36:04   OS
-   #65098# Verzeichnisse und -eintraege
-
-      Rev 1.94   19 Apr 1999 13:11:00   OS
-   #63005# ::util::XProtectable an den Sections
-
-      Rev 1.93   08 Apr 1999 08:31:58   OS
-   #63865# DocumentStatistic-Felder vereinzelt
-
-      Rev 1.92   24 Mar 1999 07:45:58   OS
-   #63839# XServiceInfo nicht ueber ::XIndexAccess casten
-
-      Rev 1.91   15 Mar 1999 14:36:28   OS
-   #62845# Makro fuer ServiceInfo jetzt auch fuer OS/2
-
-      Rev 1.90   12 Mar 1999 09:41:04   OS
-   #62845# XServiceInfo impl.
-
-      Rev 1.89   09 Mar 1999 12:40:58   OS
-   #62008# Solar-Mutex
-
-      Rev 1.88   05 Mar 1999 14:25:38   OS
-   #62870# Schreibfehler
-
-      Rev 1.87   25 Feb 1999 13:32:50   OS
-   #62405# richtiges Split fuer Tabellen mit korrektem Namen
-
-      Rev 1.86   19 Feb 1999 18:11:30   HR
-   Ueberfluessiges S2U()-Makro entfernt
-
-      Rev 1.85   19 Feb 1999 09:35:12   OS
-   #62083# Styles per ServiceProvider anlegen
-
-      Rev 1.84   18 Feb 1999 07:07:56   OS
-   #52654# String->OUString
-
-      Rev 1.83   11 Feb 1999 11:23:28   OS
-   #52654# uno::Exception fuer TextSections an der richigen Stelle
-
-      Rev 1.82   09 Feb 1999 16:22:00   OS
-   #56371# .is() hat gefehlt
-
-      Rev 1.81   05 Feb 1999 07:28:58   OS
-   #56371# Service-Namen leicht veraendert
-
-      Rev 1.80   03 Feb 1999 11:47:10   OS
-   #56371# ::XElementAccess mitliefern
-
-      Rev 1.79   01 Feb 1999 15:50:06   OS
-   #56371# ServiceNames in der richtigen Reihenfolge
-
-      Rev 1.78   01 Feb 1999 08:22:42   OS
-   #56371# richtiger nIndex fuer ServiceProvider
-
-      Rev 1.77   28 Jan 1999 16:47:02   OS
-   #56371# richtige return-Werte
-
-      Rev 1.76   27 Jan 1999 12:06:58   OS
-   #56371# TF_ONE51
-
-      Rev 1.75   27 Jan 1999 09:47:46   OS
-   #56371# TF_ONE51
-
-      Rev 1.74   19 Jan 1999 14:50:38   OS
-   #56371# FieldMaster(s) vervollstaendigt
-
-      Rev 1.73   19 Jan 1999 08:04:42   OS
-    #56371# TF_ONE51: mehr services
-
-      Rev 1.72   15 Jan 1999 14:35:02   AWO
-   Include conver.hxx
-
-      Rev 1.71   14 Jan 1999 16:21:52   OS
-   #56371# TF_ONE51
-
-      Rev 1.70   13 Jan 1999 10:47:44   OS
-   #52654# ::XIndexAccess im queryInterface fuer XFootnotes
-
-
-      Rev 1.69   10 Dec 1998 15:53:08   OS
-   #56371# TF_ONE51 Zwischenstand
-
-      Rev 1.68   17 Nov 1998 16:29:48   OS
-   #59541# Assertions
-
-      Rev 1.67   12 Nov 1998 09:53:32   OS
-   #52654# Selektion vor dem einfuegen von Feldern loeschen
-
-      Rev 1.66   06 Nov 1998 14:03:44   OS
-   #59074# Assertion
-
-      Rev 1.65   14 Oct 1998 09:59:20   OS
-   #57871# IllegalArgumentException fuer falsche Tabellenangaben
-
-      Rev 1.64   13 Oct 1998 07:48:54   OS
-   #57871# addTextTable - Zeilen und Spalten pruefen
-
-      Rev 1.63   01 Oct 1998 11:55:12   OS
-   #52654# falsches IMPL-Macro berichtigt
-
-      Rev 1.62   30 Sep 1998 19:27:38   JP
-   Bug #57399#: nach InsertTable auf jedenfall mal die gesamte Tabelle tief formatieren
-
-      Rev 1.61   25 Sep 1998 15:49:26   OS
-   #52654# ReferenceMark nicht mehrfach erzeugen
-
-      Rev 1.60   17 Sep 1998 09:28:10   OS
-   #52654# richtige Groessenkonvertierung fuer Rahmen
-
-      Rev 1.59   14 Sep 1998 11:51:42   OS
-   #52654# alte DBG_ERROR entfernt
-
-      Rev 1.58   10 Sep 1998 12:51:20   OS
-   #52654# PROPERTY_NONE statt PROPERTY_BOUND
-
-      Rev 1.57   04 Sep 1998 15:13:58   TRI
-   ICC braucht.is()
-
-      Rev 1.56   03 Sep 1998 10:42:22   OS
-   52654 erste Schritte fuer Redline
-
-      Rev 1.55   28 Aug 1998 11:18:26   OS
-   #52654# RefMark(s)
-
-      Rev 1.54   28 Aug 1998 10:25:28   OS
-   #52654# RefMark(s)
-
-      Rev 1.53   12 Aug 1998 19:40:28   HR
-   #54781#: ::::getCppuType((const uno::Reference< uno::XInterface >*)0)() -> ( uno::XInterface*)0)->getSmartUik
-
-      Rev 1.52   20 Jul 1998 17:25:44   OS
-   Border im FrameDescriptor #52654#
-
-      Rev 1.51   10 Jul 1998 18:08:32   OS
-   PropertySetInfo und IdlClass static
-
-      Rev 1.50   09 Jul 1998 09:14:22   OS
-// automatisch auskommentiert - [getIdlClass(es) or queryInterface] - Bitte XTypeProvider benutzen!
-//   getElementBy* - queryInterface auf XInterface
-
-
-      Rev 1.49   01 Jul 1998 17:49:58   OS
-   Graphic/FrameName fuer Graphic/FrameDescriptor
-
-      Rev 1.48   30 Jun 1998 12:24:02   OS
-   MirrorPageToggle fuer GraphicDescriptor
-
-      Rev 1.47   29 Jun 1998 17:17:12   OS
-   Grafik einfuegen, Descriptor-Properties
-
-      Rev 1.46   27 Jun 1998 16:21:44   OS
-   SwXTextGraphicDescriptor
-
-      Rev 1.45   26 Jun 1998 18:17:34   OS
-   FmtLayoutSplit
-
-      Rev 1.44   26 Jun 1998 17:06:08   OS
-   TextTableDescriptor verwendbar
-
-      Rev 1.43   23 Jun 1998 10:24:38   OS
-   Verzeichnisse benutzbar, mit Descriptor, Tables/Frames mit Descriptor
-
-      Rev 1.42   18 Jun 1998 13:22:44   OS
-   include-Umstellung 396c
-
-      Rev 1.41   16 Jun 1998 16:52:20   OS
-   removeXXX -> removeXXXByName
-
-      Rev 1.40   12 Jun 1998 09:47:32   OS
-   TextTableDescriptor: erste Spalten, dann Zeilen
-
-      Rev 1.39   10 Jun 1998 09:54:44   OS
-   Package-Umstellung
-
-      Rev 1.38   09 Jun 1998 13:27:08   OS
-   insertTextTable mit Descriptor
-
-      Rev 1.37   05 Jun 1998 15:45:02   OS
-   addTextTable: keine Tabellen in Tabellen
-
-      Rev 1.36   04 Jun 1998 09:40:04   OS
-// automatisch auskommentiert - [getIdlClass(es) or queryInterface] - Bitte XTypeProvider benutzen!
-//   getIdlClasses
-
-
-      Rev 1.35   26 May 1998 12:32:38   OS
-   eigenes File fuer styles
-
-      Rev 1.34   25 May 1998 09:57:30   OS
-   ChapterNumbering -> unosett.cxx
-
-      Rev 1.33   14 May 1998 17:49:24   OS
-   div. Namensaenderungen
-
-      Rev 1.32   13 May 1998 15:29:18   OS
-   TextPosition-Auswertung verbessert
-
-      Rev 1.31   12 May 1998 16:03:06   JP
-   rund um Flys/DrawObjs im Doc/FESh umgestellt/optimiert
-
-      Rev 1.30   06 May 1998 16:17:40   OS
-   Shapes raus
-
-      Rev 1.29   05 May 1998 13:58:24   OS
-   XTextShapes
-
-      Rev 1.28   09 Apr 1998 15:10:52   OS
-   Uno-Umstellung
-
-      Rev 1.27   08 Apr 1998 12:53:18   OS
-   Remove fuer SwXFrames, SwXTextTables
-
-      Rev 1.26   07 Apr 1998 14:10:38   OS
-// automatisch auskommentiert - [getIdlClass(es) or queryInterface] - Bitte XTypeProvider benutzen!
-//   queryInterface fuer Graphic und EmbeddedObject vollstaendig
-
-
-      Rev 1.25   31 Mar 1998 15:37:02   OS
-   XTextPositionToPaM
-
-      Rev 1.24   30 Mar 1998 10:24:04   OS
-   neue Verzeichnistypen
-
-      Rev 1.23   27 Mar 1998 09:02:24   OS
-   NameAccess fuer SwXFrames inpl.
-
-      Rev 1.22   26 Mar 1998 14:09:54   OS
-   Felder und Feldtypen loeschen
-
-      Rev 1.21   21 Mar 1998 14:53:56   OS
-   SwXFootnotes
-
-      Rev 1.20   17 Mar 1998 08:54:30   TRI
-   ICC brauchte const
-
-      Rev 1.19   14 Mar 1998 15:57:12   OS
-   NewFlyFrame: SwFlyFrm*
-
-      Rev 1.18   13 Mar 1998 17:49:12   OS
-   Solaris-Fehler
-
-      Rev 1.17   13 Mar 1998 08:26:02   OS
-   Position von Shapes uebernehmen
-
-      Rev 1.16   12 Mar 1998 13:06:26   OS
-   Shape
-
-      Rev 1.15   11 Mar 1998 08:00:08   OS
-   Rahmen einfuegen
-
-      Rev 1.14   10 Mar 1998 12:27:46   OS
-   Sections und Bookmarks
-
-      Rev 1.13   09 Mar 1998 11:35:04   OS
-   GetPaM statt GetPosition
-
-      Rev 1.12   07 Mar 1998 16:12:46   OS
-   alte Feldtypen raus
-
-      Rev 1.11   05 Mar 1998 17:39:30   OS
-   HIDDEN_TEXT ->CONDITIONED_TEXT
-
-      Rev 1.10   03 Mar 1998 10:15:34   OS
-   XEmbeddedObject(s), XGraphicObject(s) im offmgr
-
-      Rev 1.9   02 Mar 1998 07:36:20   OS
-   erste Curosorschritte
-
-      Rev 1.8   26 Feb 1998 16:58:48   OS
-   Fieldtypes
-
-      Rev 1.7   24 Feb 1998 18:03:52   OS
-   sal_uInt32-cast
-
-      Rev 1.6   23 Feb 1998 09:14:52   OS
-   GetIdlClass
-
-      Rev 1.5   23 Feb 1998 07:31:20   OS
-   Bookmarks, Grafiken und OLE
-
-      Rev 1.4   19 Feb 1998 17:29:40   OS
-   getSmartUik, Fields-Interface veraendert
-
-      Rev 1.3   17 Feb 1998 08:52:52   OS
-   SwXTextFrames impl.
-
-      Rev 1.2   13 Feb 1998 16:11:54   OS
-   TextTables: Zugriffe verwendbar
-
-      Rev 1.1   12 Feb 1998 14:55:48   OS
-   Geruest aufgebaut
-
-      Rev 1.0   11 Feb 1998 16:19:50   OS
-   Initial revision.
-
-------------------------------------------------------------------------*/
-
 
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index eaa2ef2260eb..9ce5eaac8d0c 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoframe.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:28 $
+ *  last change: $Author: os $ $Date: 2000-10-16 13:28:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2322,21 +2322,6 @@ uno::Reference< XComponent >  SwXTextEmbeddedObject::getEmbeddedObject(void) thr
     }
     return xRet;
 }
-/*-- 11.12.98 16:16:56---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-uno::Reference< uno::XInterface >  SwXTextEmbeddedObject::getObject(void) throw( RuntimeException )
-{
-    DBG_WARNING("not implemented")
-    return uno::Reference< uno::XInterface > ();
-}
-/*-- 11.12.98 16:16:56---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-void SwXTextEmbeddedObject::setObject(const uno::Reference< uno::XInterface > & xObject) throw( RuntimeException )
-{
-    DBG_WARNING("not implemented")
-}
 /* -----------------03.05.99 12:28-------------------
  *
  * --------------------------------------------------*/
@@ -2573,6 +2558,9 @@ sal_uInt16 SwXOLEListener::FindEntry( const EventObject& rEvent,SwOLENode** ppNd
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/19 00:08:28  hr
+    initial import
+
     Revision 1.89  2000/09/18 16:04:31  willem.vandorp
     OpenOffice header added.