diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 11:58:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 16:46:22 +0200 |
| commit | e0218ed419378d3c31978bb6765f41e09371dc4f (patch) | |
| tree | e1f7f9d1d76863e578b23c086c47f74682edadd5 /dbaccess/source/ui/relationdesign | |
| parent | 70e5fbcf28fe5eec16f32536adf4b506857d88cf (diff) | |
weld ORelationDialog and DlgQryJoin
Change-Id: I15c0745d387e491dd05e14949d744d0a27a8dd49
Reviewed-on: https://gerrit.libreoffice.org/79600
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RelationTableView.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 30f349a4e68e..484194df9d38 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -220,8 +220,8 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const void ORelationTableView::ConnDoubleClicked(VclPtr<OTableConnection>& rConnection) { - ScopedVclPtrInstance< ORelationDialog > aRelDlg( this, rConnection->GetData() ); - switch (aRelDlg->Execute()) + ORelationDialog aRelDlg(this, rConnection->GetData()); + switch (aRelDlg.run()) { case RET_OK: // successfully updated @@ -248,9 +248,9 @@ void ORelationTableView::AddNewRelation() { TTableConnectionData::value_type pNewConnData( new ORelationTableConnectionData() ); - ScopedVclPtrInstance< ORelationDialog > aRelDlg(this, pNewConnData, true); + ORelationDialog aRelDlg(this, pNewConnData, true); - bool bSuccess = (aRelDlg->Execute() == RET_OK); + bool bSuccess = (aRelDlg.run() == RET_OK); if (bSuccess) { // already updated by the dialog @@ -362,8 +362,8 @@ void ORelationTableView::lookForUiActivities() } if(m_pCurrentlyTabConnData) { - ScopedVclPtrInstance< ORelationDialog > aRelDlg( this, m_pCurrentlyTabConnData ); - if (aRelDlg->Execute() == RET_OK) + ORelationDialog aRelDlg(this, m_pCurrentlyTabConnData); + if (aRelDlg.run() == RET_OK) { // already updated by the dialog addConnection( VclPtr<ORelationTableConnection>::Create( this, m_pCurrentlyTabConnData ) ); |