[openoffice.org/f14/master] IMO this is bogus, restart after component reg forced quickstarter to appear regardless of settings

[Caolan McNamara]

commit 058ed6d00efdb83b460efc276b36d04616d08889
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 19 15:48:57 2010 +0000

    IMO this is bogus, restart after component reg forced quickstarter to appear regardless of settings

 openoffice.org.spec                                |    8 ++-
 qstart.dont-forceenabled-on-post-reg-restart.patch |   71 ++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 28e794d..e195df5 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 15
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@ Patch53: 0001-rhbz-649824-this-key-name-is-wrong.patch
 Patch54: turn-script-providers-into-extensions.patch
 Patch55: 0001-Resolves-rhbz-647392-Ensure-autocorrect-doesn-t-cras.patch
 Patch56: 0001-Resolves-rhbz-654203-crash-after-unhandled-exception.patch
+Patch57: qstart.dont-forceenabled-on-post-reg-restart.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1690,6 +1691,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch54 -p1 -b .turn-script-providers-into-extensions.patch
 %patch55 -p1 -b .rhbz-647392-Ensure-autocorrect-doesn-t-cras.patch
 %patch56 -p1 -b .rhbz-654203-crash-after-unhandled-exception.patch
+%patch57 -p1 -b .qstart.dont-forceenabled-on-post-reg-restart.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3862,6 +3864,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Fri Nov 19 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-15.3-UNBUILT
+- QuickStarter is being enabled for next-start when a new extension
+  is installed/updated.
+
 * Wed Nov 17 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-15.2
 - Resolves: rhbz#654203 crash after unhandled exception via 
   surrounding text callback
diff --git a/qstart.dont-forceenabled-on-post-reg-restart.patch b/qstart.dont-forceenabled-on-post-reg-restart.patch
new file mode 100644
index 0000000..8236e53
--- /dev/null
+++ b/qstart.dont-forceenabled-on-post-reg-restart.patch
@@ -0,0 +1,71 @@
+diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
+index b657374..1f32f9b 100644
+--- a/desktop/inc/app.hxx
++++ b/desktop/inc/app.hxx
+@@ -133,7 +133,6 @@ class Desktop : public Application
+         static sal_Bool         IsFirstStartWizardNeeded();
+         static sal_Bool         CheckExtensionDependencies();
+ 
+-        static void             DoRestartActionsIfNecessary( sal_Bool bQuickStart );
+         static void             SetRestartState();
+ 
+         void                    SynchronizeExtensionRepositories();
+diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
+index 9ec6e87..67834c3 100644
+--- a/desktop/source/app/app.cxx
++++ b/desktop/source/app/app.cxx
+@@ -1919,9 +1921,8 @@ void Desktop::Main()
+ 
+             if ( !bRestartRequested )
+             {
+-                // if this run of the office is triggered by restart, some additional actions should be done
+-                DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() );
+-
++                // if this run of the office is triggered by restart, some
++                // additional actions should be done
+                 Execute();
+             }
+         }
+diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
+index 9ef0a8a..673dfa8 100644
+--- a/desktop/source/app/appfirststart.cxx
++++ b/desktop/source/app/appfirststart.cxx
+@@ -269,38 +269,6 @@ 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();
+-
+-                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