Tag: cws_src680_hsqlcsv
User: fs      
Date: 2006/10/11 01:51:02

Modified:
   dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx

Log:
 RESYNC: (1.15-1.17); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/ui/app/
=======================================

File [changed]: AppDetailPageHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.15.12.5&r2=1.15.12.6
Delta lines:  +9 -10
--------------------
--- AppDetailPageHelper.cxx     18 Sep 2006 20:19:00 -0000      1.15.12.5
+++ AppDetailPageHelper.cxx     11 Oct 2006 08:50:59 -0000      1.15.12.6
@@ -32,6 +32,9 @@
  *    MA  02111-1307  USA
  *
  ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_dbaccess.hxx"
 #ifndef DBAUI_APPDETAILPAGEHELPER_HXX
 #include "AppDetailPageHelper.hxx"
 #endif
@@ -750,8 +753,7 @@
 // 
-----------------------------------------------------------------------------
 void OAppDetailPageHelper::elementReplaced(ElementType _eType
                                                                                
                        ,const ::rtl::OUString& _rOldName
-                                                                               
                        ,const ::rtl::OUString& _rNewName
-                                                                               
                        ,const Reference< XConnection >& _rxConn)
+                                                                               
                        ,const ::rtl::OUString& _rNewName )
 {
        DBTreeListBox* pTreeView = getCurrentView();
        if ( pTreeView )
@@ -761,7 +763,6 @@
                switch( _eType )
                {
                        case E_TABLE:
-                               OSL_ENSURE(_rxConn.is(),"Connection is NULL! 
->GPF");
                                
static_cast<OTableTreeListBox*>(pTreeView)->removedTable( _rOldName );
                                
static_cast<OTableTreeListBox*>(pTreeView)->addedTable( _rNewName );
                                return;
@@ -784,13 +785,12 @@
        }
 }
 // 
-----------------------------------------------------------------------------
-SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const 
::rtl::OUString& _rName, const Any& _rObject, const Reference< XConnection >& 
_rxConn )
+SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const 
::rtl::OUString& _rName, const Any& _rObject )
 {
        SvLBoxEntry* pRet = NULL;
        DBTreeListBox* pTreeView = m_pLists[_eType];
        if( _eType == E_TABLE && pTreeView )
        {
-               OSL_ENSURE(_rxConn.is(),"Connection is NULL! ->GPF");
                pRet = static_cast<OTableTreeListBox*>(pTreeView)->addedTable( 
_rName );
        }
        else if ( pTreeView )
@@ -832,7 +832,7 @@
        return pRet;
 }
 // 
-----------------------------------------------------------------------------
-void OAppDetailPageHelper::elementRemoved(ElementType _eType,const 
::rtl::OUString& _rName, const Reference< XConnection >& _rxConn )
+void OAppDetailPageHelper::elementRemoved( ElementType _eType,const 
::rtl::OUString& _rName )
 {
        DBTreeListBox* pTreeView = getCurrentView();
        if ( pTreeView )
@@ -840,7 +840,6 @@
                switch( _eType )
                {
                        case E_TABLE:
-                               OSL_ENSURE(_rxConn.is(),"Connection is NULL! 
->GPF");
                 // we don't need to clear the table here, it is already done 
by the dispose listener
                                static_cast< OTableTreeListBox* >( pTreeView 
)->removedTable( _rName );
                                break;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to