sw/source/uibase/dbui/dbmgr.cxx | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
New commits:
commit cd38c23ed291e52fbb3cf0ce6070081e6aecff22
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Fri Jul 8 14:48:27 2022 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jul 26 14:55:53 2022 +0200
tdf#149915 Proper creation of vnd.sun.star.pkg:// URL
Using different methods of creation (one using DecodeMechanism::NONE,
another using DecodeMechanism::WithCharset) gave differently encoded
end results, comparing unequal.
The proper way is using DecodeMechanism::NONE on the document's URL,
as implemented in commit 06756e412b2a02030ce3355b3fe4e2ecc71d2301
Author Mike Kaganski <mike.kagan...@collabora.com>
Date Sat Nov 18 22:41:40 2017 +0300
One more proper construction of vnd.sun.star.pkg URL
Co-authored-by: Mike Kaganski <mike.kagan...@collabora.com>
Change-Id: I272f277ef8b4bd23e6cb7884e68f3c79f742683a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136901
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 9790585a62cb55e0e0024819596592193a6de269)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137429
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 9323c52770b2..aa9937065325 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -136,6 +136,21 @@ void lcl_emitEvent(SfxEventHintId nEventId, sal_Int32
nStrId, SfxObjectShell* pD
pDocShell));
}
+// Construct vnd.sun.star.pkg:// URL
+OUString ConstructVndSunStarPkgUrl(const OUString& rMainURL,
std::u16string_view rStreamRelPath)
+{
+ auto xContext(comphelper::getProcessComponentContext());
+ auto xUri =
css::uri::UriReferenceFactory::create(xContext)->parse(rMainURL);
+ assert(xUri.is());
+ xUri = css::uri::VndSunStarPkgUrlReferenceFactory::create(xContext)
+ ->createVndSunStarPkgUrlReference(xUri);
+ assert(xUri.is());
+ return xUri->getUriReference() + "/"
+ + INetURLObject::encode(
+ rStreamRelPath, INetURLObject::PART_FPATH,
+ INetURLObject::EncodeMechanism::All);
+}
+
}
std::vector<std::pair<SwDocShell*, OUString>>
SwDBManager::s_aUncommittedRegistrations;
@@ -256,10 +271,9 @@ void SAL_CALL
SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::Da
if (!pDocShell)
return;
- OUString aOwnURL =
pDocShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::WithCharset);
- OUString sTmpName = "vnd.sun.star.pkg://" +
- INetURLObject::encode(aOwnURL, INetURLObject::PART_AUTHORITY,
INetURLObject::EncodeMechanism::All);
- sTmpName += "/" + m_pDBManager->getEmbeddedName();
+ const OUString sTmpName = ConstructVndSunStarPkgUrl(
+
pDocShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::NONE),
+ m_pDBManager->getEmbeddedName());
if (sTmpName != rEvent.OldLocation)
return;
@@ -2760,21 +2774,6 @@ OUString LoadAndRegisterDataSource_Impl(DBConnURIType
type, const uno::Reference
}
return sFind;
}
-
-// Construct vnd.sun.star.pkg:// URL
-OUString ConstructVndSunStarPkgUrl(const OUString& rMainURL,
std::u16string_view rStreamRelPath)
-{
- auto xContext(comphelper::getProcessComponentContext());
- auto xUri =
css::uri::UriReferenceFactory::create(xContext)->parse(rMainURL);
- assert(xUri.is());
- xUri = css::uri::VndSunStarPkgUrlReferenceFactory::create(xContext)
- ->createVndSunStarPkgUrlReference(xUri);
- assert(xUri.is());
- return xUri->getUriReference() + "/"
- + INetURLObject::encode(
- rStreamRelPath, INetURLObject::PART_FPATH,
- INetURLObject::EncodeMechanism::All);
-}
}
OUString SwDBManager::LoadAndRegisterDataSource(weld::Window* pParent,
SwDocShell* pDocShell)
