INTEGRATION: CWS dba24b (1.24.180); FILE MERGED

2007/08/24 11:15:57 oj 1.24.180.3: #i80894# reset range to show all tables
2007/08/22 11:41:58 oj 1.24.180.2: #i76374# handle cross join as natural join now in query design
2007/08/16 06:14:43 oj 1.24.180.1: #i56898# clean up of the class structure

1 files changed, 26 insertions, 8 deletions

diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 0545f1d39692..9cf9e069cbd0 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: JoinTableView.hxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: hr $ $Date: 2006-06-20 03:12:15 $
+ *  last change: $Author: hr $ $Date: 2007-11-01 15:16:03 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -57,7 +57,8 @@
 #ifndef _DBACCESS_UI_CALLBACKS_HXX_
 #include "callbacks.hxx"
 #endif
-
+#include "TableConnectionData.hxx"
+#include "TableWindowData.hxx"
 #include <memory>
 #include <vector>
 
@@ -90,6 +91,8 @@ namespace dbaui
 
         void setTableView(OJoinTableView* _pTableView);
 
+        void resetRange(const Point& _aSize);
+
         // own methods
         ScrollBar* GetHScrollBar() { return &m_aHScrollBar; }
         ScrollBar* GetVScrollBar() { return &m_aVScrollBar; }
@@ -131,7 +134,6 @@ namespace dbaui
         OJoinDesignViewAccess*      m_pAccessible;
 
     public:
-        TYPEINFO();
         OJoinTableView( Window* pParent, OJoinDesignView* pView );
         virtual ~OJoinTableView();
 
@@ -219,7 +221,7 @@ namespace dbaui
         */
         sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const;
 
-        OTableConnection*           GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,const OTableConnection* _rpFirstAfter = NULL) const;
+        OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false,const OTableConnection* _rpFirstAfter = NULL) const;
 
         // clears the window map and connection vector without destroying it
         // that means teh data of the windows and connection will be untouched
@@ -278,6 +280,10 @@ namespace dbaui
         virtual void EnsureVisible(const OTableWindow* _pWin);
         virtual void EnsureVisible(const Point& _rPoint,const Size& _rSize);
 
+        TTableWindowData::value_type createTableWindowData(const ::rtl::OUString& _rComposedName
+                                            ,const ::rtl::OUString& _sTableName
+                                            ,const ::rtl::OUString& _rWinName);
+
     protected:
         virtual void MouseButtonUp( const MouseEvent& rEvt );
         virtual void MouseButtonDown( const MouseEvent& rEvt );
@@ -293,8 +299,9 @@ namespace dbaui
         // hier ist die Position (die sich waehrend des Sizings aendern kann) physisch, da waehrend des Sizens nicht gescrollt wird
         virtual void Command(const CommandEvent& rEvt);
 
-        virtual OTableWindowData* CreateImpl(const ::rtl::OUString& _rComposedName,
-                                             const ::rtl::OUString& _rWinName);
+        virtual OTableWindowData* CreateImpl(const ::rtl::OUString& _rComposedName
+                                            ,const ::rtl::OUString& _sTableName
+                                            ,const ::rtl::OUString& _rWinName);
 
         /** factory method to create table windows
             @param  _pData
@@ -302,7 +309,18 @@ namespace dbaui
             @return
                 The new TableWindow
         */
-        virtual OTableWindow* createWindow(OTableWindowData* _pData) = 0;
+        virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData) = 0;
+
+        /** determines whether the classes Init method should accept a query name, or only table names
+        */
+        virtual bool    allowQueries() const;
+
+        /** called when init fails at the tablewindowdata because the m_xTable object could not provide columns, but no
+            exception was thrown. Expected to throw.
+        */
+        virtual void    onNoColumns_throw();
+
+        virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const;
 
     private:
         void    InitColors();