summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorChristian Lippka <christian.lippka@sun.com>2010-01-04 17:04:05 +0100
committerChristian Lippka <christian.lippka@sun.com>2010-01-04 17:04:05 +0100
commitcdd4e82b282ddb0e662db1ad76e7eff4afaf4fb3 (patch)
treee9537dd882c030bedbcbb786cbabe9885a437f51 /xmloff
parent0de34b05f3c1a0409d23b63b9e69d4d7abbe1090 (diff)
parent9465334956ff0847e176174865eda637fec3fa95 (diff)
merging m68
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/ximpshap.cxx13
1 files changed, 12 insertions, 1 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 65aad96bad86..c4c86abb7eef 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2994,7 +2994,18 @@ void SdXMLPluginShapeContext::EndElement()
else
{
// in case we have a media object
- xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), uno::makeAny( maHref ) );
+
+ OUString sTempRef;
+
+ // check for package URL
+ if( GetImport().IsPackageURL( maHref ) )
+ {
+ sTempRef = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
+ }
+
+ sTempRef += maHref;
+
+ xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), uno::makeAny( sTempRef ) );
for( sal_Int32 nParam = 0; nParam < maParams.getLength(); ++nParam )
{