splash.cxx (2722cedd) splash.cxx (910823ae)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 265 unchanged lines hidden (view full) ---

274}
275
276// Read keys from edition/edition.ini or soffice{.ini|rc}:
277OUString implReadBootstrapKey( const OUString& _rKey )
278{
279 OUString sValue(
280 rtl::OUString(
281 RTL_CONSTASCII_USTRINGPARAM(
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 265 unchanged lines hidden (view full) ---

274}
275
276// Read keys from edition/edition.ini or soffice{.ini|rc}:
277OUString implReadBootstrapKey( const OUString& _rKey )
278{
279 OUString sValue(
280 rtl::OUString(
281 RTL_CONSTASCII_USTRINGPARAM(
282 "${.override:${BRAND_BASE_DIR}/program/edition/edition.ini:")) +
282 "${.override:${OOO_BASE_DIR}/program/edition/edition.ini:")) +
283 _rKey + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("}")));
284 rtl::Bootstrap::expandMacros(sValue);
285 return sValue;
286}
287
288void SplashScreen::loadConfig()
289{
290 _bShowLogo = !implReadBootstrapKey(

--- 95 unchanged lines hidden (view full) ---

386}
387
388void SplashScreen::initBitmap()
389{
390 if ( _bShowLogo )
391 {
392 OUString sExecutePath;
393 ::rtl::Bootstrap::get(
283 _rKey + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("}")));
284 rtl::Bootstrap::expandMacros(sValue);
285 return sValue;
286}
287
288void SplashScreen::loadConfig()
289{
290 _bShowLogo = !implReadBootstrapKey(

--- 95 unchanged lines hidden (view full) ---

386}
387
388void SplashScreen::initBitmap()
389{
390 if ( _bShowLogo )
391 {
392 OUString sExecutePath;
393 ::rtl::Bootstrap::get(
394 OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ),
394 OUString( RTL_CONSTASCII_USTRINGPARAM( "OOO_BASE_DIR" ) ),
395 sExecutePath );
396 sExecutePath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" ) );
397
398 bool haveBitmap = false;
399
400 // Try all bitmaps in INTRO_BITMAP_NAMES
401 sal_Int32 nIndex = 0;
402 OUString aIntroBitmapFiles( RTL_CONSTASCII_USTRINGPARAM( INTRO_BITMAP_STRINGLIST ));
403 do
404 {
405 haveBitmap = loadBitmap( sExecutePath, aIntroBitmapFiles.getToken( 0, ',', nIndex ) );
406 }
407 while ( !haveBitmap && ( nIndex >= 0 ) );
408
409 if (!haveBitmap) {
410 rtl::OUString edition(
411 rtl::OUString(
412 RTL_CONSTASCII_USTRINGPARAM(
395 sExecutePath );
396 sExecutePath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" ) );
397
398 bool haveBitmap = false;
399
400 // Try all bitmaps in INTRO_BITMAP_NAMES
401 sal_Int32 nIndex = 0;
402 OUString aIntroBitmapFiles( RTL_CONSTASCII_USTRINGPARAM( INTRO_BITMAP_STRINGLIST ));
403 do
404 {
405 haveBitmap = loadBitmap( sExecutePath, aIntroBitmapFiles.getToken( 0, ',', nIndex ) );
406 }
407 while ( !haveBitmap && ( nIndex >= 0 ) );
408
409 if (!haveBitmap) {
410 rtl::OUString edition(
411 rtl::OUString(
412 RTL_CONSTASCII_USTRINGPARAM(
413 "${BRAND_BASE_DIR}/program/edition")));
413 "${OOO_BASE_DIR}/program/edition")));
414 rtl::Bootstrap::expandMacros(edition);
415 haveBitmap = findBitmap(edition);
416 }
417 if (!haveBitmap) {
418 findBitmap(sExecutePath);
419 }
420 }
421}

--- 290 unchanged lines hidden --- 		414 rtl::Bootstrap::expandMacros(edition);
415 haveBitmap = findBitmap(edition);
416 }
417 if (!haveBitmap) {
418 findBitmap(sExecutePath);
419 }
420 }
421}

--- 290 unchanged lines hidden ---