diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-03 17:27:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-04 07:43:31 +0000 |
| commit | 5e279f6efdf582812825d0ed388511b21c676f56 (patch) | |
| tree | 595a625cdc63e165ca7fa634a3a6bf2275b12e9d | |
| parent | a8af548c3be5a42cec7177c60c6d421d2dbc35b4 (diff) | |
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 <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 59fb0e641777..fca7cc75e0d7 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 ); |