[Libreoffice-commits] .: 4 commits - sfx2/source svtools/uiconfig

[Libreoffice Gerrit user]

 sfx2/source/appl/appserv.cxx         |   50 ++++++++++++++---------------------
 svtools/uiconfig/ui/restartdialog.ui |    4 +-
 2 files changed, 23 insertions(+), 31 deletions(-)

New commits:
commit 49e235c0b10ba2f1cfd0cb8d039c7dcf62d8acc5
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 3 14:47:20 2012 +0100

    better have the SolarMutex here

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 439e8b8..b190c52 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -168,6 +168,7 @@ namespace
                 ::rtl::OUString sInteraction;
                 xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction);
                 // Ill be back (hopefully)!
+                SolarMutexGuard aGuard;
                 executeRestartDialog(comphelper::getProcessComponentContext(), NULL, RESTART_REASON_BIBLIOGRAPHY_INSTALL);
             }
             catch (Exception & e)
commit 7d816667b52892492162469b26b7040914e49494
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 3 14:46:18 2012 +0100

    fixup numbering in position

diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
index f31af2e..624053e 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -101,7 +101,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -114,7 +114,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
commit bb49f968c15217a8cdcf74ea08e2f08f2323f627
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 3 14:44:20 2012 +0100

    kill the separate thread, it shouldnt be needed anymore with the dialog

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 130c86f..439e8b8 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"));
commit 291614e3f7f510c5c21903f3e5c56b71a648f60a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 3 14:40:24 2012 +0100

    fix log area as per sal/inc/sal/log-areas.dox

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 57029cf..130c86f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -155,7 +155,7 @@ namespace
             catch (Exception & e)
             {
                 SAL_INFO(
-                    "sfx2.bibliography",
+                    "sfx2.appl",
                     "trying to install LibreOffice Base, caught " << e.Message);
             }
         }
@@ -172,7 +172,7 @@ namespace
         catch (Exception & e)
         {
             SAL_INFO(
-                "sfx2.bibliography",
+                "sfx2.appl",
                 "assuming Base to be missing; caught " << e.Message);
             return false;
         }