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-18 01:07:53 -0500 |
| commit | 3c4333c24882d6699b65d109f2cfbf7daf3122c6 (patch) | |
| tree | 739dacdd38ddd2053aaa3ad7f0ffc053eb515d52 /sw/source/uibase/app | |
| parent | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (diff) | |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
(cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 9af6ebac308e..0412b11d3baa 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -430,7 +430,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) const INetURLObject& rOldURLObject = GetMedium()->GetURLObject(); OUString aURL = "vnd.sun.star.pkg://"; - aURL += INetURLObject::encode(rOldURLObject.GetMainURL(INetURLObject::DECODE_WITH_CHARSET), INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All); + aURL += INetURLObject::encode(rOldURLObject.GetMainURL(INetURLObject::DecodeMechanism::WithCharset), INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All); aURL += "/" + INetURLObject::encode(m_pDoc->GetDBManager()->getEmbeddedName(), INetURLObject::PART_FPATH, INetURLObject::EncodeMechanism::All); uno::Reference<sdb::XDocumentDataSource> xDataSource(xDatabaseContext->getByName(aURL), uno::UNO_QUERY); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 2fb1557bbd41..ebdefb402a27 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1629,7 +1629,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh, // 2. Open the file ourselves std::unique_ptr<SfxMedium> xMed(new SfxMedium( aTmpObj.GetMainURL( - INetURLObject::NO_DECODE ), StreamMode::READ )); + INetURLObject::DecodeMechanism::NONE ), StreamMode::READ )); if( INetProtocol::File == aTmpObj.GetProtocol() ) xMed->Download(); // Touch the medium (download it) |