diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-02 11:12:39 -0500 |
| commit | 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c (patch) | |
| tree | 9d0055989b261d5b4dafaa5b78d5a472d71b8ec3 /vcl/unx | |
| parent | 736cd289d4cdb0db61d92134bcc9d48aa7e79613 (diff) | |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/helper.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 488e675e9b82..603c918600dd 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -716,9 +716,9 @@ std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); INetURLObject aPath( OStringToOUString( rFileName, aEncoding ), INetURLObject::FSYS_DETECT ); - OString aName( OUStringToOString( aPath.GetName( INetURLObject::DECODE_WITH_CHARSET, aEncoding ), aEncoding ) ); + OString aName( OUStringToOString( aPath.GetName( INetURLObject::DecodeMechanism::WithCharset, aEncoding ), aEncoding ) ); OString aDir( OUStringToOString( - INetURLObject::decode( aPath.GetPath(), INetURLObject::DECODE_WITH_CHARSET, aEncoding ), aEncoding ) ); + INetURLObject::decode( aPath.GetPath(), INetURLObject::DecodeMechanism::WithCharset, aEncoding ), aEncoding ) ); int nDirID = getDirectoryAtom( aDir, true ); std::vector<fontID> aFontIds = findFontFileIDs( nDirID, aName ); diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx index 2f83b96e5f0c..ce4657fe3a4a 100644 --- a/vcl/unx/generic/fontmanager/helper.cxx +++ b/vcl/unx/generic/fontmanager/helper.cxx @@ -175,7 +175,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub { INetURLObject aDir( aExe ); aDir.removeSegment(); - aExe = aDir.GetMainURL( INetURLObject::NO_DECODE ); + aExe = aDir.GetMainURL( INetURLObject::DecodeMechanism::NONE ); OUString aSysPath; if( osl_getSystemPathFromFileURL( aExe.pData, &aSysPath.pData ) == osl_File_E_None ) { diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 07c7b23b469d..c882822200ed 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -458,7 +458,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache) for( std::list< OUString >::const_iterator ppd_it = aPathList.begin(); ppd_it != aPathList.end(); ++ppd_it ) { INetURLObject aPPDDir( *ppd_it, INetProtocol::File, INetURLObject::EncodeMechanism::All ); - scanPPDDir( aPPDDir.GetMainURL( INetURLObject::NO_DECODE ) ); + scanPPDDir( aPPDDir.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); } if( rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() ) { @@ -469,8 +469,8 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache) INetURLObject aDir( aExe ); aDir.removeSegment(); SAL_INFO("vcl.unx.print", "scanning last chance dir: " - << aDir.GetMainURL(INetURLObject::NO_DECODE)); - scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) ); + << aDir.GetMainURL(INetURLObject::DecodeMechanism::NONE)); + scanPPDDir( aDir.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); SAL_INFO("vcl.unx.print", "SGENPRT " << (rPPDCache.pAllPPDFiles->find("SGENPRT") == rPPDCache.pAllPPDFiles->end() ? "not found" : "found")); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index d4f8dfb71427..8a65a77955a0 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -950,7 +950,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std aFileObj.getName( INetURLObject::LAST_SEGMENT, true, - INetURLObject::DECODE_WITH_CHARSET + INetURLObject::DecodeMechanism::WithCharset ), RTL_TEXTENCODING_UTF8 ) @@ -985,7 +985,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std aFileObj.getName( nSegmentCount-2, true, - INetURLObject::DECODE_WITH_CHARSET + INetURLObject::DecodeMechanism::WithCharset ), RTL_TEXTENCODING_UTF8 ) |