diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
-rw-r--r-- | dbaccess/source/ui/inc/RelationControl.hxx | 17 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index 3a585e42238d..f37e5779694e 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -20,6 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HXX #include <vcl/fixed.hxx> +#include <vcl/builder.hxx> #include <vcl/lstbox.hxx> #include "JoinTableView.hxx" @@ -29,12 +30,10 @@ namespace dbaui class IRelationControlInterface; class ORelationControl; - class OTableListBoxControl : public Window + class OTableListBoxControl { - FixedLine m_aFL_InvolvedTables; - ListBox m_lmbLeftTable, - m_lmbRightTable; - FixedLine m_aFL_InvolvedFields; + ListBox* m_pLeftTable; + ListBox* m_pRightTable; ORelationControl* m_pRC_Tables; const OJoinTableView::OTableWindowMap* m_pTableMap; @@ -44,8 +43,7 @@ namespace dbaui private: DECL_LINK( OnTableChanged, ListBox* ); public: - OTableListBoxControl(Window* _pParent, - const ResId& _rResId, + OTableListBoxControl(VclBuilderContainer* _pParent, const OJoinTableView::OTableWindowMap* _pTableMap, IRelationControlInterface* _pParentDialog); virtual ~OTableListBoxControl(); @@ -75,9 +73,12 @@ namespace dbaui the connection data which is used to init the control */ void Init(const TTableConnectionData::value_type& _pConnData); - void lateUIInit(Window* _pTableSeparator = NULL); + void lateUIInit(); void lateInit(); + void Disable(); + void Invalidate(); + sal_Bool SaveModified(); TTableWindowData::value_type getReferencingTable() const; diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 37be9ab23c22..06362b0ef0f9 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -80,7 +80,7 @@ #define DLG_PARAMETERS RID_DIALOG_START + 5 #define DLG_JOIN_TABADD RID_DIALOG_START + 14 -#define DLG_QRY_JOIN RID_DIALOG_START + 15 + // FREE #define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16 #define DLG_REL_PROPERTIES RID_DIALOG_START + 17 // FREE |