INTEGRATION: CWS insight01 (1.10.64); FILE MERGED

2004/07/09 13:18:24 oj 1.10.64.5: #i30416# move some code to dbtree
2004/06/29 07:44:16 oj 1.10.64.4: #109867# don't check the table name when display the metadata
2004/03/18 11:38:49 oj 1.10.64.3: #111075# check if only a table was selected
2004/03/17 12:51:47 oj 1.10.64.2: #111075# renaming of objects
2003/08/15 08:47:50 oj 1.10.64.1: #111075# ongoing new dbaapp work

1 files changed, 17 insertions, 17 deletions

diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index f8c6751ac4bb..7b50d3686015 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabletree.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-19 17:52:43 $
+ *  last change: $Author: hr $ $Date: 2004-08-02 16:03:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,9 +72,6 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
 #endif
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #endif
@@ -99,16 +96,15 @@ protected:
     Image           m_aTableImage;
     Image           m_aViewImage;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
     sal_Bool        m_bVirtualRoot; // should the first entry be visible
 
 public:
-    OTableTreeListBox( Window* pParent, sal_Bool _bHiContrast,WinBits nWinStyle = NULL,sal_Bool _bVirtualRoot=sal_True );
-    OTableTreeListBox( Window* pParent, const ResId& rResId,sal_Bool _bHiContrast,sal_Bool _bVirtualRoot=sal_True );
-
-    void setServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
-        { m_xORB = _rxORB; }
-
+    OTableTreeListBox( Window* pParent
+                        ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
+                        ,sal_Bool _bHiContrast,WinBits nWinStyle = NULL,sal_Bool _bVirtualRoot=sal_True );
+    OTableTreeListBox( Window* pParent
+                        ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
+                        , const ResId& rResId,sal_Bool _bHiContrast,sal_Bool _bVirtualRoot=sal_True );
     /** call when HiContrast change.
     */
     virtual void notifyHiContrastChanged();
@@ -150,7 +146,7 @@ public:
 
     /** to be used if a foreign instance added a table
     */
-    void    addedTable(
+    SvLBoxEntry* addedTable(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn,
                 const ::rtl::OUString& _rName,
                 const ::com::sun::star::uno::Any& _rObject
@@ -163,6 +159,11 @@ public:
                 const ::rtl::OUString& _rName
             );
 
+    SvLBoxEntry*    getEntryByQualifiedName(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn,
+                const ::rtl::OUString& _rName
+            );
+
     SvLBoxEntry*    getAllObjectsEntry() const;
 
     /** does a wildcard check of the given entry
@@ -180,18 +181,17 @@ public:
 protected:
     virtual void InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap);
 
-    virtual void Command( const CommandEvent& rEvt );
-
     virtual void checkedButton_noBroadcast(SvLBoxEntry* _pEntry);
 
     void implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants = sal_True, sal_Bool _bUpdateAncestors = sal_True);
 
-    void implAddEntry(
+    SvLBoxEntry* implAddEntry(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData,
             const ::rtl::OUString& _rTableName,
             const Image& _rImage,
             SvLBoxEntry* _pParentEntry,
-            sal_Int32 _nType
+            sal_Int32 _nType,
+            sal_Bool _bCheckName = sal_True
         );
 
     sal_Bool haveVirtualRoot() const { return m_bVirtualRoot; }