View | Details | Raw Unified | Return to issue 84169
Collapse All | Expand All

(-)a/desktop/source/app/app.cxx (-3 / +36 lines)
Lines 349-354 namespace desktop Link Here
349
static SalMainPipeExchangeSignalHandler* pSignalHandler = 0;
349
static SalMainPipeExchangeSignalHandler* pSignalHandler = 0;
350
static sal_Bool _bCrashReporterEnabled = sal_True;
350
static sal_Bool _bCrashReporterEnabled = sal_True;
351
351
352
static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
353
static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
354
static const OUString sUpdAccSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
355
352
// ----------------------------------------------------------------------------
356
// ----------------------------------------------------------------------------
353
357
354
ResMgr* Desktop::GetDesktopResManager()
358
ResMgr* Desktop::GetDesktopResManager()
Lines 1306-1311 void Desktop::AppEvent( const ApplicationEvent& rAppEvent ) Link Here
1306
    HandleAppEvent( rAppEvent );
1310
    HandleAppEvent( rAppEvent );
1307
}
1311
}
1308
1312
1313
static sal_Bool impl_probablyNeedsFirstStartWizard()
1314
{
1315
    // Do we need to show EULA?
1316
    ::rtl::OUString sValue;
1317
    static const ::rtl::OUString BOOTPARAM_SHOWLICENSE = ::rtl::OUString::createFromAscii("HideEula");
1318
    sal_Bool bParamExists = ::rtl::Bootstrap::get(BOOTPARAM_SHOWLICENSE, sValue);
1319
    sal_Bool bShowEula = !( bParamExists && sValue.toBoolean() );
1320
1321
    // Are we at the first start?
1322
    try {
1323
        Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
1324
        // get configuration provider
1325
        Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
1326
        xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
1327
        Sequence< Any > theArgs(1);
1328
        NamedValue v(OUString::createFromAscii("NodePath"), 
1329
            makeAny(OUString::createFromAscii("org.openoffice.Setup/Office")));
1330
        theArgs[0] <<= v;
1331
        Reference< XPropertySet > pset = Reference< XPropertySet >(
1332
            theConfigProvider->createInstanceWithArguments(sUpdAccSrvc, theArgs), UNO_QUERY_THROW);
1333
        Any result = pset->getPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"));
1334
        sal_Bool bCompleted = sal_False;
1335
        if ((result >>= bCompleted) && bCompleted && !bShowEula)
1336
            return sal_False;  // wizard was already completed, no EULA to show
1337
    } catch (const Exception&)
1338
    {
1339
    }
1340
1341
    return sal_True;
1342
}
1343
1309
void Desktop::Main()
1344
void Desktop::Main()
1310
{
1345
{
1311
    RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Main" );
1346
    RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Main" );
Lines 1502-1507 void Desktop::Main() Link Here
1502
        RTL_LOGFILE_CONTEXT_TRACE( aLog, "} tools::InitTestToolLib" );
1537
        RTL_LOGFILE_CONTEXT_TRACE( aLog, "} tools::InitTestToolLib" );
1503
1538
1504
        // First Start Wizard
1539
        // First Start Wizard
1540
        if ( impl_probablyNeedsFirstStartWizard() )
1505
        {
1541
        {
1506
            sal_Bool bWidthUI = sal_True;
1542
            sal_Bool bWidthUI = sal_True;
1507
            if (pCmdLineArgs->IsNoFirstStartWizard())
1543
            if (pCmdLineArgs->IsNoFirstStartWizard())
Lines 2223-2231 void Desktop::PreloadConfigurationData() Link Here
2223
        }
2259
        }
2224
    }
2260
    }
2225
2261
2226
    OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
2227
    OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
2228
2229
    // get configuration provider
2262
    // get configuration provider
2230
    Reference< XMultiServiceFactory > xConfigProvider;
2263
    Reference< XMultiServiceFactory > xConfigProvider;
2231
    xConfigProvider = Reference< XMultiServiceFactory > (
2264
    xConfigProvider = Reference< XMultiServiceFactory > (

Return to issue 84169