User: hr Date: 2007-11-01 15:16:52+0000 Modified: dba/dbaccess/source/ui/inc/QueryTableView.hxx
Log: INTEGRATION: CWS dba24b (1.16.46); FILE MERGED 2007/08/22 11:41:58 oj 1.16.46.2: #i76374# handle cross join as natural join now in query design 2007/08/16 06:14:43 oj 1.16.46.1: #i56898# clean up of the class structure File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: QueryTableView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/QueryTableView.hxx?r1=1.16&r2=1.17 Delta lines: +11 -4 -------------------- --- QueryTableView.hxx 2007-05-10 10:28:36+0000 1.16 +++ QueryTableView.hxx 2007-11-01 15:16:49+0000 1.17 @@ -71,9 +71,15 @@ virtual void ConnDoubleClicked(OTableConnection* pConnection); virtual void KeyInput(const KeyEvent& rEvt); - virtual OTableWindow* createWindow(OTableWindowData* _pData); + virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData); + + /** 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; public: - TYPEINFO(); OQueryTableView(Window* pParent,OQueryDesignView* pView); virtual ~OQueryTableView(); @@ -131,8 +137,9 @@ BOOL ExistsAVisitedConn(const OQueryTableWindow* pFrom) const; - 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); /** createNewConnection opens the join dialog and allows to create a new join connection */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
