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 /vcl/source | |
| 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 'vcl/source')
| -rw-r--r-- | vcl/source/app/brand.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 11 |
3 files changed, 2 insertions, 19 deletions
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 007496a604ed..fb2cd0192af7 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -41,9 +41,7 @@ namespace { } static bool tryLoadPng( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap ) { - return - loadPng( rBaseDir + "/program/edition" + rName, rBitmap) || - loadPng( rBaseDir + "/program" + rName, rBitmap); + return loadPng( rBaseDir + "/program" + rName, rBitmap); } } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 631b2e12f8a9..638d27f725e2 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -750,8 +750,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot if ( !aName.isEmpty() ) { - // try the gallery first, then edition, and the program path if - // everything else fails + // try the gallery first, then the program path: OUString gallery = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( gallery ); gallery += "/user/gallery/personas/"; @@ -760,9 +759,6 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot rHeaderFooterBitmap = readBitmapEx( gallery + aName ); if ( rHeaderFooterBitmap.IsEmpty() ) - rHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/edition/" + aName ); - - if ( rHeaderFooterBitmap.IsEmpty() ) rHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/" + aName ); } } diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index d7c50d980e06..2ff71eac8337 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -279,17 +279,6 @@ void ImplImageTree::resetPaths() { m_paths.clear(); { OUString url( - "$BRAND_BASE_DIR/program/edition/images"); - rtl::Bootstrap::expandMacros(url); - INetURLObject u(url); - OSL_ASSERT(!u.HasError()); - m_paths.push_back( - std::make_pair( - u.GetMainURL(INetURLObject::NO_DECODE), - css::uno::Reference< css::container::XNameAccess >())); - } - { - OUString url( "$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); |