#79947# XFormsSupplier removed again

2 files changed, 9 insertions, 31 deletions

diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 4929492e759e..3a0270b1e66f 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodraw.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: os $ $Date: 2001-05-21 12:38:06 $
+ *  last change: $Author: os $ $Date: 2001-05-22 13:34:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,11 +82,8 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_
 #include <com/sun/star/beans/XPropertyState.hpp>
 #endif
-#ifndef _COM_SUN_STAR_FORM_XFORMSSUPPLIER_HPP_
-#include <com/sun/star/form/XFormsSupplier.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE4_HXX_
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#ifndef _CPPUHELPER_IMPLBASE3_HXX_
+#include <cppuhelper/implbase3.hxx> // helper for implementations
 #endif
 #ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #include <cppuhelper/implbase5.hxx> // helper for implementations
@@ -133,9 +130,8 @@ public:
 /* -----------------09.12.98 08:57-------------------
  *
  * --------------------------------------------------*/
-typedef cppu::WeakAggImplHelper4
+typedef cppu::WeakAggImplHelper3
 <
-    ::com::sun::star::form::XFormsSupplier,
     ::com::sun::star::drawing::XDrawPage,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::drawing::XShapeGrouper
@@ -169,9 +165,6 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >  SAL_CALL group(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) throw( ::com::sun::star::uno::RuntimeException );
 
-    //XFormsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getForms(  ) 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/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 2eb4f588dc26..3f703bdcdd8b 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodraw.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: os $ $Date: 2001-05-21 12:40:40 $
+ *  last change: $Author: os $ $Date: 2001-05-22 13:33:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -460,7 +460,7 @@ Sequence< Type > SwXDrawPage::getTypes(  ) throw(RuntimeException)
     Sequence< uno::Type > aSvxTypes = GetSvxPage()->getTypes();
 
     long nIndex = aPageTypes.getLength();
-    aPageTypes.realloc(aPageTypes.getLength() + aSvxTypes.getLength());
+    aPageTypes.realloc(aPageTypes.getLength() + aSvxTypes.getLength() + 1);
 
     uno::Type* pPageTypes = aPageTypes.getArray();
     const uno::Type* pSvxTypes = aSvxTypes.getConstArray();
@@ -469,6 +469,7 @@ Sequence< Type > SwXDrawPage::getTypes(  ) throw(RuntimeException)
     {
         pPageTypes[nIndex++] = pSvxTypes[nPos];
     }
+    pPageTypes[nIndex] = ::getCppuType((Reference< ::com::sun::star::form::XFormsSupplier>*)0);
     return aPageTypes;
 }
 /*-- 22.01.99 11:33:44---------------------------------------------------
@@ -739,22 +740,6 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
         pPage->RemovePageView();
     }
 }
-/* -----------------------------21.05.01 13:47--------------------------------
-
- ---------------------------------------------------------------------------*/
-Reference< XNameContainer > SwXDrawPage::getForms(  ) throw (RuntimeException)
-{
-    vos::OGuard  aGuard(Application::GetSolarMutex());
-    if(!pDoc)
-        throw uno::RuntimeException();
-    if(!pDoc->GetDrawModel())
-        return Reference< XNameContainer > ();
-    else
-    {
-        ((SwXDrawPage*)this)->GetSvxPage();
-        return pDrawPage->getForms();
-    }
-}
 /* -----------------05.05.98 17:05-------------------
  *
  * --------------------------------------------------*/