Undo basis/brand split: merge basis share/ into brand share/.

3 files changed, 7 insertions, 31 deletions

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 19f073d78a98..5ac685cfcb2b 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -1688,7 +1688,7 @@ static bool AddLocalTempFontDirs( void )
         return false;
     bFirst = false;
 
-    // add private font files found in brand and base layer
+    // add private font files
 
     rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) );
     rtl_bootstrap_expandMacros( &aBrandStr.pData );
@@ -1698,19 +1698,7 @@ static bool AddLocalTempFontDirs( void )
     rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
     aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) );
     aBrandFontDir.append( "/share/fonts/truetype/" );
-    bool bBrandSuccess = AddTempFontDir( aBrandFontDir.getStr() );
-
-    rtl::OUString aBaseStr( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) );
-    rtl_bootstrap_expandMacros( &aBaseStr.pData );
-    rtl::OUString aBaseSysPath;
-    OSL_VERIFY( osl_getSystemPathFromFileURL( aBaseStr.pData, &aBaseSysPath.pData ) == osl_File_E_None );
-
-    rtl::OStringBuffer aBaseFontDir( aBaseSysPath.getLength()*2 );
-    aBaseFontDir.append( rtl::OUStringToOString( aBaseSysPath, RTL_TEXTENCODING_UTF8 ) );
-    aBaseFontDir.append( "/share/fonts/truetype/" );
-    bool bBaseSuccess = AddTempFontDir( aBaseFontDir.getStr() );
-
-    return bBrandSuccess && bBaseSuccess;
+    return AddTempFontDir( aBrandFontDir.getStr() );
 }
 
 void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx
index 374c6331c69a..ce557deefc72 100644
--- a/vcl/ios/source/gdi/salgdi.cxx
+++ b/vcl/ios/source/gdi/salgdi.cxx
@@ -1471,7 +1471,7 @@ static bool AddLocalTempFontDirs( void )
         return false;
     bFirst = false;
 
-    // add private font files found in brand and base layer
+    // add private font files
 
     rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) );
     rtl_bootstrap_expandMacros( &aBrandStr.pData );
@@ -1483,21 +1483,9 @@ static bool AddLocalTempFontDirs( void )
     aBrandFontDir.append( "/share/fonts/truetype/" );
 
     // iterate font files in that and call CTFontManagerRegisterFontsForURL for them?
-    bool bBrandSuccess = true;
+    bool bSuccess = true;
 
-    rtl::OUString aBaseStr( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) );
-    rtl_bootstrap_expandMacros( &aBaseStr.pData );
-    rtl::OUString aBaseSysPath;
-    OSL_VERIFY( osl_getSystemPathFromFileURL( aBaseStr.pData, &aBaseSysPath.pData ) == osl_File_E_None );
-
-    rtl::OStringBuffer aBaseFontDir( aBaseSysPath.getLength()*2 );
-    aBaseFontDir.append( rtl::OUStringToOString( aBaseSysPath, RTL_TEXTENCODING_UTF8 ) );
-    aBaseFontDir.append( "/share/fonts/truetype/" );
-
-    // ditto
-    bool bBaseSuccess = true;
-
-    return bBrandSuccess && bBaseSuccess;
+    return bSuccess;
 }
 
 void IosSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 48ef658facda..b40f6a2beff3 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -301,7 +301,7 @@ void ImplImageTree::resetZips() {
     }
     {
         rtl::OUString url(
-            RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config"));
+            RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config"));
         rtl::Bootstrap::expandMacros(url);
         INetURLObject u(url);
         OSL_ASSERT(!u.HasError());
@@ -320,7 +320,7 @@ void ImplImageTree::resetZips() {
     {
         rtl::OUString url(
             RTL_CONSTASCII_USTRINGPARAM(
-                "$OOO_BASE_DIR/share/config/images.zip"));
+                "$BRAND_BASE_DIR/share/config/images.zip"));
         rtl::Bootstrap::expandMacros(url);
         m_zips.push_back(
             std::make_pair(