diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-09 12:07:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-11 14:29:22 +0100 |
| commit | b71660540e326db3b15899a9db0aa3bf4aed2cee (patch) | |
| tree | 384de799a0e4a17efb06286d40ace7618d237fb9 /sfx2 | |
| parent | 74b3924a98dfeeec719f7bc27a2e0a2e1a597167 (diff) | |
[API CHANGE] migrate PackageKit usage to Modify2
xid dropped in favour of application_id
Change-Id: Id1eb43aa9c8dfb4eac82f99eff0f84c5320e0da0
Reviewed-on: https://gerrit.libreoffice.org/47661
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 31de5352644b..2b902d2ad529 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -186,7 +186,7 @@ namespace return false; } } - void lcl_tryLoadBibliography(const vcl::Window* pTopWindow) + void lcl_tryLoadBibliography() { // lp#527938, debian#602953, fdo#33266, i#105408 // make sure we actually can instantiate services from base first @@ -198,11 +198,7 @@ namespace using namespace svtools; Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); Sequence< OUString > vPackages { "libreoffice-base" }; - - const SystemEnvData* pEnvData = pTopWindow ? pTopWindow->GetSystemData() : nullptr; - sal_uInt32 nDbusId = pEnvData ? GetDbusId(*pEnvData) : 0; - - xSyncDbusSessionHelper->InstallPackageNames(nDbusId, vPackages, OUString()); + xSyncDbusSessionHelper->InstallPackageNames(vPackages, OUString()); // Ill be back (hopefully)! SolarMutexGuard aGuard; executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, RESTART_REASON_BIBLIOGRAPHY_INSTALL); @@ -1667,7 +1663,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) break; case SID_COMP_BIBLIOGRAPHY: - lcl_tryLoadBibliography(GetTopWindow()); + lcl_tryLoadBibliography(); break; } } |