User: hr Date: 2007-11-01 15:35:50+0000 Modified: dba/dbaccess/source/ui/querydesign/querydlg.hxx
Log: INTEGRATION: CWS dba24b (1.6.180); FILE MERGED 2007/08/22 11:41:59 oj 1.6.180.2: #i76374# handle cross join as natural join now in query design 2007/08/16 06:14:44 oj 1.6.180.1: #i56898# clean up of the class structure File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querydlg.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querydlg.hxx?r1=1.6&r2=1.7 Delta lines: +12 -9 -------------------- --- querydlg.hxx 2006-06-20 03:30:21+0000 1.6 +++ querydlg.hxx 2007-11-01 15:35:48+0000 1.7 @@ -65,36 +65,39 @@ { class OQueryTableConnectionData; class OTableListBoxControl; + class OQueryTableView; + class OJoinControl; class DlgQryJoin : public ModalDialog ,public IRelationControlInterface { protected: - FixedLine aFL_Join; - FixedText aFT_Title; - ListBox aLB_JoinType; FixedText aML_HelpText; OKButton aPB_OK; CancelButton aPB_CANCEL; HelpButton aPB_HELP; + OJoinControl* m_pJoinControl; OTableListBoxControl* m_pTableControl; OJoinTableView::OTableWindowMap* m_pTableMap; + OQueryTableView* m_pTableView; EJoinType eJoinType; - OQueryTableConnectionData* m_pConnData; // enth"alt linke und rechte Tabelle - OQueryTableConnectionData* m_pOrigConnData; + TTableConnectionData::value_type m_pConnData; // enth"alt linke und rechte Tabelle + TTableConnectionData::value_type m_pOrigConnData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + DECL_LINK( OKClickHdl, Button* ); DECL_LINK( LBChangeHdl, ListBox* ); + DECL_LINK( NaturalToggleHdl, CheckBox* ); /** setJoinType enables and set the new join type @param _eNewJoinType the new jointype */ void setJoinType(EJoinType _eNewJoinType); public: - DlgQryJoin( Window * pParent, - OQueryTableConnectionData* pData, + DlgQryJoin( OQueryTableView * pParent, + const TTableConnectionData::value_type& pData, OJoinTableView::OTableWindowMap* _pTableMap, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, BOOL _bAllowTableSelect); @@ -104,7 +107,7 @@ /** getConnectionData returns the current connection data @return the current connectiondata */ - virtual OTableConnectionData* getConnectionData() const; + virtual TTableConnectionData::value_type getConnectionData() const; /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
