summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/filter/graphicfilter.cxx8
-rw-r--r--vcl/source/filter/graphicfilter2.cxx2
-rw-r--r--vcl/source/filter/sgvmain.cxx4
-rw-r--r--vcl/source/gdi/impgraph.cxx10
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx12
-rw-r--r--vcl/source/image/ImplImageTree.cxx2
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx4
-rw-r--r--vcl/unx/generic/fontmanager/helper.cxx2
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx6
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx4
10 files changed, 27 insertions, 27 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 364705b882d4..535fb1ad5f5b 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -111,7 +111,7 @@ static bool DirEntryExists( const INetURLObject& rObj )
try
{
- ::ucbhelper::Content aCnt( rObj.GetMainURL( INetURLObject::NO_DECODE ),
+ ::ucbhelper::Content aCnt( rObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
css::uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
@@ -1280,7 +1280,7 @@ sal_uInt16 GraphicFilter::CanImportGraphic( const INetURLObject& rPath,
sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl", "GraphicFilter::CanImportGraphic() : ProtType == INetProtocol::NotValid" );
- OUString aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
+ OUString aMainUrl( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
std::unique_ptr<SvStream> xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE ));
if (xStream)
{
@@ -1310,7 +1310,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject&
sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl", "GraphicFilter::ImportGraphic() : ProtType == INetProtocol::NotValid" );
- OUString aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
+ OUString aMainUrl( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
std::unique_ptr<SvStream> xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE ));
if (xStream)
{
@@ -1811,7 +1811,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl", "GraphicFilter::ExportGraphic() : ProtType == INetProtocol::NotValid" );
bool bAlreadyExists = DirEntryExists( rPath );
- OUString aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
+ OUString aMainUrl( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
std::unique_ptr<SvStream> xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::WRITE | StreamMode::TRUNC ));
if (xStream)
{
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 21622c33e10c..414ea684ea9a 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -28,7 +28,7 @@
#define DATA_SIZE 640
GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) :
- pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ) ),
+ pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ ) ),
aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ),
bOwnStream( true )
{
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index fd0abd60dd7f..8f57eac3b46c 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -720,7 +720,7 @@ void BmapType::Draw(OutputDevice& rOut)
(sal_Int32)Filename[ 0 ], RTL_TEXTENCODING_UTF8 );
INetURLObject aFNam( aStr );
- SvStream* pInp = ::utl::UcbStreamHelper::CreateStream( aFNam.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ );
+ SvStream* pInp = ::utl::UcbStreamHelper::CreateStream( aFNam.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ );
if ( pInp )
{
unsigned char nSgfTyp = CheckSgfTyp( *pInp,nVersion);
@@ -919,7 +919,7 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, const INetURLObject& _aIni
pSgfFonts = new SgfFontLst;
- pSgfFonts->AssignFN( aIniPath.GetMainURL( INetURLObject::NO_DECODE ) );
+ pSgfFonts->AssignFN( aIniPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
nFileStart=rInp.Tell();
ReadSgfHeader( rInp, aHead );
if (aHead.ChkMagic() && aHead.Typ==SgfStarDraw && aHead.Version==SGV_VERSION) {
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index b9daabe4f838..a103dd5ad4e5 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -319,7 +319,7 @@ ImpSwapFile::~ImpSwapFile()
{
try
{
- ::ucbhelper::Content aCnt( aSwapURL.GetMainURL( INetURLObject::NO_DECODE ),
+ ::ucbhelper::Content aCnt( aSwapURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
css::uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
@@ -1121,12 +1121,12 @@ bool ImpGraphic::ImplSwapOut()
::utl::TempFile aTempFile;
const INetURLObject aTmpURL( aTempFile.GetURL() );
- if( !aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).isEmpty() )
+ if( !aTmpURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ).isEmpty() )
{
std::unique_ptr<SvStream> xOStm;
try
{
- xOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE ));
+ xOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE ));
}
catch( const css::uno::Exception& )
{
@@ -1147,7 +1147,7 @@ bool ImpGraphic::ImplSwapOut()
try
{
- ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ),
+ ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
css::uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
@@ -1215,7 +1215,7 @@ bool ImpGraphic::ImplSwapIn()
OUString aSwapURL;
if( mpSwapFile )
- aSwapURL = mpSwapFile->aSwapURL.GetMainURL( INetURLObject::NO_DECODE );
+ aSwapURL = mpSwapFile->aSwapURL.GetMainURL( INetURLObject::DecodeMechanism::NONE );
if( !aSwapURL.isEmpty() )
{
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index cffc5f4ae822..d55e94d4ced1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4649,7 +4649,7 @@ we check in the following sequence:
if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INetProtocol::File )
bSetRelative = true;
- OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is,
+ OUString aFragment = aTargetURL.GetMark( INetURLObject::DecodeMechanism::NONE /*DecodeMechanism::WithCharset*/ ); //fragment as is,
if( !bSetGoToRMode )
{
switch( m_aContext.DefaultLinkAction )
@@ -4685,12 +4685,12 @@ we check in the following sequence:
if( bSetGoToRMode )
{
//add the fragment
- OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET );
+ OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DecodeMechanism::WithCharset );
aLine.append("/GoToR");
aLine.append("/F");
appendLiteralStringEncrypt( bSetRelative ? INetURLObject::GetRelURL( m_aContext.BaseURL, aURLNoMark,
INetURLObject::EncodeMechanism::WasEncoded,
- INetURLObject::DECODE_WITH_CHARSET ) :
+ INetURLObject::DecodeMechanism::WithCharset ) :
aURLNoMark, rLink.m_nObject, aLine, osl_getThreadTextEncoding() );
if( !aFragment.isEmpty() )
{
@@ -4710,10 +4710,10 @@ we check in the following sequence:
//substitute the fragment
aTargetURL.SetMark( OStringToOUString(aLineLoc.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US) );
}
- OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE );
+ OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DecodeMechanism::WithCharset : INetURLObject::DecodeMechanism::NONE );
appendLiteralStringEncrypt(bSetRelative ? INetURLObject::GetRelURL( m_aContext.BaseURL, aURL,
INetURLObject::EncodeMechanism::WasEncoded,
- bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE
+ bFileSpec ? INetURLObject::DecodeMechanism::WithCharset : INetURLObject::DecodeMechanism::NONE
) :
aURL , rLink.m_nObject, aLine, osl_getThreadTextEncoding() );
}
@@ -8139,7 +8139,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations()
OUString( "http://ahost.ax" ) ); //dummy location, won't be used
aLocalURL.SetMark( rDest.m_aDestName );
- const OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as
+ const OUString aName = aLocalURL.GetMark( INetURLObject::DecodeMechanism::NONE ); //same coding as
// in link creation ( see PDFWriterImpl::emitLinkAnnotations )
const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ];
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index b413c28e4437..8e34ff6cb56b 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -409,7 +409,7 @@ void ImplImageTree::createStyle()
bool ok = aUrl.Append("images_" + maCurrentStyle, INetURLObject::EncodeMechanism::All);
OSL_ASSERT(ok); (void) ok;
- sThemeUrl = aUrl.GetMainURL(INetURLObject::NO_DECODE) + ".zip";
+ sThemeUrl = aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE) + ".zip";
}
else
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
)
generated by cgit (git 2.34.1) at 2025-02-08 14:53:16 +0000