INTEGRATION: CWS mav09 (1.84.30); FILE MERGED

2004/09/16 17:46:29 mav 1.84.30.4: RESYNC: (1.86-1.89); FILE MERGED
2004/08/09 18:18:32 mav 1.84.30.3: RESYNC: (1.85-1.86); FILE MERGED
2004/07/08 07:24:57 mav 1.84.30.2: RESYNC: (1.84-1.85); FILE MERGED
2004/07/01 10:10:34 mav 1.84.30.1: #i27773# import of embedded links

xmloff/source/draw/ximpshap.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximpshap.cxx,v $
  *
- *  $Revision: 1.89 $
+ *  $Revision: 1.90 $
  *
- *  last change: $Author: rt $ $Date: 2004-08-23 07:58:45 $
+ *  last change: $Author: kz $ $Date: 2004-10-04 18:11:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2540,12 +2540,22 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
 
             if( xProps.is() )
             {
-                uno::Any        aAny;
-                OUString        aPersistName( GetImport().ResolveEmbeddedObjectURL( maHref, maCLSID ) );
-                const OUString  sURL(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ));
+                OUString aPersistName = GetImport().ResolveEmbeddedObjectURL( maHref, maCLSID );
 
-                aAny <<= ( aPersistName = aPersistName.copy( sURL.getLength() ) );
-                xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ), aAny );
+                if ( aPersistName.getLength() )
+                {
+                    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 );
+                }
+                else
+                {
+                    // this is OOo link object
+                    xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LinkURL" ) ),
+                                              uno::makeAny( maHref ) );
+                }
             }
         }