diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 09:27:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
commit | 50151db9f740afee7f11a10cc5c61b437bf87caf (patch) | |
tree | b41921d86a46931bc06457172994fb3a7dabe92b /vcl | |
parent | bfde4866e07746eafa2f0d6173c29d805cc35ad0 (diff) |
convert FSysStyle to o3tl::typed_flags
Change-Id: I58a63a0e6f619442f21827064644ecd8ca57b8ff
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index b660d73b54b2..8e7ab173e810 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -175,7 +175,7 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - INetURLObject aPath( OStringToOUString( rFileName, aEncoding ), INetURLObject::FSYS_DETECT ); + INetURLObject aPath( OStringToOUString( rFileName, aEncoding ), FSysStyle::Detect ); OString aName( OUStringToOString( aPath.GetName( INetURLObject::DecodeMechanism::WithCharset, aEncoding ), aEncoding ) ); OString aDir( OUStringToOString( INetURLObject::decode( aPath.GetPath(), INetURLObject::DecodeMechanism::WithCharset, aEncoding ), aEncoding ) ); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index d7f72b26f19b..dbbec941ce23 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -62,7 +62,7 @@ OUString SalGtkPicker::uritounicode(const gchar* pIn) OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName), osl_getThreadTextEncoding()); g_free (pEncodedFileName); - INetURLObject aCurrentURL(sEncoded, INetURLObject::FSYS_UNX); + INetURLObject aCurrentURL(sEncoded, FSysStyle::Unix); aCurrentURL.SetHost(aURL.GetHost()); sURL = aCurrentURL.getExternalURL(); } |