diff options
| -rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 88187efeb384..3c67adc70d8f 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -199,7 +199,7 @@ public: static PrintFontManager& get(); // one instance only // There may be multiple font ids for font collections - std::vector<fontID> addFontFile( const OString& rFileName ); + std::vector<fontID> addFontFile( const OUString& rFileUrl ); void initialize(); diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 8389ba279ba1..a4d07ec3bdbe 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -163,10 +163,10 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory ) return nAtom; } -std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName ) +std::vector<fontID> PrintFontManager::addFontFile( const OUString& rFileUrl ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - INetURLObject aPath( OStringToOUString( rFileName, aEncoding ), FSysStyle::Detect ); + INetURLObject aPath( rFileUrl ); OString aName(OUStringToOString(aPath.GetLastName(INetURLObject::DecodeMechanism::WithCharset, aEncoding), aEncoding)); OString aDir( OUStringToOString( INetURLObject::decode( aPath.GetPath(), INetURLObject::DecodeMechanism::WithCharset, aEncoding ), aEncoding ) ); 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; |