diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
| commit | d7e6a5284e6262f800435bcf35b8c840db63b698 (patch) | |
| tree | 6e786a728bfd1a0a2f581b5bedf91e60e90cac1c /xmloff/source/draw/ximpshap.cxx | |
| parent | 88635eddcd4e4d8a3eb4293cbbe055415cd147c4 (diff) | |
| parent | 344e390b9d114b3cbdd9d1b39ea44e5cdf875788 (diff) | |
renaissance2: merge to m73
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 95f2d6b80058..e8b5ba61ea8d 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ximpshap.cxx,v $ - * $Revision: 1.128.2.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -3024,7 +3021,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 ) { |