diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 10:19:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 10:19:24 +0000 |
| commit | ee7db84e8ecfd82a7b7fe699a163376528635fbc (patch) | |
| tree | 7b323bd21eb7b989bc0020bc81ac76b1287fb04f /xmloff/source/draw/ximpshap.cxx | |
| parent | 1d4ba34330ba950710e048b00ecc370630ea70c9 (diff) | |
INTEGRATION: CWS mav17 (1.100.20); FILE MERGED
2005/03/02 16:15:38 mav 1.100.20.2: RESYNC: (1.100-1.102); FILE MERGED
2005/02/18 16:54:17 mav 1.100.20.1: #i39893# relative URLs for embedded links
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index daa3e83a40..29c56db405 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpshap.cxx,v $ * - * $Revision: 1.102 $ + * $Revision: 1.103 $ * - * last change: $Author: vg $ $Date: 2005-02-25 09:23:23 $ + * last change: $Author: obo $ $Date: 2005-03-15 11:19:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2581,19 +2581,21 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen { OUString aPersistName = GetImport().ResolveEmbeddedObjectURL( maHref, maCLSID ); - if ( aPersistName.getLength() ) + if ( GetImport().IsPackageURL( maHref ) ) { const OUString sURL(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" )); - uno::Any aAny; - aAny <<= ( aPersistName = aPersistName.copy( sURL.getLength() ) ); - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ), aAny ); + if ( aPersistName.compareTo( sURL, sURL.getLength() ) == 0 ) + aPersistName = aPersistName.copy( sURL.getLength() ); + + xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ), + uno::makeAny( aPersistName ) ); } else { // this is OOo link object xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LinkURL" ) ), - uno::makeAny( maHref ) ); + uno::makeAny( aPersistName ) ); } } } |