[Libreoffice-commits] core.git: desktop/source desktop/unx extensions/source vcl/source

[Stephan Bergmann]

 desktop/source/splash/splash.cxx             |    6 +++---
 desktop/unx/source/splashx.c                 |   10 ----------
 extensions/source/update/feed/updatefeed.cxx |    8 --------
 vcl/source/app/brand.cxx                     |    4 +---
 vcl/source/app/settings.cxx                  |    6 +-----
 vcl/source/gdi/impimagetree.cxx              |   11 -----------
 6 files changed, 5 insertions(+), 40 deletions(-)

New commits:
commit 1c2862e8d130fac1279e293a9fe9992f3fe91591
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 29 10:24:57 2013 +0200

    Remove residue of undocumented "edition" feature
    
    ...whereby some branding could be orverridden with information from a program/edition/
    directory.
    
    Change-Id: I7f9324678b09bc8069775dfcbda97be8e0618a91

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index ac92ea8..c5bc653 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 2f7d548..b957a65 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);
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index ad97102..2a51d95 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -342,14 +342,6 @@ UpdateInformationProvider::UpdateInformationProvider(
         "org.openoffice.Setup/Product",
         "ooSetupVersion") >>= version;
     buf.append(version);
-    OUString edition(
-            "${${BRAND_BASE_DIR}/program/edition/edition.ini:"
-            "EDITIONNAME}");
-    rtl::Bootstrap::expandMacros(edition);
-    if (!edition.isEmpty()) {
-        buf.append(sal_Unicode(' '));
-        buf.append(edition);
-    }
     OUString extension;
     getConfigurationItem(
         xConfigurationProvider,
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 007496a..fb2cd01 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 631b2e1..638d27f 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 d7c50d9..2ff71ea 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);