diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-12-01 20:10:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-02 11:09:23 +0100 |
commit | d489e5fec01c1ae40713b1184042716f3d6ce988 (patch) | |
tree | a1d32e89ab5ef69e5bb582dfeafe09189c8b2d0e /dbaccess | |
parent | 0aaebad112a2d877450133b737c5b08bf8b2387d (diff) |
Related: tdf#121810 pass suitable message dialog parent around
Change-Id: I1a27d82ef94f1052171f7a3f6c5c80c0ec66b547
Reviewed-on: https://gerrit.libreoffice.org/64410
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/filter/hsqldb/hsqlimport.cxx | 7 | ||||
-rw-r--r-- | dbaccess/source/filter/hsqldb/hsqlimport.hxx | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index adb35b93b4f9..c6c851313707 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -759,7 +759,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString m_pImpl->getDocumentSubStorageSupplier() ); dbahsql::HsqlImporter importer(xReturn, xDocSup->getDocumentSubStorage("database",ElementModes::READWRITE) ); - importer.importHsqlDatabase(); + importer.importHsqlDatabase(GetFrameWeld(m_pImpl->getModel_noCreate())); } #endif diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx b/dbaccess/source/filter/hsqldb/hsqlimport.cxx index 7a01045bfb37..49d6f978e6b6 100644 --- a/dbaccess/source/filter/hsqldb/hsqlimport.cxx +++ b/dbaccess/source/filter/hsqldb/hsqlimport.cxx @@ -36,6 +36,8 @@ #include <connectivity/dbexception.hxx> #include <comphelper/processfactory.hxx> +#include <vcl/weld.hxx> + #include "hsqlimport.hxx" #include "parseschema.hxx" #include "rowinputbinary.hxx" @@ -293,7 +295,7 @@ void HsqlImporter::parseTableRows(const IndexVector& rIndexes, xInput->closeInput(); } -void HsqlImporter::importHsqlDatabase() +void HsqlImporter::importHsqlDatabase(weld::Window* pParent) { assert(m_xStorage); @@ -370,7 +372,8 @@ void HsqlImporter::importHsqlDatabase() if (pException) { SAL_WARN("dbaccess", "Error during migration"); - dbtools::showError(dbtools::SQLExceptionInfo{ *pException }, nullptr, + dbtools::showError(dbtools::SQLExceptionInfo{ *pException }, + pParent ? pParent->GetXWindow() : nullptr, ::comphelper::getProcessComponentContext()); } } diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.hxx b/dbaccess/source/filter/hsqldb/hsqlimport.hxx index 12d0489cb852..c4f4d1f24c18 100644 --- a/dbaccess/source/filter/hsqldb/hsqlimport.hxx +++ b/dbaccess/source/filter/hsqldb/hsqlimport.hxx @@ -17,6 +17,11 @@ #include "hsqlbinarynode.hxx" #include "columndef.hxx" +namespace weld +{ +class Window; +} + namespace dbahsql { class SAL_DLLPUBLIC_EXPORT HsqlImporter @@ -49,7 +54,7 @@ public: /** * Migrate a HSQL database to another. */ - void importHsqlDatabase(); + void importHsqlDatabase(weld::Window* pParent); }; } |