mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#97108: SwDocShell of clipboard document has no base URL

Browse Source 
... which triggers this assert; have to downgrade it to SAL_INFO.

The startsWith("0x") check is obsolete anyway since commit
0f02bc189b.

Change-Id: If47bc4496852ff85ba1bbeb4205ffc16be0782de
This commit is contained in:
Michael Stahl
2016-01-13 22:27:01 +01:00
parent 7d77b7c671
commit bd58340058
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
comphelper/source/container/embeddedobjectcontainer.cxx
View File

@@ -707,7 +707,8 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
// objects without persistence are not really stored by the method // objects without persistence are not really stored by the method
if (xObj.is() && StoreEmbeddedObject(xObj, rName, true, rSrcShellID, rDestShellID)) 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); xResult = Get_Impl(rName, xObj, &rDestShellID);
if ( !xResult.is() ) if ( !xResult.is() )
{ {