diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-29 10:24:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-29 10:27:29 +0200 |
| commit | 1c2862e8d130fac1279e293a9fe9992f3fe91591 (patch) | |
| tree | 0b6b6416db127ce3e6ebd9e17f5172fa9f342ccc /desktop | |
| parent | 8ad743ca8d45e094e433627cf0cf70d11a56084e (diff) | |
Remove residue of undocumented "edition" feature
...whereby some branding could be orverridden with information from a program/edition/
directory.
Change-Id: I7f9324678b09bc8069775dfcbda97be8e0618a91
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 6 | ||||
| -rw-r--r-- | desktop/unx/source/splashx.c | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index ac92ea813ef1..c5bc653460a1 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -331,11 +331,11 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, VclWindowEvent *, inEvent ) return 0; } -// Read keys from edition/edition.ini or soffice{.ini|rc}: +// Read keys from soffice{.ini|rc}: OUString implReadBootstrapKey( const OUString& _rKey ) { - OUString sValue("${.override:${BRAND_BASE_DIR}/program/edition/edition.ini:" + _rKey + "}"); - rtl::Bootstrap::expandMacros(sValue); + OUString sValue; + rtl::Bootstrap::get(_rKey, sValue); return sValue; } diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 2f7d548a9189..b957a658bbee 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -610,16 +610,6 @@ static void splash_load_image( struct splash* splash, rtl_uString* pUAppPath ) pSuffix = pBuffer + pAppPath->length; rtl_string_release( pAppPath ); - strcpy (pSuffix, "edition/intro"); - strcat (pSuffix, pLocale); - strcat (pSuffix, IMG_SUFFIX); - if ( splash_load_bmp( splash, pBuffer ) ) - goto cleanup; - - strcpy (pSuffix, "edition/intro" IMG_SUFFIX); - if ( splash_load_bmp( splash, pBuffer ) ) - goto cleanup; - strcpy (pSuffix, "intro"); strcat (pSuffix, pLocale); strcat (pSuffix, IMG_SUFFIX); |