diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-13 22:27:01 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-13 23:42:33 +0100 |
| commit | bd5834005872d005c3129405c6ab2d6d2bdce19d (patch) | |
| tree | df5eed48bbe373e22570785b75ba8905c3501859 | |
| parent | 7d77b7c671083705b87c015ecdab1711bfad615f (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
| -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 9a913217c60f..6c373e2c03af 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -707,7 +707,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() ) { |