Kaydet (Commit) 291f55ed authored tarafından Michael Stahl's avatar Michael Stahl

assert that no ODF import happens without a BaseURL

Change-Id: I4520a9d0350349cb083ed627a19264a3a97e090f
üst 032e34d0
......@@ -383,6 +383,7 @@ sal_Int32 XMLFilter::impl_Import(
}
}
assert(!aBaseUri.isEmpty()); // needed for relative URLs
if( !aBaseUri.isEmpty() )
xImportInfo->setPropertyValue( "BaseURI", uno::makeAny( aBaseUri ) );
......
......@@ -485,6 +485,7 @@ void ODatabaseDocument::impl_import_nolck_throw( const Reference< XComponentCont
OUString sBaseURI = _rResource.getOrDefault("BaseURI", OUString());
if (sBaseURI.isEmpty())
sBaseURI = _rResource.getOrDefault("URL",OUString());
assert(!sBaseURI.isEmpty()); // needed for relative URLs
xInfoSet->setPropertyValue("BaseURI", uno::makeAny(sBaseURI));
xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("content.xml")));
......
......@@ -512,6 +512,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
utl::MediaDescriptor aDescriptor(rDescriptor);
uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
const OUString sVal( aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL(),OUString()) );
assert(!sVal.isEmpty()); // needed for relative URLs
xProp->setPropertyValue("BaseURI", uno::makeAny(sVal));
const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) );
xProp->setPropertyValue("StreamRelPath", uno::makeAny(sHierarchicalDocumentName));
......
......@@ -379,6 +379,7 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError )
// Set base URI
OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" );
OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : OUString();
assert(!aBaseURL.isEmpty()); // needed for relative URLs
OUString sPropName("BaseURI");
xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) );
......
......@@ -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() )
{
......
......@@ -141,8 +141,9 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
new comphelper::PropertySetInfo( aInfoMap ) ) );
// Set base URI
OUString sPropName( "BaseURI" );
xInfoSet->setPropertyValue( sPropName, makeAny( rMedium.GetBaseURL() ) );
OUString const baseURI(rMedium.GetBaseURL());
assert(!baseURI.isEmpty()); // needed for relative URLs
xInfoSet->setPropertyValue("BaseURI", makeAny(baseURI));
sal_Int32 nSteps=3;
if ( !(rMedium.IsStorage()))
......@@ -174,8 +175,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
if ( !aName.isEmpty() )
{
sPropName = "StreamRelPath";
xInfoSet->setPropertyValue( sPropName, makeAny( aName ) );
xInfoSet->setPropertyValue("StreamRelPath", makeAny(aName));
}
}
......
......@@ -492,6 +492,8 @@ 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
// Get service factory
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment