vcl/win/source/gdi/salgdi3.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5e279f6efdf582812825d0ed388511b21c676f56
Author: Michael Stahl <mst...@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.
(cherry picked from commit c91f7082180d1ca90467891f3b7ca9a3e845d9e7)
Conflicts:
vcl/win/source/gdi/salgdi3.cxx
Change-Id: I7d7d650243592944e3339dd75caf29f2b2fe6670
Reviewed-on: https://gerrit.libreoffice.org/5796
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 59fb0e6..fca7cc7 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2183,7 +2183,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/share/fonts/truetype") );
+ aFontDirUrl += OUString("/share/fonts/truetype");
// collect fonts in font path that could not be registered
osl::Directory aFontDir( aFontDirUrl );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
