1 files changed, 5 insertions, 207 deletions

diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 6adc4b81dc54..a5a161181efa 100644..100755
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,88 +49,6 @@ 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" ) );
 
-/* Path of the license. */
-OUString Desktop::GetLicensePath()
-{
-    // license file name
-    static const char *szLicensePath = "/share/readme";
-#if defined(WNT) || defined(OS2)
-    static const char *szWNTLicenseName = "/license";
-    static const char *szWNTLicenseExt = ".txt";
-#else
-    static const char *szUNXLicenseName = "/LICENSE";
-    static const char *szUNXLicenseExt = "";
-#endif
-    static OUString aLicensePath;
-
-    if (aLicensePath.getLength() > 0)
-        return aLicensePath;
-
-    OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
-    rtl::Bootstrap::expandMacros(aBaseInstallPath);
-
-    // determine the filename of the license to show
-    OUString  aLangString;
-    ::com::sun::star::lang::Locale aLocale;
-    OString aMgrName = OString("dkt");
-
-    AllSettings aSettings(Application::GetSettings());
-    aLocale = aSettings.GetUILocale();
-    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
-
-    aLangString = aLocale.Language;
-    if ( aLocale.Country.getLength() != 0 )
-    {
-        aLangString += OUString::createFromAscii("-");
-        aLangString += aLocale.Country;
-        if ( aLocale.Variant.getLength() != 0 )
-        {
-            aLangString += OUString::createFromAscii("-");
-            aLangString += aLocale.Variant;
-        }
-    }
-#if defined(WNT) || defined(OS2)
-    aLicensePath =
-        aBaseInstallPath + OUString::createFromAscii(szLicensePath)
-        + OUString::createFromAscii(szWNTLicenseName)
-        + OUString::createFromAscii("_")
-        + aLangString
-        + OUString::createFromAscii(szWNTLicenseExt);
-#else
-    aLicensePath =
-        aBaseInstallPath + OUString::createFromAscii(szLicensePath)
-        + OUString::createFromAscii(szUNXLicenseName)
-        + OUString::createFromAscii("_")
-        + aLangString
-        + OUString::createFromAscii(szUNXLicenseExt);
-#endif
-    delete pLocalResMgr;
-    return aLicensePath;
-}
-
-/* Check if we need to accept license. */
-sal_Bool Desktop::LicenseNeedsAcceptance()
-{
-    // Don't show a license
-    return sal_False;
-/*
-    sal_Bool bShowLicense = sal_True;
-    sal_Int32 nOpenSourceContext = 0;
-    try
-    {
-        ::utl::ConfigManager::GetDirectConfigProperty(
-            ::utl::ConfigManager::OPENSOURCECONTEXT ) >>= nOpenSourceContext;
-    }
-    catch( const ::com::sun::star::uno::Exception& ) {}
-
-    // open source needs no license
-    if ( nOpenSourceContext > 0 )
-        bShowLicense = sal_False;
-
-    return bShowLicense;
-*/
-}
-
 /* Local function - get access to the configuration */
 static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rPath )
 {
@@ -146,128 +65,6 @@ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rP
             xConfigProvider->createInstanceWithArguments( sAccessSrvc, aArgs ), 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 = xPSet->getPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"));
-        sal_Bool bCompleted = sal_False;
-        if ((result >>= bCompleted) && bCompleted)
-            return sal_False;  // wizard was already completed
-        else
-            return sal_True;
-    } catch (const Exception&)
-    {
-        return sal_True;
-    }
-}
-
-/* Local function - convert oslDateTime to tools DateTime */
-static DateTime impl_oslDateTimeToDateTime(const oslDateTime& aDateTime)
-{
-    return DateTime(
-        Date(aDateTime.Day, aDateTime.Month, aDateTime.Year),
-        Time(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds));
-}
-
-/* Local function - get DateTime from a string */
-static sal_Bool impl_parseDateTime(const OUString& aString, DateTime& aDateTime)
-{
-    // take apart a canonical literal xsd:dateTime string
-    //CCYY-MM-DDThh:mm:ss(Z)
-
-    OUString aDateTimeString = aString.trim();
-
-    // check length
-    if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20)
-        return sal_False;
-
-    sal_Int32 nDateLength = 10;
-    sal_Int32 nTimeLength = 8;
-
-    OUString aDateTimeSep = OUString::createFromAscii("T");
-    OUString aDateSep = OUString::createFromAscii("-");
-    OUString aTimeSep = OUString::createFromAscii(":");
-    OUString aUTCString = OUString::createFromAscii("Z");
-
-    OUString aDateString = aDateTimeString.copy(0, nDateLength);
-    OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
-
-    sal_Int32 nIndex = 0;
-    sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32();
-    sal_Int32 nMonth = aDateString.getToken(0, '-', nIndex).toInt32();
-    sal_Int32 nDay = aDateString.getToken(0, '-', nIndex).toInt32();
-    nIndex = 0;
-    sal_Int32 nHour = aTimeString.getToken(0, ':', nIndex).toInt32();
-    sal_Int32 nMinute = aTimeString.getToken(0, ':', nIndex).toInt32();
-    sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32();
-
-    Date tmpDate((sal_uInt16)nDay, (sal_uInt16)nMonth, (sal_uInt16)nYear);
-    Time tmpTime(nHour, nMinute, nSecond);
-    DateTime tmpDateTime(tmpDate, tmpTime);
-    if (aString.indexOf(aUTCString) < 0)
-        tmpDateTime.ConvertToUTC();
-
-    aDateTime = tmpDateTime;
-    return sal_True;
-}
-
-/* Local function - was the license accepted already? */
-static sal_Bool impl_isLicenseAccepted()
-{
-    // If no license will be shown ... it must not be accepted.
-    // So it was accepted "hardly" by the outside installer.
-    // But if the configuration entry "HideEula" will be removed afterwards ..
-    // we have to show the licese page again and user has to accept it here .-)
-    if ( ! Desktop::LicenseNeedsAcceptance() )
-        return sal_True;
-
-    try
-    {
-        Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
-
-        Any result = xPSet->getPropertyValue(OUString::createFromAscii("LicenseAcceptDate"));
-
-        OUString aAcceptDate;
-        if (result >>= aAcceptDate)
-        {
-            // compare to date of license file
-            OUString aLicenseURL = Desktop::GetLicensePath();
-            osl::DirectoryItem aDirItem;
-            if (osl::DirectoryItem::get(aLicenseURL, aDirItem) != osl::FileBase::E_None)
-                return sal_False;
-            osl::FileStatus aStatus(FileStatusMask_All);
-            if (aDirItem.getFileStatus(aStatus) != osl::FileBase::E_None)
-                return sal_False;
-            TimeValue aTimeVal = aStatus.getModifyTime();
-            oslDateTime aDateTimeVal;
-            if (!osl_getDateTimeFromTimeValue(&aTimeVal, &aDateTimeVal))
-                return sal_False;
-
-            // compare dates
-            DateTime aLicenseDateTime = impl_oslDateTimeToDateTime(aDateTimeVal);
-            DateTime aAcceptDateTime;
-            if (!impl_parseDateTime(aAcceptDate, aAcceptDateTime))
-                return sal_False;
-
-            if ( aAcceptDateTime > aLicenseDateTime )
-                return sal_True;
-        }
-        return sal_False;
-    } catch (const Exception&)
-    {
-        return sal_False;
-    }
-}
-
-/* Check if we need the first start wizard. */
-sal_Bool Desktop::IsFirstStartWizardNeeded()
-{
-    return impl_isFirstStart() || !impl_isLicenseAccepted();
-}
-
 void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart )
 {
     if ( bQuickStart )
@@ -284,9 +81,9 @@ void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart )
                 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;
+                Sequence< Any > aSeq( 1 );
+                sal_Bool bQuickstart = shouldLaunchQuickstart();
+                aSeq[0] <<= bQuickstart;
 
                 Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
                     OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Quickstart" ) ) ),UNO_QUERY_THROW );
@@ -316,3 +113,4 @@ void Desktop::SetRestartState()
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */