diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 07:59:20 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:52 -0500 |
| commit | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (patch) | |
| tree | c69d5d75274bf3943f98cdb5a661053ece11c1dd /connectivity | |
| parent | 32e74cdd3ff79fbbc21e1edba55145cc43c5be39 (diff) | |
convert INetURLObject::EncodeMechanism to scoped enum
(cherry picked from commit 803215142efa6437515348f63bd70ffdcf5d45f1)
(cherry picked from commit 736cd289d4cdb0db61d92134bcc9d48aa7e79613)
Change-Id: I50ea17c7779c7b5cacddf548f1773fd7d6c8bade
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/file/FDatabaseMetaData.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/writer/WConnection.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 25d95d842b20..91318179fd78 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -87,7 +87,7 @@ namespace aContent1 = aFolderOrDoc; else { - aContentURL = INetURLObject( _rFolderOrDoc, INetURLObject::WAS_ENCODED ); + aContentURL = INetURLObject( _rFolderOrDoc, INetURLObject::EncodeMechanism::WasEncoded ); aContentURL.Append( _rDocName ); aContent1 = ::ucbhelper::Content( aContentURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); } diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx index 8b46b949965c..307ffa83c83f 100644 --- a/connectivity/source/drivers/writer/WConnection.cxx +++ b/connectivity/source/drivers/writer/WConnection.cxx @@ -73,7 +73,7 @@ void OWriterConnection::construct(const OUString& url,const uno::Sequence< beans // don't pass invalid URL to loadComponentFromURL throw sdbc::SQLException(); } - m_aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE); + m_aFileName = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); m_sPassword.clear(); const char pPwd[] = "password"; |