diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-11-13 16:10:49 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-11-13 18:23:43 +0100 |
| commit | 3dee7948c732faf488846d4d3d1237e89afde28c (patch) | |
| tree | 4b3237a12fa99081fae056791df5a7c67b77f950 /extensions | |
| parent | 6be596c282f84a3cb3a62edccfdfbf69663cf59e (diff) | |
More proper construction of vnd.sun.star.pkg URL
See commit bff8d843bd4e5dcca5dc1a60c2c7852b1b72a00b
The SwUiWriterTest::testEmbeddedDataSource unit test is adjusted to
test the paths with "#".
Change-Id: I8d85147128915c7100ab9cc2888eb73c94fe6486
Reviewed-on: https://gerrit.libreoffice.org/44678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 17d1ad154a23..cf95ac048086 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -38,6 +38,8 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/uno/XNamingService.hpp> +#include <com/sun/star/uri/UriReferenceFactory.hpp> +#include <com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp> #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> @@ -63,7 +65,7 @@ OUString lcl_getOwnURL(SfxObjectShell const * pObjectShell) return aRet; const INetURLObject& rURLObject = pObjectShell->GetMedium()->GetURLObject(); - aRet = rURLObject.GetMainURL(INetURLObject::DecodeMechanism::WithCharset); + aRet = rURLObject.GetMainURL(INetURLObject::DecodeMechanism::NONE); return aRet; } @@ -353,8 +355,8 @@ namespace abp { SfxViewFrame* pFrame = SfxViewFrame::Current(); SfxObjectShell* pObjectShell = pFrame ? pFrame->GetObjectShell() : nullptr; - OUString aOwnURL = lcl_getOwnURL(pObjectShell); - if (aOwnURL.isEmpty() || !rSettings.bEmbedDataSource || !pObjectShell) + OUString aOwnURL = lcl_getOwnURL(pObjectShell); // empty if pObjectShell is nullptr + if (aOwnURL.isEmpty() || !rSettings.bEmbedDataSource) { // Cannot or should not embed. xStorable->storeAsURL(m_pImpl->sName,Sequence<PropertyValue>()); @@ -363,9 +365,12 @@ namespace abp { // Embed. OUString aStreamRelPath = "EmbeddedDatabase"; - OUString sTmpName = "vnd.sun.star.pkg://"; - sTmpName += INetURLObject::encode(aOwnURL, INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All); - sTmpName += "/" + aStreamRelPath; + auto xContext(comphelper::getProcessComponentContext()); + auto xUri = css::uri::UriReferenceFactory::create(xContext)->parse(aOwnURL); + assert(xUri.is()); + xUri = css::uri::VndSunStarPkgUrlReferenceFactory::create(xContext)->createVndSunStarPkgUrlReference(xUri); + assert(xUri.is()); + OUString const sTmpName = xUri->getUriReference() + "/" + aStreamRelPath; uno::Reference<embed::XStorage> xStorage = pObjectShell->GetStorage(); uno::Sequence<beans::PropertyValue> aSequence = comphelper::InitPropertySequence( { |