summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-05 08:47:18 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2017-12-02 11:12:39 -0500
commit3de922d4a695e253d4ca2d42b70e0b35b52e9b7c (patch)
tree9d0055989b261d5b4dafaa5b78d5a472d71b8ec3 /sc
parent736cd289d4cdb0db61d92134bcc9d48aa7e79613 (diff)
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0) Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/documen2.cxx2
-rw-r--r--sc/source/core/data/documen8.cxx2
-rw-r--r--sc/source/core/data/document.cxx6
-rw-r--r--sc/source/core/data/global2.cxx6
-rw-r--r--sc/source/core/data/globalx.cxx2
-rw-r--r--sc/source/core/tool/autoform.cxx4
-rw-r--r--sc/source/core/tool/compiler.cxx4
-rw-r--r--sc/source/core/tool/formulalogger.cxx2
-rw-r--r--sc/source/core/tool/interpr1.cxx2
-rw-r--r--sc/source/filter/excel/xecontent.cxx4
-rw-r--r--sc/source/filter/excel/xicontent.cxx2
-rw-r--r--sc/source/filter/lotus/lotus.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx2
-rw-r--r--sc/source/ui/app/drwtrans.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx2
-rw-r--r--sc/source/ui/docshell/docsh.cxx2
-rw-r--r--sc/source/ui/docshell/docsh8.cxx12
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx6
-rw-r--r--sc/source/ui/formdlg/formula.cxx2
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx4
-rw-r--r--sc/source/ui/view/gridwin5.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx4
-rw-r--r--sc/source/ui/view/printfun.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx4
-rw-r--r--sc/source/ui/view/viewfun4.cxx2
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx2
27 files changed, 45 insertions, 45 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 7a41f14c01c2..ef319256e858 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -972,7 +972,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
if (pSrcDoc->pShell->GetMedium())
{
- pSrcDoc->maFileURL = pSrcDoc->pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
+ pSrcDoc->maFileURL = pSrcDoc->pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
// for unsaved files use the title name and adjust during save of file
if (pSrcDoc->maFileURL.isEmpty())
pSrcDoc->maFileURL = pSrcDoc->pShell->GetName();
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index e2aac3677484..e2a339c528a7 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -834,7 +834,7 @@ void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin)
sfx2::LinkManager::GetDisplayNames(pRefLink, nullptr, &aFile);
// Decode encoded URL for display friendliness.
INetURLObject aUrl(aFile,INetURLObject::EncodeMechanism::WasEncoded);
- aFile = aUrl.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS);
+ aFile = aUrl.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous);
OUStringBuffer aBuf;
aBuf.append(OUString(ScResId(SCSTR_EXTDOC_NOT_LOADED)));
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 038bcd5cafaf..b573ad18e9bb 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1978,7 +1978,7 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2,
SharePooledResources(pSrcDoc);
if (pSrcDoc->pShell->GetMedium())
- maFileURL = pSrcDoc->pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
+ maFileURL = pSrcDoc->pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
OUString aString;
if ( nTab2 >= static_cast<SCTAB>(maTabs.size()))
@@ -2162,7 +2162,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
if (pShell->GetMedium())
{
- pClipDoc->maFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
+ pClipDoc->maFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
// for unsaved files use the title name and adjust during save of file
if (pClipDoc->maFileURL.isEmpty())
pClipDoc->maFileURL = pShell->GetName();
@@ -2262,7 +2262,7 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1,
if (pShell->GetMedium())
{
- pClipDoc->maFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
+ pClipDoc->maFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
// for unsaved files use the title name and adjust during save of file
if (pClipDoc->maFileURL.isEmpty())
pClipDoc->maFileURL = pShell->GetName();
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index d19535b8c773..b796c602f5c7 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -317,7 +317,7 @@ OUString ScGlobal::GetAbsDocName( const OUString& rFileName,
aObj.SetSmartURL( aPathOpt.GetWorkPath() );
aObj.setFinalSlash(); // it IS a path
bool bWasAbs = true;
- aAbsName = aObj.smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::NO_DECODE);
+ aAbsName = aObj.smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::DecodeMechanism::NONE);
// returned string must be encoded because it's used directly to create SfxMedium
}
else
@@ -326,14 +326,14 @@ OUString ScGlobal::GetAbsDocName( const OUString& rFileName,
if ( pMedium )
{
bool bWasAbs = true;
- aAbsName = pMedium->GetURLObject().smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::NO_DECODE);
+ aAbsName = pMedium->GetURLObject().smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::DecodeMechanism::NONE);
}
else
{ // This can't happen, but ...
// just to be sure to have the same encoding
INetURLObject aObj;
aObj.SetSmartURL( aAbsName );
- aAbsName = aObj.GetMainURL(INetURLObject::NO_DECODE);
+ aAbsName = aObj.GetMainURL(INetURLObject::DecodeMechanism::NONE);
}
}
return aAbsName;
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index e1aad6443c8b..9a558ae458c0 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -68,7 +68,7 @@ void ScGlobal::InitAddIns()
aObj.setFinalSlash();
try
{
- ::ucbhelper::Content aCnt( aObj.GetMainURL(INetURLObject::NO_DECODE),
+ ::ucbhelper::Content aCnt( aObj.GetMainURL(INetURLObject::DecodeMechanism::NONE),
Reference< XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
Reference< sdbc::XResultSet > xResultSet;
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 9708daa13dcb..e0578bc7971b 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1024,7 +1024,7 @@ void ScAutoFormat::Load()
aURL.setFinalSlash();
aURL.Append( sAutoTblFmtName );
- SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), StreamMode::READ );
+ SfxMedium aMedium( aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE), StreamMode::READ );
SvStream* pStream = aMedium.GetInStream();
bool bRet = (pStream && pStream->GetError() == 0);
if (bRet)
@@ -1082,7 +1082,7 @@ bool ScAutoFormat::Save()
aURL.setFinalSlash();
aURL.Append(sAutoTblFmtName);
- SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), StreamMode::WRITE );
+ SfxMedium aMedium( aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE), StreamMode::WRITE );
SvStream* pStream = aMedium.GetOutStream();
bool bRet = (pStream && pStream->GetError() == 0);
if (bRet)
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b9b3a192a2ef..51553dae5020 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -913,7 +913,7 @@ struct ConventionOOO_A1 : public Convention_A1
if (bEncodeUrl)
aFile = rFileName;
else
- aFile = INetURLObject::decode(rFileName, INetURLObject::DECODE_UNAMBIGUOUS);
+ aFile = INetURLObject::decode(rFileName, INetURLObject::DecodeMechanism::Unambiguous);
rBuffer.append("'" + aFile.replaceAll("'", "''") + "'#");
@@ -1153,7 +1153,7 @@ struct ConventionXL
if (bEncodeUrl)
aFullName = rFullName;
else
- aFullName = INetURLObject::decode(rFullName, INetURLObject::DECODE_UNAMBIGUOUS);
+ aFullName = INetURLObject::decode(rFullName, INetURLObject::DecodeMechanism::Unambiguous);
const sal_Unicode* pBuf = aFullName.getStr();
sal_Int32 nLen = aFullName.getLength();
diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx
index 036be66a0239..93143e0eeb1f 100644
--- a/sc/source/core/tool/formulalogger.cxx
+++ b/sc/source/core/tool/formulalogger.cxx
@@ -35,7 +35,7 @@ std::unique_ptr<osl::File> initFile()
OUString aPath = OUString::createFromAscii(pPath);
INetURLObject aURL;
aURL.SetSmartURL(aPath);
- aPath = aURL.GetMainURL(INetURLObject::NO_DECODE);
+ aPath = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
return o3tl::make_unique<osl::File>(aPath);
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 22ae9153e5c9..20b6e2ec4b3f 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2192,7 +2192,7 @@ void ScInterpreter::ScCell()
OUStringBuffer aBuf;
aBuf.append('\'');
const INetURLObject& rURLObj = pShell->GetMedium()->GetURLObject();
- aBuf.append(rURLObj.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS));
+ aBuf.append(rURLObj.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous));
aBuf.append("'#$");
OUString aTabName;
pDok->GetName( nTab, aTabName );
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 3aa783b2dafb..2fe71bede78c 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -354,7 +354,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU
if( eProtocol == INetProtocol::Smb )
{
// #n382718# (and #n261623#) Convert smb notation to '\\'
- aFileName = aUrlObj.GetMainURL( INetURLObject::NO_DECODE );
+ aFileName = aUrlObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
aFileName = aFileName.copy(4); // skip the 'smb:' part
aFileName = aFileName.replace('/', '\\');
}
@@ -457,7 +457,7 @@ OUString XclExpHyperlink::BuildFileName(
OUString aTmpName( aDosName );
aDosName = INetURLObject::GetRelURL( rRoot.GetBasePath(), rUrl,
INetURLObject::EncodeMechanism::WasEncoded,
- (bEncoded ? INetURLObject::DECODE_TO_IURI : INetURLObject::DECODE_WITH_CHARSET));
+ (bEncoded ? INetURLObject::DecodeMechanism::ToIUri : INetURLObject::DecodeMechanism::WithCharset));
if (aDosName.startsWith(INET_FILE_SCHEME))
{
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index bb80a929b35f..e0724e228a18 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -154,7 +154,7 @@ void lclGetAbsPath( OUString& rPath, sal_uInt16 nLevel, SfxObjectShell* pDocShel
if( pDocShell )
{
bool bWasAbs = false;
- rPath = pDocShell->GetMedium()->GetURLObject().smartRel2Abs( aTmpStr.makeStringAndClear(), bWasAbs ).GetMainURL( INetURLObject::NO_DECODE );
+ rPath = pDocShell->GetMedium()->GetURLObject().smartRel2Abs( aTmpStr.makeStringAndClear(), bWasAbs ).GetMainURL( INetURLObject::DecodeMechanism::NONE );
// full path as stored in SvxURLField must be encoded
}
else
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 9267cafe13c0..24524ba9d1b5 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -75,7 +75,7 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
// try to load *.FM3 file
INetURLObject aURL( rMedium.GetURLObject() );
aURL.setExtension( "FM3" );
- SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), StreamMode::STD_READ );
+ SfxMedium aMedium( aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE), StreamMode::STD_READ );
pStream = aMedium.GetInStream();
if ( pStream )
{
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 5944ccee98de..6afcb92b8bfd 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1114,7 +1114,7 @@ bool transformURL(const OUString& rOldURL, OUString& rNewURL, ScDocument* pDoc)
{
// URL has to be decoded for escaped characters (%20)
OUString aURL = INetURLObject::decode( rOldURL,
- INetURLObject::DECODE_WITH_CHARSET );
+ INetURLObject::DecodeMechanism::WithCharset );
OUString aAddressString = aURL.copy(1);
ScRange aRange;
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 78a13d3c7956..8c8d24b15683 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -161,7 +161,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
{
bool bWasAbs = true;
aAbs = pMedium->GetURLObject().smartRel2Abs( aUrl, bWasAbs ).
- GetMainURL(INetURLObject::NO_DECODE);
+ GetMainURL(INetURLObject::DecodeMechanism::NONE);
// full path as stored INetBookmark must be encoded
}
else
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 5006d3787f7d..f129b8975bab 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3069,7 +3069,7 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
SfxObjectShell* pObjSh = pDoc->GetDocumentShell();
// #i75893# convert escaped URL of the document to something user friendly
- OUString aFileName = pObjSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ OUString aFileName = pObjSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous );
switch(aAddrDetails.eConv)
{
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d963507e1b68..759b838b542d 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1682,7 +1682,7 @@ void popFileName(OUString& rPath)
{
INetURLObject aURLObj(rPath);
aURLObj.removeSegment();
- rPath = aURLObj.GetMainURL(INetURLObject::NO_DECODE);
+ rPath = aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE);
}
}
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 646656e56358..4973aaa73b95 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -107,11 +107,11 @@ namespace
aURL.SetSmartProtocol( INetProtocol::File );
aURL.SetSmartURL( rFullFileName );
_rTabName = aURL.getBase( INetURLObject::LAST_SEGMENT, true,
- INetURLObject::DECODE_UNAMBIGUOUS );
+ INetURLObject::DecodeMechanism::Unambiguous );
OUString aExtension = aURL.getExtension();
aURL.removeSegment();
aURL.removeFinalSlash();
- OUString aPath = aURL.GetMainURL(INetURLObject::NO_DECODE);
+ OUString aPath = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
uno::Reference<uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
_rDrvMgr.set( sdbc::DriverManager::create( xContext ) );
@@ -169,7 +169,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject&
try
{
- ::ucbhelper::Content aDestPath( aDestPathObj.GetMainURL(INetURLObject::NO_DECODE),
+ ::ucbhelper::Content aDestPath( aDestPathObj.GetMainURL(INetURLObject::DecodeMechanism::NONE),
uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
uno::Reference< css::ucb::XCommandInfo > xInfo = aDestPath.getCommands();
@@ -177,7 +177,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject&
if ( xInfo->hasCommandByName( aTransferName ) )
{
aDestPath.executeCommand( aTransferName, uno::makeAny(
- css::ucb::TransferInfo( bMoveData, rSourceObj.GetMainURL(INetURLObject::NO_DECODE), aName,
+ css::ucb::TransferInfo( bMoveData, rSourceObj.GetMainURL(INetURLObject::DecodeMechanism::NONE), aName,
css::ucb::NameClash::ERROR ) ) );
}
else
@@ -202,7 +202,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL )
bool bRet = true;
try
{
- ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE),
+ ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
aCnt.executeCommand( "delete", css::uno::Any( true ) );
@@ -221,7 +221,7 @@ bool ScDocShell::IsDocument( const INetURLObject& rURL )
bool bRet = false;
try
{
- ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE),
+ ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
bRet = aCnt.isDocument();
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 2801a8504460..fe37938210b0 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2501,7 +2501,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt
aBaseURL.insertName("content.xml");
OUString aStr = URIHelper::simpleNormalizedMakeRelative(
- aBaseURL.GetMainURL(INetURLObject::NO_DECODE), aFile);
+ aBaseURL.GetMainURL(INetURLObject::DecodeMechanism::NONE), aFile);
setRelativeFileName(nFileId, aStr);
}
@@ -2675,7 +2675,7 @@ void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(const OUString&
INetURLObject aBaseURL(rOwnDocName);
aBaseURL.insertName("content.xml");
bool bWasAbs = false;
- maRealFileName = aBaseURL.smartRel2Abs(rRelPath, bWasAbs).GetMainURL(INetURLObject::NO_DECODE);
+ maRealFileName = aBaseURL.smartRel2Abs(rRelPath, bWasAbs).GetMainURL(INetURLObject::DecodeMechanism::NONE);
}
void ScExternalRefManager::maybeCreateRealFileName(sal_uInt16 nFileId)
@@ -3181,7 +3181,7 @@ void ScExternalRefManager::transformUnsavedRefToSavedRef( SfxObjectShell* pShell
if ( itr->second.maShell.get() == pShell )
{
// found that the shell is marked as unsaved
- OUString aFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
+ OUString aFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
switchSrcFile(itr->first, aFileURL, OUString());
EndListening(*pShell);
maUnsavedDocShells.erase(itr++);
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index eb5ddf4acef6..22faa17f9cbc 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -406,7 +406,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
// #i75893# convert escaped URL of the document to something user friendly
// OUString aFileName = pObjSh->GetMedium()->GetName();
- OUString aFileName = pObjSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ OUString aFileName = pObjSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous );
aRefStr = "'";
aRefStr += aFileName;
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 4547cc234a72..d7a0e6a00ab6 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -314,7 +314,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con
// detect if there is no path if there is no path then we need
// to use the current current folder
INetURLObject aURL( sURL );
- sURL = aURL.GetMainURL( INetURLObject::DECODE_TO_IURI );
+ sURL = aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri );
if( sURL.isEmpty() )
{
// need to add cur dir ( of this workbook ) or else the 'Work' dir
@@ -335,7 +335,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con
aURL.SetURL( sURL );
aURL.Append( sFileName );
}
- sURL = aURL.GetMainURL( INetURLObject::DECODE_TO_IURI );
+ sURL = aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri );
}
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 8608aea834c2..00b81b8d0db9 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -380,7 +380,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
if ( GetEditUrl( aPosPixel, nullptr, &aUrl ) )
{
aHelpText = INetURLObject::decode( aUrl,
- INetURLObject::DECODE_UNAMBIGUOUS );
+ INetURLObject::DecodeMechanism::Unambiguous );
if( bCtrlClickHlink )
{
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index e6384aaef90e..7668f2fff282 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -893,9 +893,9 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData )
rData.aTitle = pDocShell->GetTitle();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
- rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous );
if ( !rData.aLongDocName.isEmpty() )
- rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
+ rData.aShortDocName = rURLObj.GetName( INetURLObject::DecodeMechanism::Unambiguous );
else
rData.aShortDocName = rData.aLongDocName = rData.aTitle;
rData.nPageNo = pPreview->GetPageNo() + 1;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 9b99d7ad5273..58418ea01c08 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1055,9 +1055,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
aFieldData.aTitle = pDocShell->GetTitle();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
- aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous );
if ( !aFieldData.aLongDocName.isEmpty() )
- aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
+ aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DecodeMechanism::Unambiguous );
else
aFieldData.aShortDocName = aFieldData.aLongDocName = aFieldData.aTitle;
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index eb154dd01253..8ee29b991828 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -316,7 +316,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
// URL has to be decoded for escaped characters (%20)
aAddress = INetURLObject::decode( aAddress,
- INetURLObject::DECODE_WITH_CHARSET );
+ INetURLObject::DecodeMechanism::WithCharset );
}
bool bFound = false;
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index e8f4491ae26e..68371855f459 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1819,9 +1819,9 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
rData.aTitle = pDocShell->GetTitle();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
- rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous );
if ( !rData.aLongDocName.isEmpty() )
- rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
+ rData.aShortDocName = rURLObj.GetName( INetURLObject::DecodeMechanism::Unambiguous );
else
rData.aShortDocName = rData.aLongDocName = rData.aTitle;
rData.nPageNo = 1;
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index c8ff808cc534..d3c530da9511 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -584,7 +584,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink
{
INetURLObject aURL;
aURL.SetSmartURL( rFile );
- OUString aStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
+ OUString aStrURL = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE );
// is it a media URL?
if( ::avmedia::MediaWindow::isMediaURL( aStrURL, ""/*TODO?*/ ) )
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index bbadc7f03704..2d6bafeba7d6 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -193,7 +193,7 @@ void ScXMLSourceDlg::SelectSourceFile()
INetURLObject aURL(maSrcPath);
aURL.removeSegment();
aURL.removeFinalSlash();
- OUString aPath = aURL.GetMainURL(INetURLObject::NO_DECODE);
+ OUString aPath = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
xFilePicker->setDisplayDirectory(aPath);
}