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 /sd/source | |
| 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 'sd/source')
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 98ae6551da02..5829e61ad552 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -587,7 +587,8 @@ bool SdXMLFilter::Import( ErrCode& nError ) // Set base URI OUString const baseURI(mrMedium.GetBaseURL()); - assert(!baseURI.isEmpty()); // needed for relative URLs + // needed for relative URLs, but in clipboard copy/paste there may be none + SAL_INFO_IF(baseURI.isEmpty(), "sd.filter", "SdXMLFilter: no base URL"); xInfoSet->setPropertyValue("BaseURI", makeAny(baseURI)); if( 0 == nRet && SfxObjectCreateMode::EMBEDDED == mrDocShell.GetCreateMode() ) |