#65293# introduce a new intermediate base class between FmXFormShell and WeakComponentImplBase (SUN PRO 5 problem)

2 files changed, 35 insertions, 6 deletions

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 1ceb9a19504a..438dc371aaea 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmshimp.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: th $ $Date: 2001-05-11 15:59:45 $
+ *  last change: $Author: vg $ $Date: 2001-05-22 13:37:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -602,6 +602,25 @@ Reference< XForm> FmXFormShell::DetermineCurForm(const SdrMarkList& rMarkList, s
 
 
 //========================================================================
+// class FmXFormShell_Base_Disambiguation
+//========================================================================
+FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex )
+    :FmXFormShell_BD_BASE( _rMutex )
+{
+}
+
+void SAL_CALL FmXFormShell_Base_Disambiguation::disposing()
+{
+    WeakComponentImplHelperBase::disposing();
+    // Note:
+    // This is a HACK.
+    // Normally it should be sufficient to call the "disposing" of our direct
+    // base class, but SUN PRO 5 does not like this and claims there is a conflict
+    // with the XEventListener::disposing(EventObject) of our various listener
+    // base classes.
+}
+
+//========================================================================
 // class FmXFormShell
 //========================================================================
 DBG_NAME(FmXFormShell);
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 983f039a62dc..0fa03c227294 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmshimp.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: th $ $Date: 2001-05-11 11:18:01 $
+ *  last change: $Author: vg $ $Date: 2001-05-22 13:36:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -277,9 +277,19 @@ typedef ::cppu::WeakComponentImplHelper6<   ::com::sun::star::sdbc::XRowSetListe
                                             ::com::sun::star::util::XModifyListener,
                                             ::com::sun::star::container::XContainerListener,
                                             ::com::sun::star::view::XSelectionChangeListener,
-                                            ::com::sun::star::form::XFormControllerListener> FmXFormShell_BASE;
+                                            ::com::sun::star::form::XFormControllerListener> FmXFormShell_BD_BASE;
 
-typedef ::utl::ConfigItem   FmXFormShell_CFGBASE;
+//========================================================================
+class FmXFormShell_Base_Disambiguation : public FmXFormShell_BD_BASE
+{
+protected:
+    FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex );
+    virtual void SAL_CALL disposing();
+};
+
+//========================================================================
+typedef FmXFormShell_Base_Disambiguation    FmXFormShell_BASE;
+typedef ::utl::ConfigItem                   FmXFormShell_CFGBASE;
 
 class FmXFormShell  :public FmXFormShell_BASE
                     ,public FmXFormShell_CFGBASE