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 /sc/source/ui/docshell | |
parent | 736cd289d4cdb0db61d92134bcc9d48aa7e79613 (diff) |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 6 |
3 files changed, 10 insertions, 10 deletions
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++); |