diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-09 14:58:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-09 15:13:51 +0100 |
| commit | e9309e1f32e9029b62d67a3706ea63d4c5bb587a (patch) | |
| tree | 75f79840340e505ce5d6ab6f4e709abcd082b69d /sw | |
| parent | 555ee51b77a789253bffdd9ffb16bdc5e51b980a (diff) | |
don't assert that no ODF import happens without a base URL
Turns out that if you create a new document and then copy an embedded
object from it to the clipboard, there really is no usable base URL.
So don't assert and just log something, hopefully the important file
import cases have been fixed already.
Change-Id: Iee1027cbab4db10a273518739a5ab2c31627180e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 7c9b2412a65b..33c976f61b68 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -492,7 +492,9 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs(SwDoc& _rDoc) sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, const OUString & rName ) { - // TODO: sadly SwXMLTextBlocks doesn't set this? assert(!rBaseURL.isEmpty()); // needed for relative URLs + // needed for relative URLs, but in clipboard copy/paste there may be none + // and also there is the SwXMLTextBlocks special case + SAL_INFO_IF(rBaseURL.isEmpty(), "sw.filter", "sw::XMLReader: no base URL"); // Get service factory uno::Reference< uno::XComponentContext > xContext = |