summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-07-21 16:08:08 +0200
committerThomas Arnhold <thomas@arnhold.org>2011-07-22 01:30:19 +0200
commit078a23a7f563df4df81954abf0d4b94e9a9663a7 (patch)
tree917b0886d563cb7df8ee999ae629e251991d0f99 /vcl
parentaddcfeb736232d1c0d0c8a173105253c1679e92c (diff)
Remove SAL_FONTPATH and SAL_FONTPATH_PRIVATE
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/svapp.cxx5
-rw-r--r--vcl/source/glyphs/glyphcache.cxx2
-rw-r--r--vcl/unx/generic/app/saldisp.cxx2
-rw-r--r--vcl/unx/generic/fontmanager/helper.cxx6
4 files changed, 0 insertions, 15 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 9d54803f7f3b..231f5fa97125 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1592,11 +1592,6 @@ sal_uInt16 Application::GetSystemWindowMode()
const String& Application::GetFontPath()
{
ImplSVData* pSVData = ImplGetSVData();
- if( !pSVData->maAppData.mpFontPath )
- {
- if( const char* pFontPath = ::getenv( "SAL_FONTPATH_PRIVATE" ) )
- pSVData->maAppData.mpFontPath = new String( String::CreateFromAscii( pFontPath ) );
- }
if( pSVData->maAppData.mpFontPath )
return *(pSVData->maAppData.mpFontPath);
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index c12eb1cabcf5..0688e17d9a45 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.cxx
@@ -177,8 +177,6 @@ GlyphCache& GlyphCache::GetInstance()
void GlyphCache::LoadFonts()
{
- if( const char* pFontPath = ::getenv( "SAL_FONTPATH_PRIVATE" ) )
- AddFontPath( String::CreateFromAscii( pFontPath ) );
const String& rFontPath = Application::GetFontPath();
if( rFontPath.Len() > 0 )
AddFontPath( rFontPath );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 4d3d893745cf..a3494d17ef15 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2576,8 +2576,6 @@ void SalDisplay::PrintInfo() const
GetEnv( "DISPLAY" ) );
fprintf( stderr, "\t$SAL_VISUAL \t\"%s\"\n",
GetEnv( "SAL_VISUAL" ) );
- fprintf( stderr, "\t$SAL_FONTPATH \t\"%s\"\n",
- GetEnv( "SAL_FONTPATH" ) );
fprintf( stderr, "\t$SAL_NOSEGV \t\"%s\"\n",
GetEnv( "SAL_NOSEGV" ) );
fprintf( stderr, "\t$SAL_IGNOREXERRORS\t\"%s\"\n",
diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
index 4b0d327a9a03..673d8b0c5056 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -243,12 +243,6 @@ OUString psp::getFontPath()
aPathBuffer.appendAscii( "/user/fonts" );
}
}
- OString aEnvPath( getEnvironmentPath( "SAL_FONTPATH_PRIVATE" ) );
- if( aEnvPath.getLength() )
- {
- aPathBuffer.append( sal_Unicode(';') );
- aPathBuffer.append( OStringToOUString( aEnvPath, osl_getThreadTextEncoding() ) );
- }
aPath = aPathBuffer.makeStringAndClear();
#if OSL_DEBUG_LEVEL > 1