You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/01/11 12:46:04 UTC
svn commit: r1229962 -
/incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.cxx
Author: alg
Date: Wed Jan 11 11:46:04 2012
New Revision: 1229962
URL: http://svn.apache.org/viewvc?rev=1229962&view=rev
Log:
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image import with linked graphics, too
Modified:
incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.cxx
Modified: incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.cxx?rev=1229962&r1=1229961&r2=1229962&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.cxx (original)
+++ incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.cxx Wed Jan 11 11:46:04 2012
@@ -3396,6 +3396,12 @@ rtl::OUString SdXMLFrameShapeContext::ge
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& )