commit c91f7082180d1ca90467891f3b7ca9a3e845d9e7
author Michael Stahl <mstahl@redhat.com> Tue Sep 03 17:27:44 2013 +0200
committer Michael Stahl <mstahl@redhat.com> Tue Sep 03 17:32:12 2013 +0200
tree f73b13b459992317768b49f4d9e2cf19bc2dffb5
parent d8d26ba1565d597e333dc474b13d8e63fe31976d

fdo#68731: vcl: fix path for bundled fonts on Windows

WinSalGraphics::GetDevFontList(): remove the obsolete "Basis" from
the search path to find the bundled fonts.

Change-Id: I7d7d650243592944e3339dd75caf29f2b2fe6670

vcl/win/source/gdi/salgdi3.cxx

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index d8e5782..09a907a 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2184,7 +2184,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
        osl_getExecutableFile( &aPath.pData );
        aPath = aPath.copy( 0, aPath.lastIndexOf('/') );
        String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') );
        aFontDirUrl += String( RTL_CONSTASCII_USTRINGPARAM("/Basis/" LIBO_SHARE_FOLDER "/fonts/truetype") );
        aFontDirUrl += OUString("/" LIBO_SHARE_FOLDER "/fonts/truetype");

        // collect fonts in font path that could not be registered
        osl::Directory aFontDir( aFontDirUrl );