#84115# impl as WeakComponent

14 files changed, 74 insertions, 57 deletions

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 5df9d63d1228..e93d6a6b7819 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwctrlr.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-19 07:47:21 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -817,9 +817,9 @@ sal_Bool SbaXDataBrowserController::suspend(sal_Bool bSuspend) throw( RuntimeExc
     return bReturn;
 }
 // -----------------------------------------------------------------------
-void SbaXDataBrowserController::dispose()
+void SbaXDataBrowserController::disposing()
 {
-    OGenericUnoController::dispose();
+    OGenericUnoController::disposing();
 
     if (!PendingLoad())
     {
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index a563ae02d045..a6aed18bb757 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: exsrcbrw.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-01 11:06:16 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -396,7 +396,7 @@ Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL SbaExternalSourceBrows
 }
 
 //------------------------------------------------------------------
-void SAL_CALL SbaExternalSourceBrowser::dispose()
+void SAL_CALL SbaExternalSourceBrowser::disposing()
 {
     // say our modify listeners goodbye
     ::com::sun::star::lang::EventObject aEvt;
@@ -421,7 +421,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispose()
         m_xCurrentFrame->removeFrameActionListener(xAggListener);
     }
 
-    SbaXDataBrowserController::dispose();
+    SbaXDataBrowserController::disposing();
 }
 
 //------------------------------------------------------------------
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index bcfa4543b50c..cebea7f86588 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: genericcontroller.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-27 15:11:05 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -125,9 +125,9 @@ using namespace ::comphelper;
 
 // -------------------------------------------------------------------------
 OGenericUnoController::OGenericUnoController(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM)
-    :m_aAsyncInvalidateAll(LINK(this, OGenericUnoController, OnAsyncInvalidateAll))
+    :OGenericUnoController_BASE(m_aMutex)
+    ,m_aAsyncInvalidateAll(LINK(this, OGenericUnoController, OnAsyncInvalidateAll))
     ,m_xMultiServiceFacatory(_rM)
-    ,m_aDisposeListeners(m_aPropertyMutex)
     ,m_bCurrentlyModified(sal_False)
     ,m_bFrameUiActive(sal_False)
     ,m_pView(NULL)
@@ -641,13 +641,8 @@ void OGenericUnoController::removeStatusListener(const Reference< ::com::sun::st
 }
 
 // -----------------------------------------------------------------------
