INTEGRATION: CWS oj14 (1.172.4); FILE MERGED

2007/06/19 08:00:48 fs 1.172.4.10: merging (nearly all) changes from CWS dba23ui herein, which fixes #i78642
2007/06/04 18:07:25 oj 1.172.4.9: RESYNC: (1.185-1.186); FILE MERGED
2007/02/20 15:47:24 oj 1.172.4.8: RESYNC: (1.184-1.185); FILE MERGED
2006/12/18 16:17:43 oj 1.172.4.7: RESYNC: (1.182-1.184); FILE MERGED
2006/11/07 09:14:42 oj 1.172.4.6: RESYNC: (1.175-1.182); FILE MERGED
2006/07/04 07:49:49 oj 1.172.4.5: RESYNC: (1.173-1.175); FILE MERGED
2006/04/25 13:01:30 oj 1.172.4.4: new include
2006/03/20 07:48:13 oj 1.172.4.3: use of module client helper
2006/01/03 13:19:32 oj 1.172.4.2: RESYNC: (1.172-1.173); FILE MERGED
2006/01/03 07:49:02 oj 1.172.4.1: changed module client

dbaccess/source/ui/browser/unodatbr.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unodatbr.cxx,v $
  *
- *  $Revision: 1.188 $
+ *  $Revision: 1.189 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 14:50:55 $
+ *  last change: $Author: rt $ $Date: 2007-07-06 08:05:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -245,9 +245,6 @@
 #ifndef _DBU_BRW_HRC_
 #include "dbu_brw.hrc"
 #endif
-#ifndef _DBAUI_MODULE_DBU_HXX_
-#include "moduledbu.hxx"
-#endif
 #ifndef DBACCESS_SBA_GRID_HRC
 #include "sbagrid.hrc"
 #endif
@@ -557,7 +554,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
         m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) );
         m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
 
-        m_pTreeView = new DBTreeView(getBrowserView(),m_xMultiServiceFacatory, WB_TABSTOP | WB_BORDER);
+        m_pTreeView = new DBTreeView(getBrowserView(),getORB(), WB_TABSTOP | WB_BORDER);
         m_pTreeView->SetPreExpandHandler(LINK(this, SbaTableQueryBrowser, OnExpandEntry));
 
         m_pTreeView->setCopyHandler(LINK(this, SbaTableQueryBrowser, OnCopyEntry));
@@ -3556,7 +3553,7 @@ sal_Bool SbaTableQueryBrowser::requestContextMenu( const CommandEvent& _rEvent )
     // rebuild conn not implemented yet
     aContextMenu.EnableItem(ID_TREE_REBUILD_CONN, sal_False);
 
-    if (!m_xMultiServiceFacatory.is())
+    if (!getORB().is())
         // no ORB -> no administration dialog
         aContextMenu.EnableItem(ID_TREE_EDIT_DATABASE, sal_False);