diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-23 16:18:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 18:36:08 +0200 |
| commit | f62efe43a25770b8bcbe9b7bc681284b9a006ea0 (patch) | |
| tree | b60c63a97168d3cf0bc1f07a56bb030d1f26fd6b /dbaccess/source/ui/uno | |
| parent | fix OGeneralSpecialJDBCDetailsPage (diff) | |
| download | core-f62efe43a25770b8bcbe9b7bc681284b9a006ea0.tar.gz core-f62efe43a25770b8bcbe9b7bc681284b9a006ea0.zip | |
weld ODbAdminDialog
Change-Id: I691ce67b55fb16d06d7266ebe671ac31e30c05d5
Reviewed-on: https://gerrit.libreoffice.org/62297
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/uno')
| -rw-r--r-- | dbaccess/source/ui/uno/admindlg.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/copytablewizard.cxx | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 7c4ab1f18d1f..b59627def0a4 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -94,13 +94,13 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI svt::OGenericUnoDialog::Dialog ODataSourcePropertyDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { - VclPtrInstance<ODbAdminDialog> pDialog(VCLUnoHelper::GetWindow(rParent), m_pDatasourceItems.get(), m_aContext); + std::unique_ptr<ODbAdminDialog> xDialog(new ODbAdminDialog(Application::GetFrameWeld(rParent), m_pDatasourceItems.get(), m_aContext)); // the initial selection if ( m_aInitialSelection.hasValue() ) - pDialog->selectDataSource(m_aInitialSelection); + xDialog->selectDataSource(m_aInitialSelection); - return svt::OGenericUnoDialog::Dialog(pDialog); + return svt::OGenericUnoDialog::Dialog(std::move(xDialog)); } } // namespace dbaui diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 40c6eee976bb..fe18ac32a139 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -19,7 +19,6 @@ #include <memory> #include <dbu_reghelper.hxx> -#include <dbu_pageids.hxx> #include <strings.hrc> #include <strings.hxx> #include <stringconstants.hxx> |