From b786a33cfdca2e8a4114ddef0340e0e0628dd09c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 21 Oct 2011 17:18:13 +0200
Subject: Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR
 and BaseInstallation.

---
 .../officeinstallationdirectories.cxx              | 49 +++-------------------
 .../officeinstallationdirectories.hxx              |  1 -
 2 files changed, 6 insertions(+), 44 deletions(-)

(limited to 'comphelper')

diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 35bcfecc7f9d..0e5c08145b8a 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -107,7 +107,6 @@ OfficeInstallationDirectories::OfficeInstallationDirectories(
   m_aUserDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(userdataurl)" ) ),
   m_xCtx( xCtx ),
   m_pOfficeBrandDir( 0 ),
-  m_pOfficeBaseDir( 0 ),
   m_pUserDir( 0 )
 {
 }
@@ -117,7 +116,6 @@ OfficeInstallationDirectories::OfficeInstallationDirectories(
 OfficeInstallationDirectories::~OfficeInstallationDirectories()
 {
     delete m_pOfficeBrandDir;
-    delete m_pOfficeBaseDir;
     delete m_pUserDir;
 }
 
@@ -168,24 +166,13 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
         }
         else
         {
-            nIndex = aCanonicalURL.indexOf( *m_pOfficeBaseDir );
+            nIndex = aCanonicalURL.indexOf( *m_pUserDir );
             if ( nIndex  != -1 )
             {
                 return rtl::OUString(
                     aCanonicalURL.replaceAt( nIndex,
-                                             m_pOfficeBaseDir->getLength(),
-                                             m_aOfficeBaseDirMacro ) );
-            }
-            else
-            {
-                nIndex = aCanonicalURL.indexOf( *m_pUserDir );
-                if ( nIndex  != -1 )
-                {
-                    return rtl::OUString(
-                        aCanonicalURL.replaceAt( nIndex,
-                                                 m_pUserDir->getLength(),
-                                                 m_aUserDirMacro ) );
-                }
+                                             m_pUserDir->getLength(),
+                                             m_aUserDirMacro ) );
             }
         }
     }
@@ -212,28 +199,15 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
         }
         else
         {
-            nIndex = URL.indexOf( m_aOfficeBaseDirMacro );
+            nIndex = URL.indexOf( m_aUserDirMacro );
             if ( nIndex != -1 )
             {
                 initDirs();
 
                 return rtl::OUString(
                     URL.replaceAt( nIndex,
-                                   m_aOfficeBaseDirMacro.getLength(),
-                                   *m_pOfficeBaseDir ) );
-            }
-            else
-            {
-                nIndex = URL.indexOf( m_aUserDirMacro );
-                if ( nIndex != -1 )
-                {
-                    initDirs();
-
-                    return rtl::OUString(
-                        URL.replaceAt( nIndex,
-                                       m_aUserDirMacro.getLength(),
-                                       *m_pUserDir ) );
-                }
+                                   m_aUserDirMacro.getLength(),
+                                   *m_pUserDir ) );
             }
         }
     }
@@ -331,7 +305,6 @@ void OfficeInstallationDirectories::initDirs()
         if ( m_pOfficeBrandDir == 0 )
         {
             m_pOfficeBrandDir = new rtl::OUString;
-            m_pOfficeBaseDir  = new rtl::OUString;
             m_pUserDir        = new rtl::OUString;
 
             uno::Reference< util::XMacroExpander > xExpander;
@@ -355,16 +328,6 @@ void OfficeInstallationDirectories::initDirs()
 
                 makeCanonicalFileURL( *m_pOfficeBrandDir );
 
-                *m_pOfficeBaseDir =
-                    xExpander->expandMacros(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                            "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
-
-                OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
-                            "Unable to obtain office base installation directory!" );
-
-                makeCanonicalFileURL( *m_pOfficeBaseDir );
-
                 *m_pUserDir =
                     xExpander->expandMacros(
                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 00f5b81df3f9..86e85372c5fb 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -101,7 +101,6 @@ private:
     com::sun::star::uno::Reference<
         com::sun::star::uno::XComponentContext >    m_xCtx;
     rtl::OUString *                                 m_pOfficeBrandDir;
-    rtl::OUString *                                 m_pOfficeBaseDir;
     rtl::OUString *                                 m_pUserDir;
 };
 
-- 
cgit