#88644# correct getImplementationId and insert some DBG's

4 files changed, 39 insertions, 13 deletions

diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx
index f5140cf4eb9d..c907fd993f33 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtreemodel.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-14 11:58:35 $
+ *  last change: $Author: oj $ $Date: 2001-08-15 13:14:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,10 +74,17 @@ namespace dbaui
     //========================================================================
     //= DBTreeListModel
     //========================================================================
+    DBG_NAME(DBTreeListUserData);
     //------------------------------------------------------------------------
     DBTreeListModel::DBTreeListUserData::DBTreeListUserData()
         :eType(SbaTableQueryBrowser::etQuery)
     {
+        DBG_CTOR(DBTreeListUserData,NULL);
+    }
+    //------------------------------------------------------------------------
+    DBTreeListModel::DBTreeListUserData::~DBTreeListUserData()
+    {
+        DBG_DTOR(DBTreeListUserData,NULL);
     }
 
     //------------------------------------------------------------------------
@@ -103,6 +110,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.8  2001/05/14 11:58:35  oj
+ *  #86744# some changes for entries and views
+ *
  *  Revision 1.7  2001/04/26 11:37:51  fs
  *  file is alive, again - added support for data source associated bookmarks
  *
diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx
index fbb0f4b48a9c..0875fd848b31 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.hxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtreemodel.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-14 11:58:59 $
+ *  last change: $Author: oj $ $Date: 2001-08-15 13:14:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,6 +105,7 @@ namespace dbaui
             SbaTableQueryBrowser::EntryType eType;
 
             DBTreeListUserData();
+            ~DBTreeListUserData();
         };
 
         static sal_uInt16 getImageResId(SbaTableQueryBrowser::EntryType _eType);
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 8df55088b3cf..d3cccabab850 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.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-15 06:47:21 $
+ *  last change: $Author: oj $ $Date: 2001-08-15 13:14:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -281,8 +281,17 @@ Sequence< Type > SAL_CALL OGenericUnoController::getTypes(  ) throw (RuntimeExce
 //------------------------------------------------------------------------------
 Sequence< sal_Int8 > SAL_CALL OGenericUnoController::getImplementationId(  ) throw (RuntimeException)
 {
-    static ::cppu::OImplementationId aId;
-    return aId.getImplementationId();
+    static ::cppu::OImplementationId * pId = 0;
+    if (! pId)
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        if (! pId)
+        {
+            static ::cppu::OImplementationId aId;
+            pId = &aId;
+        }
+    }
+    return pId->getImplementationId();
 }
 
 // -------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 822e11327266..164bd90ca0a5 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbagrid.cxx,v $
  *
- *  $Revision: 1.44 $
+ *  $Revision: 1.45 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-02 15:26:23 $
+ *  last change: $Author: oj $ $Date: 2001-08-15 13:14:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -417,16 +417,18 @@ Sequence< ::rtl::OUString> SbaXGridControl::getSupportedServiceNames_Static(void
     aSupported[2] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl");
     return aSupported;
 }
-
+DBG_NAME(SbaXGridControl );
 //---------------------------------------------------------------------------------------
 SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM)
     : FmXGridControl(_rM)
 {
+    DBG_CTOR(SbaXGridControl ,NULL);
 }
 
 //---------------------------------------------------------------------------------------
 SbaXGridControl::~SbaXGridControl()
 {
+    DBG_DTOR(SbaXGridControl ,NULL);
 }
 
 //---------------------------------------------------------------------------------------
@@ -573,17 +575,19 @@ void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException )
 //=======================================================================================
 // SbaXGridPeer
 //=======================================================================================
-
+DBG_NAME(SbaXGridPeer );
 //---------------------------------------------------------------------------------------
 SbaXGridPeer::SbaXGridPeer(const Reference< XMultiServiceFactory >& _rM)
 : FmXGridPeer(_rM)
 ,m_aStatusListeners(m_aMutex)
 {
+    DBG_CTOR(SbaXGridPeer ,NULL);
 }
 
 //---------------------------------------------------------------------------------------
 SbaXGridPeer::~SbaXGridPeer()
 {
+    DBG_DTOR(SbaXGridPeer ,NULL);
 }
 
 //---------------------------------------------------------------------------------------
@@ -1019,7 +1023,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
 //==================================================================
 // SbaGridControl
 //==================================================================
-
+DBG_NAME(SbaGridControl );
 //---------------------------------------------------------------------------------------
 SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM,
                                Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
@@ -1032,11 +1036,13 @@ SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM,
     ,m_pMasterListener(NULL)
     ,m_bActivatingForDrop(sal_False)
 {
+    DBG_CTOR(SbaGridControl ,NULL);
 }
 
 //---------------------------------------------------------------------------------------
 SbaGridControl::~SbaGridControl()
 {
+    DBG_DTOR(SbaGridControl ,NULL);
 }
 
 //---------------------------------------------------------------------------------------