diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-08-27 16:54:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-08-27 18:50:26 +0200 |
| commit | 654a1e6b3345d098e24dcdd0d81bb49add996d0b (patch) | |
| tree | a15a320fcab909e5eb36cb8e0aeb6daf557854fa /vcl/unx/generic/print | |
| parent | 9e0b3423f21c23a8ef2fe749ea7dd7c1194c2f9a (diff) | |
Let PrintFontManager::addFontFile directly take a file URL
...instead of converting from a file URL to a filesystem pathname at the (sole)
call site and then back to a file URL in addFontFile
Change-Id: I468dbfc183b062668209c6bd84fcfed122ceff37
Reviewed-on: https://gerrit.libreoffice.org/78202
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/unx/generic/print')
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 1eb73401d4ef..38a39e729fc3 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -671,12 +671,8 @@ bool GenPspGraphics::AddTempDevFontHelper( PhysicalFontCollection* pFontCollecti GlyphCache &rGC ) { // inform PSP font manager - OUString aUSystemPath; - OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFileURL, aUSystemPath ) ); - rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - OString aOFileName( OUStringToOString( aUSystemPath, aEncoding ) ); psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); - std::vector<psp::fontID> aFontIds = rMgr.addFontFile( aOFileName ); + std::vector<psp::fontID> aFontIds = rMgr.addFontFile( rFileURL ); if( aFontIds.empty() ) return false; |