From 3c4333c24882d6699b65d109f2cfbf7daf3122c6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Dec 2016 08:47:18 +0200 Subject: convert DecodeMechanism to scoped enum (cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0) (cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c) Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547 --- svtools/source/contnr/fileview.cxx | 12 +++---- svtools/source/contnr/foldertree.cxx | 4 +-- svtools/source/control/breadcrumb.cxx | 4 +-- svtools/source/control/inettbc.cxx | 42 ++++++++++++------------ svtools/source/dialogs/PlaceEditDialog.cxx | 10 +++--- svtools/source/dialogs/ServerDetailsControls.cxx | 4 +-- svtools/source/dialogs/addresstemplate.cxx | 4 +-- svtools/source/misc/imagemgr.cxx | 6 ++-- svtools/source/misc/imap.cxx | 2 +- svtools/source/misc/templatefoldercache.cxx | 6 ++-- svtools/source/misc/transfer.cxx | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) (limited to 'svtools') diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 0a0a5ebea974..335ef8ba094e 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -240,7 +240,7 @@ inline const OUString& NameTranslationList::GetTransTableFileName() const NameTranslationList::NameTranslationList( const INetURLObject& rBaseURL ): maTransFile( rBaseURL ), - m_HashedURL(rBaseURL.GetMainURL(INetURLObject::NO_DECODE)), + m_HashedURL(rBaseURL.GetMainURL(INetURLObject::DecodeMechanism::NONE)), maTransFileName( OUString(".nametranslation.table") ) { maTransFile.insertName( maTransFileName ); @@ -251,7 +251,7 @@ NameTranslationList::NameTranslationList( const INetURLObject& rBaseURL ): // See examples of such a files in the samples-folder of an Office installation try { - ::ucbhelper::Content aTestContent( maTransFile.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + ::ucbhelper::Content aTestContent( maTransFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ), Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); if( aTestContent.isDocument() ) { @@ -765,7 +765,7 @@ void ViewTabListBox_Impl::DeleteEntries() if ( eResult != svtools::QUERYDELETE_ALL ) { INetURLObject aObj( aURL ); - ScopedVclPtrInstance< svtools::QueryDeleteDlg_Impl > aDlg(nullptr, aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ) ); + ScopedVclPtrInstance< svtools::QueryDeleteDlg_Impl > aDlg(nullptr, aObj.GetName( INetURLObject::DecodeMechanism::WithCharset ) ); if ( sDialogPosition.getLength() ) aDlg->SetWindowState( sDialogPosition ); @@ -1412,7 +1412,7 @@ void NameTranslator_Impl::SetActualFolder( const INetURLObject& rActualFolder ) { if( mpActFolder ) { - if (mpActFolder->GetHashedURL() != rActualFolder.GetMainURL(INetURLObject::NO_DECODE)) + if (mpActFolder->GetHashedURL() != rActualFolder.GetMainURL(INetURLObject::DecodeMechanism::NONE)) { delete mpActFolder; mpActFolder = new NameTranslationList( rActualFolder ); @@ -1514,7 +1514,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( // prepare name translation SetActualFolder( aFolderObj ); - FolderDescriptor aFolder( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ) ); + FolderDescriptor aFolder( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); aGuard.clear(); return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rBlackList ); @@ -2109,7 +2109,7 @@ void SvtFileView_Impl::EntryRenamed( OUString& rURL, INetURLObject aURLObj( rURL ); aURLObj.SetName( rTitle, INetURLObject::EncodeMechanism::All ); - rURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); + rURL = aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); (*aIt)->maTargetURL = rURL; break; diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx index 086ba62e48f0..3912759a9fd0 100644 --- a/svtools/source/contnr/foldertree.cxx +++ b/svtools/source/contnr/foldertree.cxx @@ -116,7 +116,7 @@ void FolderTree::SetTreePath( OUString const & sUrl ) INetURLObject aUrl( sUrl ); aUrl.setFinalSlash(); - OUString sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); + OUString sPath = aUrl.GetURLPath( INetURLObject::DecodeMechanism::WithCharset ); SvTreeListEntry* pEntry = First(); bool end = false; @@ -130,7 +130,7 @@ void FolderTree::SetTreePath( OUString const & sUrl ) INetURLObject aUrlObj( sNodeUrl ); aUrlObj.setFinalSlash(); - sNodeUrl = aUrlObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); + sNodeUrl = aUrlObj.GetURLPath( INetURLObject::DecodeMechanism::WithCharset ); if( sPath == sNodeUrl ) { diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index 7ed6d4671ea0..fbfdae83315f 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -114,8 +114,8 @@ void Breadcrumb::SetURL( const OUString& rURL ) sHostPort += OUString::number( aURL.GetPort() ); } - OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE ); - OUString sPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET); + OUString sUser = aURL.GetUser( INetURLObject::DecodeMechanism::NONE ); + OUString sPath = aURL.GetURLPath(INetURLObject::DecodeMechanism::WithCharset); OUString sRootPath = INetURLObject::GetScheme( aURL.GetProtocol() ) + sUser + ( sUser.isEmpty() ? OUString() : "@" ) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 3e44679ae078..69a7cdf1932f 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -169,7 +169,7 @@ void SvtMatchContext_Impl::FillPicklist(std::vector& rPickList) { seqPropertySet[nProperty].Value >>= sTitle; aURL.SetURL( sTitle ); - rPickList.insert(rPickList.begin() + nItem, aURL.GetMainURL(INetURLObject::DECODE_WITH_CHARSET)); + rPickList.insert(rPickList.begin() + nItem, aURL.GetMainURL(INetURLObject::DecodeMechanism::WithCharset)); break; } } @@ -328,9 +328,9 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, INetURLObject aMatchObj( rMatch ); OUString aMatchName; - if ( rURL != aMatchObj.GetMainURL( INetURLObject::NO_DECODE ) ) + if ( rURL != aMatchObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) { - aMatchName = aMatchObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + aMatchName = aMatchObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ); // matching is always done case insensitive, but completion will be case sensitive and case preserving aMatchName = aMatchName.toAsciiLowerCase(); @@ -347,7 +347,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, try { - Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), + Content aCnt( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), new ::ucbhelper::CommandEnvironment( uno::Reference< XInteractionHandler >(), uno::Reference< XProgressHandler >() ), comphelper::getProcessComponentContext() ); @@ -421,7 +421,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, aObj.setFinalSlash(); // get the last name of the URL - OUString aMatch = aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aMatch = aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ); OUString aInput( aText ); if ( nMatchLen ) { @@ -444,7 +444,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, if ( bIsFolder ) aInput += OUStringLiteral1(aDelimiter); - Insert( aInput, aObj.GetMainURL( INetURLObject::NO_DECODE ), true ); + Insert( aInput, aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), true ); } } } @@ -486,7 +486,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR INetURLObject aTmp( aTemp ); if ( !aTmp.HasError() && aTmp.GetProtocol() != INetProtocol::NotValid ) - aMatch = aTmp.GetMainURL( INetURLObject::NO_DECODE ); + aMatch = aTmp.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } else { @@ -503,7 +503,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR // cut to first segment OUString aTmp = INetURLObject::GetScheme( eBaseProt ); aTmp += "/"; - aTmp += aObj.getName( 0, true, INetURLObject::DECODE_WITH_CHARSET ); + aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset ); aObj.SetURL( aTmp ); aSmart = aSmart.copy(1); @@ -525,7 +525,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR // Remove it as a workaround aTmp.removeFinalSlash(); if ( !aTmp.HasError() && aTmp.GetProtocol() != INetProtocol::NotValid ) - aMatch = aTmp.GetMainURL( INetURLObject::NO_DECODE ); + aMatch = aTmp.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } } else @@ -583,7 +583,7 @@ void SvtMatchContext_Impl::doExecute() if ( !aMatch.isEmpty() ) { INetURLObject aURLObject( aMatch ); - OUString aMainURL( aURLObject.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aMainURL( aURLObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); // Disable autocompletion for anything but the (local) file // system (for which access is hopefully fast), as the logic of // how SvtMatchContext_Impl is used requires this code to run to @@ -675,7 +675,7 @@ void SvtMatchContext_Impl::doExecute() aURLObject.removeSegment(); // scan directory and insert all matches - ReadFolder( aURLObject.GetMainURL( INetURLObject::NO_DECODE ), aMatch, eProt == INetProtocol::NotValid ); + ReadFolder( aURLObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aMatch, eProt == INetProtocol::NotValid ); } } } @@ -697,7 +697,7 @@ void SvtMatchContext_Impl::doExecute() { aCurObj.SetURL(*i); aCurObj.SetSmartURL( aCurObj.GetURLNoPass()); - aCurMainURL = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); + aCurMainURL = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); if( eProt != INetProtocol::NotValid && aCurObj.GetProtocol() != eProt ) continue; @@ -726,13 +726,13 @@ void SvtMatchContext_Impl::doExecute() if ( aScheme.startsWithIgnoreAsciiCase( aText ) && aText.getLength() < aScheme.getLength() ) { if( bFull ) - aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); + aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); else { aCurObj.SetMark( "" ); aCurObj.SetParam( "" ); aCurObj.SetURLPath( "" ); - aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); + aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } Insert( aMatch, aMatch ); @@ -745,13 +745,13 @@ void SvtMatchContext_Impl::doExecute() if( aCurString.startsWithIgnoreAsciiCase( aText ) ) { if( bFull ) - aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); + aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); else { aCurObj.SetMark( "" ); aCurObj.SetParam( "" ); aCurObj.SetURLPath( "" ); - aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); + aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } OUString aURL( aMatch ); @@ -949,7 +949,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl() break; } - OUString aURL( aCurObj.GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) ); + OUString aURL( aCurObj.GetMainURL( INetURLObject::DecodeMechanism::WithCharset ) ); if ( !aURL.isEmpty() ) { @@ -1177,7 +1177,7 @@ OUString SvtURLBox::GetURL() if ( eSmartProtocol != INetProtocol::NotValid ) aTempObj.SetSmartProtocol( eSmartProtocol ); if ( aTempObj.SetSmartURL( aText ) ) - return aTempObj.GetMainURL( INetURLObject::NO_DECODE ); + return aTempObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); else return aText; } @@ -1186,7 +1186,7 @@ OUString SvtURLBox::GetURL() { OUString aName = ParseSmart( aText, aBaseURL ); aObj.SetURL(aName); - OUString aURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aURL( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); if ( aURL.isEmpty() ) // aText itself is invalid, and even together with aBaseURL, it could not // made valid -> no chance @@ -1205,7 +1205,7 @@ OUString SvtURLBox::GetURL() aTitle = INetURLObject(aFileURL).getName( INetURLObject::LAST_SEGMENT, true, - INetURLObject::DECODE_WITH_CHARSET ); + INetURLObject::DecodeMechanism::WithCharset ); else success = UCBContentHelper::GetTitle(aURL,&aTitle); @@ -1219,7 +1219,7 @@ OUString SvtURLBox::GetURL() } } - return aObj.GetMainURL( INetURLObject::NO_DECODE ); + return aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } void SvtURLBox::DisableHistory() diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 33e1f20cbd38..edf7b3f6f91d 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -98,9 +98,9 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptrSetText( INetURLObject::decode( rUrl.GetUser( ), - INetURLObject::DECODE_WITH_CHARSET ) ); + INetURLObject::DecodeMechanism::WithCharset ) ); m_aDetailsContainers[i]->setUsername( INetURLObject::decode( rUrl.GetUser( ), - INetURLObject::DECODE_WITH_CHARSET ) ); + INetURLObject::DecodeMechanism::WithCharset ) ); } m_pLBServerType->SelectEntryPos( i ); @@ -144,7 +144,7 @@ OUString PlaceEditDialog::GetServerUrl() if ( !sUsername.isEmpty( ) ) aUrl.SetUser( sUsername ); if ( !aUrl.HasError( ) ) - sUrl = aUrl.GetMainURL( INetURLObject::NO_DECODE ); + sUrl = aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } return sUrl; @@ -225,7 +225,7 @@ IMPL_LINK( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) { if ( m_xCurrentDetails.get() ) { - OUString sUrl = m_xCurrentDetails->getUrl().GetHost( INetURLObject::DECODE_WITH_CHARSET ); + OUString sUrl = m_xCurrentDetails->getUrl().GetHost( INetURLObject::DecodeMechanism::WithCharset ); OUString sGDriveHost( GDRIVE_BASE_URL ); OUString sAlfrescoHost( ALFRESCO_CLOUD_BASE_URL ); OUString sOneDriveHost( ONEDRIVE_BASE_URL ); @@ -236,7 +236,7 @@ IMPL_LINK( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) { m_pBTRepoRefresh->Click(); - sUrl = m_xCurrentDetails->getUrl().GetHost( INetURLObject::DECODE_WITH_CHARSET ); + sUrl = m_xCurrentDetails->getUrl().GetHost( INetURLObject::DecodeMechanism::WithCharset ); INetURLObject aHostUrl( sUrl ); OUString sRepoId = aHostUrl.GetMark(); diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index eccf31907481..06db0c0136c0 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -364,7 +364,7 @@ bool CmisDetailsContainer::setUrl( const INetURLObject& rUrl ) if ( bSuccess ) { - OUString sDecodedHost = rUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); + OUString sDecodedHost = rUrl.GetHost( INetURLObject::DecodeMechanism::WithCharset ); INetURLObject aHostUrl( sDecodedHost ); m_sBinding = aHostUrl.GetURLNoMark( ); m_sRepoId = aHostUrl.GetMark( ); @@ -461,7 +461,7 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, Button*, void ) { OUString sURL = xAccess->queryContentIdentifierString( ); INetURLObject aURL( sURL ); - OUString sId = aURL.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); + OUString sId = aURL.GetURLPath( INetURLObject::DecodeMechanism::WithCharset ); sId = sId.copy( 1 ); m_aRepoIds.push_back( sId ); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 2dd42da2aa76..2fae75205aba 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -692,7 +692,7 @@ void AssignmentPersistentData::ImplCommit() INetURLObject aURL( sName ); if( aURL.GetProtocol() != INetProtocol::NotValid ) { - OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); sName = aFileNotation.get(OFileNotation::N_SYSTEM); } @@ -1186,7 +1186,7 @@ void AssignmentPersistentData::ImplCommit() INetURLObject aURL( sName ); if( aURL.GetProtocol() != INetProtocol::NotValid ) { - OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); sName = aFileNotation.get(OFileNotation::N_SYSTEM); } m_pDatasource->InsertEntry(sName); diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index f4ff92462036..6405b68c85c1 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -197,7 +197,7 @@ static SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] = static OUString GetImageExtensionByFactory_Impl( const OUString& rURL ) { INetURLObject aObj( rURL ); - OUString aPath = aObj.GetURLPath( INetURLObject::NO_DECODE ); + OUString aPath = aObj.GetURLPath( INetURLObject::DecodeMechanism::NONE ); OUString aExtension; if ( !aPath.isEmpty() ) @@ -352,7 +352,7 @@ static sal_uInt16 GetFolderImageId_Impl( const OUString& rURL ) static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFolder ) { - OUString aExt, sURL = rObject.GetMainURL( INetURLObject::NO_DECODE ); + OUString aExt, sURL = rObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ); sal_uInt16 nImage = IMG_FILE; if ( rObject.GetProtocol() == INetProtocol::PrivSoffice ) @@ -525,7 +525,7 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig ) OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder ) { OUString sExtension(rObject.getExtension()); - OUString sDescription, sURL( rObject.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString sDescription, sURL( rObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); sal_uInt16 nResId = 0; bool bShowExt = false, bOnlyFile = false; bool bFolder = bDetectFolder && CONTENT_HELPER::IsFolder( sURL ); diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index a5f31be9b7f8..3a0b1533bbf2 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -109,7 +109,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL ) aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); // make URL absolute - aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DECODE_UNAMBIGUOUS ); + aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous ); std::unique_ptr pCompat(new IMapCompat( rIStm, StreamMode::READ )); ReadIMapObject( rIStm ); diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 6979be1adad5..e757511778f6 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -124,7 +124,7 @@ namespace svt explicit TemplateContent( const INetURLObject& _rURL ); // attribute access - inline OUString getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); } + inline OUString getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); } inline void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; } inline const util::DateTime& getModDate( ) const { return m_aLastModified; } @@ -527,7 +527,7 @@ namespace svt osl::FileBase::getFileURLFromSystemPath( _rPath, sURL ); aParser.SetURL( sURL ); } - return aParser.GetMainURL( INetURLObject::DECODE_TO_IURI ); + return aParser.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); } @@ -719,7 +719,7 @@ namespace svt aStorageURL.Append( ".templdir.cache" ); // open the stream - m_pCacheStream = UcbStreamHelper::CreateStream( aStorageURL.GetMainURL( INetURLObject::DECODE_TO_IURI ), + m_pCacheStream = UcbStreamHelper::CreateStream( aStorageURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ), _bForRead ? StreamMode::READ | StreamMode::NOCREATE : StreamMode::WRITE | StreamMode::TRUNC ); DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::openCacheStream: could not open/create the cache stream!" ); if ( m_pCacheStream && m_pCacheStream->GetErrorCode() ) diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 78849fa5dd8b..08ea19bde465 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1888,7 +1888,7 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCase(".URL") ) { - std::unique_ptr pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ), + std::unique_ptr pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::STD_READ )); if( !pStream || pStream->GetError() ) -- cgit