summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-12-15 17:37:08 +0100
committerMichael Stahl <mstahl@redhat.com>2015-12-16 20:37:39 +0100
commit291f55edf3d5c1d443cbd9a06bc6f7fd773884e5 (patch)
treec7caddd7dba7afa7d0eae1d137535a8363ff6317 /sd
parent032e34d0014d2154feaf97105d2dbe69b290b8c5 (diff)
assert that no ODF import happens without a BaseURL
Change-Id: I4520a9d0350349cb083ed627a19264a3a97e090f
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 8848b8f1e9cd..5e522ef963b6 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -587,7 +587,9 @@ bool SdXMLFilter::Import( ErrCode& nError )
}
// Set base URI
- xInfoSet->setPropertyValue( "BaseURI" , makeAny( mrMedium.GetBaseURL() ) );
+ OUString const baseURI(mrMedium.GetBaseURL());
+ assert(!baseURI.isEmpty()); // needed for relative URLs
+ xInfoSet->setPropertyValue("BaseURI", makeAny(baseURI));
if( 0 == nRet && SfxObjectCreateMode::EMBEDDED == mrDocShell.GetCreateMode() )
{