diff options
Diffstat (limited to 'svtools/source/misc')
-rw-r--r-- | svtools/source/misc/imagemgr.cxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/imap.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
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<IMapCompat> 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<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ), + std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::STD_READ )); if( !pStream || pStream->GetError() ) |