fwk152: #i112452# let restart functionality restart quickstarter as well

4 files changed, 86 insertions, 29 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 1c13317c3b..510b16d8e0 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -134,6 +134,9 @@ class Desktop : public Application
         static sal_Bool         IsFirstStartWizardNeeded();
         static sal_Bool         CheckExtensionDependencies();
 
+        static void             DoRestartActionsIfNecessary( sal_Bool bQuickStart );
+        static void             SetRestartState();
+
         void                    SynchronizeExtensionRepositories();
         void                    SetSplashScreenText( const ::rtl::OUString& rText );
         void                    SetSplashScreenProgress( sal_Int32 );
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b5406fc127..dd59e0cd7c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1659,7 +1659,12 @@ void Desktop::Main()
         ::comphelper::ComponentContext aContext( xSMgr );
         xRestartManager.set( aContext.getSingleton( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.OfficeRestartManager" ) ) ), UNO_QUERY );
         if ( !xRestartManager.is() || !xRestartManager->isRestartRequested( sal_True ) )
+        {
+            // if this run of the office is triggered by restart, some additional actions should be done
+            DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() );
+
             Execute();
+        }
     }
     catch(const com::sun::star::document::CorruptedFilterConfigurationException& exFilterCfg)
     {
@@ -1674,6 +1679,8 @@ void Desktop::Main()
 
     // check whether the shutdown is caused by restart
     sal_Bool bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+    if ( bRestartRequested )
+        SetRestartState();
 
     if (xGlobalBroadcaster.is())
     {
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 9e2d865184..dd084ec85f 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -36,12 +36,14 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
 
 #include "app.hxx"
 
-using rtl::OUString;
-using namespace desktop;
-using namespace com::sun::star::beans;
+using ::rtl::OUString;
+using namespace ::desktop;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::beans;
 
 static const OUString sConfigSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) );
 static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
@@ -128,24 +130,29 @@ sal_Bool Desktop::LicenseNeedsAcceptance()
 */
 }
 
-/* Local function - was the wizard completed already? */
-static sal_Bool impl_isFirstStart()
+/* Local function - get access to the configuration */
+static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rPath )
 {
-    try {
-        Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+    Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
 
-        // get configuration provider
-        Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
-                xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
+    // get configuration provider
+    Reference< XMultiServiceFactory > xConfigProvider = Reference< XMultiServiceFactory >(
+            xFactory->createInstance( sConfigSrvc ), UNO_QUERY_THROW );
 
-        Sequence< Any > theArgs(1);
-        NamedValue v(OUString::createFromAscii("NodePath"), makeAny(OUString::createFromAscii("org.openoffice.Setup/Office")));
-        theArgs[0] <<= v;
+    Sequence< Any > aArgs( 1 );
+    NamedValue aValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NodePath" ) ), makeAny( rPath ) );
+    aArgs[0] <<= aValue;
+    return Reference< XPropertySet >(
+            xConfigProvider->createInstanceWithArguments( sAccessSrvc, aArgs ), UNO_QUERY_THROW );
+}
 
-        Reference< XPropertySet > pset = Reference< XPropertySet >(
-                theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
+/* Local function - was the wizard completed already? */
+static sal_Bool impl_isFirstStart()
+{
+    try {
+        Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
 
-        Any result = pset->getPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"));
+        Any result = xPSet->getPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"));
         sal_Bool bCompleted = sal_False;
         if ((result >>= bCompleted) && bCompleted)
             return sal_False;  // wizard was already completed
@@ -219,20 +226,9 @@ static sal_Bool impl_isLicenseAccepted()
 
     try
     {
-        Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
-
-        // get configuration provider
-        Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
-                xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
+        Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
 
-        Sequence< Any > theArgs(1);
-        NamedValue v(OUString::createFromAscii("NodePath"),
-                makeAny(OUString::createFromAscii("org.openoffice.Setup/Office")));
-        theArgs[0] <<= v;
-        Reference< XPropertySet > pset = Reference< XPropertySet >(
-                theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
-
-        Any result = pset->getPropertyValue(OUString::createFromAscii("LicenseAcceptDate"));
+        Any result = xPSet->getPropertyValue(OUString::createFromAscii("LicenseAcceptDate"));
 
         OUString aAcceptDate;
         if (result >>= aAcceptDate)
@@ -272,3 +268,53 @@ sal_Bool Desktop::IsFirstStartWizardNeeded()
     return impl_isFirstStart() || !impl_isLicenseAccepted();
 }
 
+void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart )
+{
+    if ( bQuickStart )
+    {
+        try
+        {
+            Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
+
+            OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( "OfficeRestartInProgress" ) );
+            Any aRestart = xPSet->getPropertyValue( sPropName );
+            sal_Bool bRestart = sal_False;
+            if ( ( aRestart >>= bRestart ) && bRestart )
+            {
+                xPSet->setPropertyValue( sPropName, makeAny( sal_False ) );
+                Reference< util::XChangesBatch >( xPSet, UNO_QUERY_THROW )->commitChanges();
+
+                sal_Bool bQuickstart = sal_True;
+                sal_Bool bAutostart = sal_True;
+                Sequence< Any > aSeq( 2 );
+                aSeq[0] <<= sal_True;
+                aSeq[1] <<= sal_True;
+
+                Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
+                    OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Quickstart" ) ) ),UNO_QUERY_THROW );
+                xQuickstart->initialize( aSeq );
+            }
+        }
+        catch( uno::Exception& )
+        {
+            // this is no critical operation so it should not prevent office from starting
+        }
+    }
+}
+
+void Desktop::SetRestartState()
+{
+    try
+    {
+        Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
+        OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( "OfficeRestartInProgress" ) );
+        xPSet->setPropertyValue( sPropName, makeAny( sal_True ) );
+        Reference< util::XChangesBatch >( xPSet, UNO_QUERY_THROW )->commitChanges();
+    }
+    catch( uno::Exception& )
+    {
+        // this is no critical operation, ignore the exception
+    }
+
+}
+
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index a1a352ecb9..42a152e6c4 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -339,6 +339,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
                 p = desktop_win32::commandLineAppend(p, argv[i]);
             }
         }
+
         p = desktop_win32::commandLineAppend(
             p, MY_STRING(L"\" \"-env:OOO_CWD="));
         if (cwdLen == 0) {