summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/draw/dpage.cxx4
-rw-r--r--sw/source/core/fields/docufld.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/uibase/app/docsh.cxx4
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx8
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx2
9 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index f90b2e1795cb..a03f36a93992 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -85,7 +85,7 @@ inline bool GetRealURL( const SwGrfNode& rNd, OUString& rText )
{
bool bRet = rNd.GetFileFilterNms( &rText, nullptr );
if( bRet )
- rText = URIHelper::removePassword( rText, INetURLObject::WAS_ENCODED,
+ rText = URIHelper::removePassword( rText, INetURLObject::EncodeMechanism::WasEncoded,
INetURLObject::DECODE_UNAMBIGUOUS);
if (rText.startsWith("data:image")) rText = "inline image";
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 3a46620eec33..08b039fc934e 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -198,14 +198,14 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
sText = pTmpObj->GetAltText();
if ( sText.isEmpty() )
sText = URIHelper::removePassword( pTmpObj->GetURL(),
- INetURLObject::WAS_ENCODED,
+ INetURLObject::EncodeMechanism::WasEncoded,
INetURLObject::DECODE_UNAMBIGUOUS);
}
}
else if ( !rURL.GetURL().isEmpty() )
{
sText = URIHelper::removePassword( rURL.GetURL(),
- INetURLObject::WAS_ENCODED,
+ INetURLObject::EncodeMechanism::WasEncoded,
INetURLObject::DECODE_UNAMBIGUOUS);
if( rURL.IsServerMap() )
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index c3a392bd7789..fbefdc24719f 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -425,7 +425,7 @@ OUString SwFileNameFieldType::Expand(sal_uLong nFormat) const
{
aRet = URIHelper::removePassword(
rURLObj.GetMainURL( INetURLObject::NO_DECODE ),
- INetURLObject::WAS_ENCODED, URL_DECODE );
+ INetURLObject::EncodeMechanism::WasEncoded, URL_DECODE );
const sal_Int32 nPos = aRet.indexOf(rURLObj.GetLastName( URL_DECODE ));
if (nPos>=0)
{
@@ -449,7 +449,7 @@ OUString SwFileNameFieldType::Expand(sal_uLong nFormat) const
else
aRet = URIHelper::removePassword(
rURLObj.GetMainURL( INetURLObject::NO_DECODE ),
- INetURLObject::WAS_ENCODED, URL_DECODE );
+ INetURLObject::EncodeMechanism::WasEncoded, URL_DECODE );
}
}
return aRet;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index c4bfb39f4c6f..46d42cb5835b 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -148,7 +148,7 @@ OUString SwBasicEscherEx::BuildFileName(sal_uInt16& rnLevel, bool& rbRel, const
// try to convert to relative file name
OUString aTmpName( aDosName );
aDosName = INetURLObject::GetRelURL( GetBasePath(), rUrl,
- INetURLObject::WAS_ENCODED, INetURLObject::DECODE_WITH_CHARSET );
+ INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DECODE_WITH_CHARSET );
if (aDosName.startsWith(INET_FILE_SCHEME))
{
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 738a51a18271..b81b1097cab1 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1128,7 +1128,7 @@ OUString BookmarkToWord(const OUString &rBookmark)
{
OUString sRet(INetURLObject::encode(rBookmark,
INetURLObject::PART_REL_SEGMENT_EXTRA,
- INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_ASCII_US));
+ INetURLObject::EncodeMechanism::All, RTL_TEXTENCODING_ASCII_US));
return TruncateBookmark(sRet);
}
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 2872e78040f4..d425aa921aaf 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -430,8 +430,8 @@ 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::ENCODE_ALL);
- aURL += "/" + INetURLObject::encode(m_pDoc->GetDBManager()->getEmbeddedName(), INetURLObject::PART_FPATH, INetURLObject::ENCODE_ALL);
+ aURL += INetURLObject::encode(rOldURLObject.GetMainURL(INetURLObject::DECODE_WITH_CHARSET), 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);
uno::Reference<frame::XStorable> xStorable(xDataSource->getDatabaseDocument(), uno::UNO_QUERY);
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index b7a15fc31f57..d822c00d7786 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -264,7 +264,7 @@ void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::Da
OUString aOwnURL = pDocShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_WITH_CHARSET);
OUString sTmpName = "vnd.sun.star.pkg://";
- sTmpName += INetURLObject::encode(aOwnURL, INetURLObject::PART_AUTHORITY, INetURLObject::ENCODE_ALL);
+ sTmpName += INetURLObject::encode(aOwnURL, INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All);
sTmpName += "/" + m_pDBManager->getEmbeddedName();
if (sTmpName != rEvent.OldLocation)
@@ -2755,7 +2755,7 @@ void SwDBManager::StoreEmbeddedDataSource(const uno::Reference<frame::XStorable>
{
// Construct vnd.sun.star.pkg:// URL for later loading, and TargetStorage/StreamRelPath for storing.
OUString sTmpName = "vnd.sun.star.pkg://";
- sTmpName += INetURLObject::encode(rOwnURL, INetURLObject::PART_AUTHORITY, INetURLObject::ENCODE_ALL);
+ sTmpName += INetURLObject::encode(rOwnURL, INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All);
sTmpName += "/" + rStreamRelPath;
uno::Sequence<beans::PropertyValue> aSequence = comphelper::InitPropertySequence(
@@ -2797,8 +2797,8 @@ void SwDBManager::LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const
// Encode the stream name and the real path into a single URL.
const INetURLObject& rURLObject = rDocShell.GetMedium()->GetURLObject();
OUString aURL = "vnd.sun.star.pkg://";
- aURL += INetURLObject::encode(rURLObject.GetMainURL(INetURLObject::DECODE_WITH_CHARSET), INetURLObject::PART_AUTHORITY, INetURLObject::ENCODE_ALL);
- aURL += "/" + INetURLObject::encode(m_sEmbeddedName, INetURLObject::PART_FPATH, INetURLObject::ENCODE_ALL);
+ aURL += INetURLObject::encode(rURLObject.GetMainURL(INetURLObject::DECODE_WITH_CHARSET), INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All);
+ aURL += "/" + INetURLObject::encode(m_sEmbeddedName, INetURLObject::PART_FPATH, INetURLObject::EncodeMechanism::All);
uno::Reference<uno::XInterface> xDataSource(xDatabaseContext->getByName(aURL), uno::UNO_QUERY);
xDatabaseContext->registerObject( sDataSource, xDataSource );
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 0b84f351553b..41d7a5bd63de 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -225,7 +225,7 @@ SwTransferable::SwTransferable( SwWrtShell& rSh )
const INetURLObject& rURLObj = pDShell->GetMedium()->GetURLObject();
m_aObjDesc.maDisplayName = URIHelper::removePassword(
rURLObj.GetMainURL( INetURLObject::NO_DECODE ),
- INetURLObject::WAS_ENCODED,
+ INetURLObject::EncodeMechanism::WasEncoded,
INetURLObject::DECODE_UNAMBIGUOUS );
}
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 71a3e152487f..f0f65e1ae090 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -168,7 +168,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
{
sText = static_cast<const SfxStringItem*>(aContentAtPos.aFnd.pAttr)->GetValue();
sText = URIHelper::removePassword( sText,
- INetURLObject::WAS_ENCODED,
+ INetURLObject::EncodeMechanism::WasEncoded,
INetURLObject::DECODE_UNAMBIGUOUS);
//#i63832# remove the link target type
sal_Int32 nFound = sText.indexOf(cMarkSeparator);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 10:10:14 +0000