diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-13 22:27:01 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-18 14:06:03 +0000 |
| commit | 24b329855050512e9e5c61ac56f2300b69e38b9e (patch) | |
| tree | 7e5e742f1368e7c12a6d81a555d30cb53218d6a0 /comphelper | |
| parent | 12bc593da98be68961a9ea7d31619a7718fd1d4b (diff) | |
tdf#97108: SwDocShell of clipboard document has no base URL
... which triggers this assert; have to downgrade it to SAL_INFO.
The startsWith("0x") check is obsolete anyway since commit
0f02bc189b6e89ca2e62d4bd6a2f407a9fd4ec3b.
Change-Id: If47bc4496852ff85ba1bbeb4205ffc16be0782de
(cherry picked from commit bd5834005872d005c3129405c6ab2d6d2bdce19d)
Reviewed-on: https://gerrit.libreoffice.org/21467
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/container/embeddedobjectcontainer.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index b813b96be0dd..847142bacc9d 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -696,7 +696,8 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb // objects without persistence are not really stored by the method if (xObj.is() && StoreEmbeddedObject(xObj, rName, true, rSrcShellID, rDestShellID)) { - assert(!rDestShellID.isEmpty() && !rDestShellID.startsWith("0x")); // assume that every shell has a base URL + SAL_INFO_IF(rDestShellID.isEmpty(), "comphelper.container", + "SfxObjectShell with no base URL?"); // every shell has a base URL, except the clipboard SwDocShell xResult = Get_Impl(rName, xObj, &rDestShellID); if ( !xResult.is() ) { |