[Libreoffice-commits] core.git: vcl/win

[Michael Stahl]

 vcl/win/source/gdi/salgdi3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c91f7082180d1ca90467891f3b7ca9a3e845d9e7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 3 17:27:44 2013 +0200

    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

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 );