diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-16 20:23:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-29 09:40:09 +0200 |
| commit | a7035eb87aef491b52fae83675dd4d1a9877de4a (patch) | |
| tree | 37d6ee480beb5128deadaa23b479a5ed22ee4b89 /svx | |
| parent | 456f25b164c2cf79f3a5120023c998a2cfcde019 (diff) | |
tdf#125340 transport preferred dialog parent down the migration dialog
Change-Id: Icb7bab35eac3ae08fb82d73f559ef161dd1820c3
Reviewed-on: https://gerrit.libreoffice.org/77638
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmvwimp.cxx | 3 | ||||
| -rw-r--r-- | svx/source/form/tabwin.cxx | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index e4d4bf6e010b..90b25997821c 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -267,7 +267,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { OUString sSignificantSource( sDatasource.isEmpty() ? sDatabaseLocation : sDatasource ); xConnection = getConnection_withFeedback(sSignificantSource, OUString(), OUString(), - static_cast<FmGridControl*>(GetParent())->getContext() ); + static_cast<FmGridControl*>(GetParent())->getContext(), nullptr ); } catch(NoSuchElementException&) { // allowed, means sDatasource isn't a valid data source name .... diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 588c6757f55a..cc6bcef46f65 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1167,7 +1167,8 @@ SdrObjectUniquePtr FmXFormView::implCreateFieldControl( const svx::ODataAccessDe sDataSource, OUString(), OUString(), - comphelper::getProcessComponentContext() + comphelper::getProcessComponentContext(), + nullptr ) ); } catch (const SQLException&) diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 5620c9ffdea5..5da553b356e2 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -316,7 +316,7 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x // get the connection of the form m_aConnection.reset( - connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessComponentContext() ), + connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessComponentContext(), nullptr ), SharedConnection::NoTakeOwnership ); // TODO: When incompatible changes (such as extending the "virtualdbtools" interface by ensureRowSetConnection) |