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 /sot | |
| parent | 736cd289d4cdb0db61d92134bcc9d48aa7e79613 (diff) | |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/storage.cxx | 4 | ||||
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index ac672efd1b1f..0bd242585578 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -305,7 +305,7 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode ) OUString aURL; osl::FileBase::getFileURLFromSystemPath( m_aName, aURL ); aObj.SetURL( aURL ); - m_aName = aObj.GetMainURL( INetURLObject::NO_DECODE ); + m_aName = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } // check the stream @@ -488,7 +488,7 @@ bool SotStorage::IsStorageFile( const OUString & rFileName ) OUString aURL; osl::FileBase::getFileURLFromSystemPath( aName, aURL ); aObj.SetURL( aURL ); - aName = aObj.GetMainURL( INetURLObject::NO_DECODE ); + aName = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } std::unique_ptr<SvStream> pStm(::utl::UcbStreamHelper::CreateStream( aName, StreamMode::STD_READ )); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index d4c1d560c028..11179f31d118 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1091,7 +1091,7 @@ sal_Int16 UCBStorageStream_Impl::Commit() INetURLObject aObj( m_aURL ); aObj.SetName( m_aName ); - m_aURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); + m_aURL = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); m_bModified = false; m_bSourceRead = true; } @@ -1631,7 +1631,7 @@ void UCBStorage_Impl::Init() aObj.Append( "manifest.xml" ); // create input stream - std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::STD_READ )); + std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::STD_READ )); // no stream means no manifest.xml if ( pStream ) { @@ -2794,7 +2794,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const OUString& rEleName, StreamMode INetURLObject aFolderObj( pImp->m_aURL ); aFolderObj.removeSegment(); - Content aFolder( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + Content aFolder( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); pImp->m_pContent = new Content; bool bRet = ::utl::UCBContentHelper::MakeFolder( aFolder, pImp->m_aName, *pImp->m_pContent ); if ( !bRet ) |