summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-04-29 10:24:57 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-04-29 10:27:29 +0200
commit1c2862e8d130fac1279e293a9fe9992f3fe91591 (patch)
tree0b6b6416db127ce3e6ebd9e17f5172fa9f342ccc /desktop/source
parent8ad743ca8d45e094e433627cf0cf70d11a56084e (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/source')
-rw-r--r--desktop/source/splash/splash.cxx6
1 files changed, 3 insertions, 3 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;
}