diff options
| author | Armin Le Grand <alg@apache.org> | 2012-01-11 10:46:04 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2012-01-11 10:46:04 +0000 |
| commit | aaeb33712db6022ed24f216838e8ea4c0a19d5db (patch) | |
| tree | b758dfc5b537b308172cfec81bbabc40b2d9a320 /xmloff | |
| parent | 740f4eb387e63b35ac1784a7a143315df22d1892 (diff) | |
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image import with linked graphics, too
Notes
merged as: 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 79bcbe026c51..cef6ec5c005a 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3396,6 +3396,12 @@ rtl::OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXML if(xPropSet.is()) { xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL"))) >>= aRetval; + + if(!aRetval.getLength()) + { + // it maybe a link, try GraphicURL + xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))) >>= aRetval; + } } } catch( uno::Exception& ) |