diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-12-03 14:44:20 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-12-03 14:54:05 +0100 |
| commit | bb49f968c15217a8cdcf74ea08e2f08f2323f627 (patch) | |
| tree | d472507d06c69e45a54576c255db846952bcd00b /sfx2 | |
| parent | fix log area as per sal/inc/sal/log-areas.dox (diff) | |
| download | core-bb49f968c15217a8cdcf74ea08e2f08f2323f627.tar.gz core-bb49f968c15217a8cdcf74ea08e2f08f2323f627.zip | |
kill the separate thread, it shouldnt be needed anymore with the dialog
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 130c86f5ac1f..439e8b848a61 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -135,31 +135,6 @@ using namespace ::com::sun::star::document; namespace { - struct BaseInstallerPhoenix : osl::Thread - { - BaseInstallerPhoenix() {}; - virtual void run() - { - try - { - using namespace org::freedesktop::PackageKit; - using namespace svtools; - Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); - Sequence< ::rtl::OUString > vPackages(1); - vPackages[0] = "libreoffice-base"; - ::rtl::OUString sInteraction; - xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction); - // Ill be back (hopefully)! - executeRestartDialog(comphelper::getProcessComponentContext(), NULL, RESTART_REASON_BIBLIOGRAPHY_INSTALL); - } - catch (Exception & e) - { - SAL_INFO( - "sfx2.appl", - "trying to install LibreOffice Base, caught " << e.Message); - } - } - }; // lp#527938, debian#602953, fdo#33266, i#105408 static bool lcl_isBaseAvailable() { @@ -181,10 +156,26 @@ namespace { // lp#527938, debian#602953, fdo#33266, i#105408 // make sure we actually can instanciate services from base first - //if(!lcl_isBaseAvailable()) + if(!lcl_isBaseAvailable()) { - BaseInstallerPhoenix *pBaseInstallerPhoenix = new BaseInstallerPhoenix(); - pBaseInstallerPhoenix->create(); + try + { + using namespace org::freedesktop::PackageKit; + using namespace svtools; + Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); + Sequence< ::rtl::OUString > vPackages(1); + vPackages[0] = "libreoffice-base"; + ::rtl::OUString sInteraction; + xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction); + // Ill be back (hopefully)! + executeRestartDialog(comphelper::getProcessComponentContext(), NULL, RESTART_REASON_BIBLIOGRAPHY_INSTALL); + } + catch (Exception & e) + { + SAL_INFO( + "sfx2.appl", + "trying to install LibreOffice Base, caught " << e.Message); + } return; } SfxStringItem aURL(SID_FILE_NAME, rtl::OUString(".component:Bibliography/View1")); |