-void OGenericUnoController::dispose()
+void OGenericUnoController::disposing()
 {
-    // say our dispose listeners goodbye
-    EventObject aEvt;
-    aEvt.Source = (XWeak*)(::cppu::OWeakObject*)this;
-    m_aDisposeListeners.disposeAndClear(aEvt);
-
     // our status listeners, too
     while (m_arrStatusListener.size() > 0)
     {
@@ -655,7 +650,7 @@ void OGenericUnoController::dispose()
 
         DispatchTarget& rCurrent = *iterCurrent;
         EventObject aDisposeEvent;
-        aDisposeEvent.Source = (XComponent*)this;
+        aDisposeEvent.Source = (XComponent*)(OGenericUnoController_BASE2*)this;
 
 #ifdef DBG_UTIL
         sal_Int32 nSize = m_arrStatusListener.size();
@@ -681,19 +676,38 @@ void OGenericUnoController::dispose()
 // -----------------------------------------------------------------------
 void OGenericUnoController::addEventListener(const Reference< XEventListener > & aListener)
 {
-    m_aDisposeListeners.addInterface(aListener);
+    OGenericUnoController_BASE::addEventListener(aListener);
 }
 
 // -----------------------------------------------------------------------
 void OGenericUnoController::removeEventListener(const Reference< XEventListener > & aListener)
 {
-    m_aDisposeListeners.removeInterface(aListener);
+    OGenericUnoController_BASE::removeEventListener(aListener);
 }
 
 //------------------------------------------------------------------------------
 void OGenericUnoController::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException )
 {
 }
+// -----------------------------------------------------------------------------
+Any SAL_CALL OGenericUnoController::queryInterface(const Type& _rType) throw (RuntimeException)
+{
+    Any aRet = OGenericUnoController_BASE::queryInterface(_rType);
+    if(aRet.hasValue())
+        return aRet;
+    aRet = OGenericUnoController_BASE2::queryInterface(_rType);
+    return aRet;
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OGenericUnoController::acquire(  ) throw()
+{
+    OGenericUnoController_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OGenericUnoController::release(  ) throw()
+{
+    OGenericUnoController_BASE::release();
+}
 //------------------------------------------------------------------------------
 void OGenericUnoController::EmptyWindow()
 {
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a918103e8636..ef6d8ec4444a 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodatbr.cxx,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-28 10:01:22 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -379,7 +379,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL SbaTableQueryBrowser::dispose()
+void SAL_CALL SbaTableQueryBrowser::disposing()
 {
     ::vos::OGuard aGuard(Application::GetSolarMutex());
         // doin' a lot of VCL stuff here -> lock the SolarMutex
@@ -421,7 +421,7 @@ void SAL_CALL SbaTableQueryBrowser::dispose()
     if (xDatasourceContainer.is())
         xDatasourceContainer->removeContainerListener(this);
 
-    SbaXDataBrowserController::dispose();
+    SbaXDataBrowserController::disposing();
 }
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index 85fe260ff0bf..22141e62f7f0 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinController.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-01 13:27:03 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:17:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -147,7 +147,7 @@ namespace dbaui
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
 
         // ::com::sun::star::lang::XComponent
-        virtual void        SAL_CALL dispose();
+        virtual void        SAL_CALL disposing();
 
         //
         virtual void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn);
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 866e958bcdf6..12de892cdee8 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableController.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-20 11:01:40 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -180,7 +180,7 @@ namespace dbaui
         // ::com::sun::star::frame::XController
         virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException );
         // ::com::sun::star::lang::XComponent
-        virtual void        SAL_CALL dispose();
+        virtual void        SAL_CALL disposing();
 
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index e2046291f69f..dd5eb5e401d4 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwctrlr.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2001-01-09 16:03:40 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -248,7 +248,7 @@ namespace dbaui
 //      virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >  > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw( ::com::sun::star::uno::RuntimeException );
 //
         // ::com::sun::star::lang::XComponent
-        virtual void        SAL_CALL dispose();
+        virtual void        SAL_CALL disposing();
 
         // ::com::sun::star::frame::XFrameActionListener
         virtual void        SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index 9946a601ae89..54c209962582 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbexchange.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-23 15:02:06 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,6 +64,9 @@
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
 #endif
+#ifndef _CPPUHELPER_IMPLBASE2_HXX_
+#include <cppuhelper/implbase2.hxx>
+#endif
 #ifndef _TRANSFER_HXX
 #include <svtools/transfer.hxx>
 #endif
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index 95728cd8c680..cdde607328bb 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: exsrcbrw.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-01-09 16:03:40 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -175,7 +175,7 @@ namespace dbaui
         virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException );
 
         // ::com::sun::star::lang::XComponent
-        virtual void SAL_CALL dispose();
+        virtual void SAL_CALL disposing();
 
         // ::com::sun::star::form::XLoadListener
         virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 1186970f0df1..03ce6099210f 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontroller.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-01 13:27:03 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:17:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -201,7 +201,7 @@ namespace dbaui
         // ::com::sun::star::frame::XController
         virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException );
         // ::com::sun::star::lang::XComponent
-        virtual void        SAL_CALL dispose();
+        virtual void        SAL_CALL disposing();
 
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index c260e77f1cb8..8bc13a836abe 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodatbr.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-16 15:54:53 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,7 +137,7 @@ namespace dbaui
         virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException );
 
         // ::com::sun::star::lang::XComponent
-        virtual void        SAL_CALL dispose();
+        virtual void        SAL_CALL disposing();
 
         // XStatusListener
         virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index c8ee1a2aa63f..b462e7ddba10 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinController.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-01 13:27:54 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:17:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -192,9 +192,9 @@ OJoinController::~OJoinController()
 {
 }
 // -----------------------------------------------------------------------------
-void OJoinController::dispose()
+void OJoinController::disposing()
 {
-    OGenericUnoController::dispose();
+    OGenericUnoController::disposing();
     delete m_pView;
     m_pView         = NULL;
     m_pAddTabDlg    = NULL;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 047ca2841a45..3da409244b1f 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontroller.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-01 13:27:38 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:17:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -250,7 +250,7 @@ OQueryController::~OQueryController()
 {
 }
 // -----------------------------------------------------------------------------
-void OQueryController::dispose()
+void OQueryController::disposing()
 {
     if(m_pSqlIterator)
     {
@@ -273,7 +273,7 @@ void OQueryController::dispose()
     m_pWindow   = NULL; // don't delete this window it will be deleted by the frame
 
     ::comphelper::disposeComponent(m_xComposer);
-    OJoinController::dispose();
+    OJoinController::disposing();
 }
 // -----------------------------------------------------------------------------
 FeatureState OQueryController::GetState(sal_uInt16 _nId)
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 427b5ef71fef..778670a63c31 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableController.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-23 15:11:40 $
+ *  last change: $Author: oj $ $Date: 2001-03-01 15:16:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -247,9 +247,9 @@ OTableController::~OTableController()
     m_aTypeInfo.clear();
 }
 // -----------------------------------------------------------------------------
-void OTableController::dispose()
+void OTableController::disposing()
 {
-    OGenericUnoController::dispose();
+    OGenericUnoController::disposing();
     delete m_pView;
     m_pView     = NULL;