[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - comphelper/source

[Michael Stahl]

 comphelper/source/container/embeddedobjectcontainer.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 24b329855050512e9e5c61ac56f2300b69e38b9e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 13 22:27:01 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index b813b96..847142b 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() )
         {