|
 |
2101494 |
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
|
|
|
2101494 |
index b657374..1f32f9b 100644
|
|
|
2101494 |
--- a/desktop/inc/app.hxx
|
|
|
2101494 |
+++ b/desktop/inc/app.hxx
|
|
|
2101494 |
@@ -133,7 +133,6 @@ class Desktop : public Application
|
|
|
2101494 |
static sal_Bool IsFirstStartWizardNeeded();
|
|
|
2101494 |
static sal_Bool CheckExtensionDependencies();
|
|
|
2101494 |
|
|
|
2101494 |
- static void DoRestartActionsIfNecessary( sal_Bool bQuickStart );
|
|
|
2101494 |
static void SetRestartState();
|
|
|
2101494 |
|
|
|
2101494 |
void SynchronizeExtensionRepositories();
|
|
|
2101494 |
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
|
|
|
2101494 |
index 9ec6e87..67834c3 100644
|
|
|
2101494 |
--- a/desktop/source/app/app.cxx
|
|
|
2101494 |
+++ b/desktop/source/app/app.cxx
|
|
|
2101494 |
@@ -1919,9 +1921,8 @@ void Desktop::Main()
|
|
|
2101494 |
|
|
|
2101494 |
if ( !bRestartRequested )
|
|
|
2101494 |
{
|
|
|
2101494 |
- // if this run of the office is triggered by restart, some additional actions should be done
|
|
|
2101494 |
- DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() );
|
|
|
2101494 |
-
|
|
|
2101494 |
+ // if this run of the office is triggered by restart, some
|
|
|
2101494 |
+ // additional actions should be done
|
|
|
2101494 |
Execute();
|
|
|
2101494 |
}
|
|
|
2101494 |
}
|
|
|
2101494 |
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
|
|
|
2101494 |
index 9ef0a8a..673dfa8 100644
|
|
|
2101494 |
--- a/desktop/source/app/appfirststart.cxx
|
|
|
2101494 |
+++ b/desktop/source/app/appfirststart.cxx
|
|
|
2101494 |
@@ -269,38 +269,6 @@ sal_Bool Desktop::IsFirstStartWizardNeeded()
|
|
|
2101494 |
return impl_isFirstStart() || !impl_isLicenseAccepted();
|
|
|
2101494 |
}
|
|
|
2101494 |
|
|
|
2101494 |
-void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart )
|
|
|
2101494 |
-{
|
|
|
2101494 |
- if ( bQuickStart )
|
|
|
2101494 |
- {
|
|
|
2101494 |
- try
|
|
|
2101494 |
- {
|
|
|
2101494 |
- Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
|
|
|
2101494 |
-
|
|
|
2101494 |
- OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( "OfficeRestartInProgress" ) );
|
|
|
2101494 |
- Any aRestart = xPSet->getPropertyValue( sPropName );
|
|
|
2101494 |
- sal_Bool bRestart = sal_False;
|
|
|
2101494 |
- if ( ( aRestart >>= bRestart ) && bRestart )
|
|
|
2101494 |
- {
|
|
|
2101494 |
- xPSet->setPropertyValue( sPropName, makeAny( sal_False ) );
|
|
|
2101494 |
- Reference< util::XChangesBatch >( xPSet, UNO_QUERY_THROW )->commitChanges();
|
|
|
2101494 |
-
|
|
|
2101494 |
- Sequence< Any > aSeq( 2 );
|
|
|
2101494 |
- aSeq[0] <<= sal_True;
|
|
|
2101494 |
- aSeq[1] <<= sal_True;
|
|
|
2101494 |
-
|
|
|
2101494 |
- Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
|
|
|
2101494 |
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Quickstart" ) ) ),UNO_QUERY_THROW );
|
|
|
2101494 |
- xQuickstart->initialize( aSeq );
|
|
|
2101494 |
- }
|
|
|
2101494 |
- }
|
|
|
2101494 |
- catch( uno::Exception& )
|
|
|
2101494 |
- {
|
|
|
2101494 |
- // this is no critical operation so it should not prevent office from starting
|
|
|
2101494 |
- }
|
|
|
2101494 |
- }
|
|
|
2101494 |
-}
|
|
|
2101494 |
-
|
|
|
2101494 |
void Desktop::SetRestartState()
|
|
|
2101494 |
{
|
|
|
2101494 |
try
|