#89079# some changes made for relative URLS before were incorrect (those pointing into the package)

2 files changed, 10 insertions, 10 deletions

diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 24d2d31ec664..3cc68d095645 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shapeexport2.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: bm $ $Date: 2001-07-02 13:24:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -991,7 +991,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
             OUString aStr;
 
             xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))) >>= aStr;
-            aStr = GetExport().GetRelativeReference( rExport.AddEmbeddedGraphicObject( aStr ) );
+            aStr = rExport.AddEmbeddedGraphicObject( aStr );
             rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr );
 
             if( aStr.getLength() && aStr[ 0 ] == '#' )
@@ -1355,7 +1355,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
 
             sURL = rExport.AddEmbeddedObject( sURL );
 
-            rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(sURL) );
+            rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sURL );
             rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
             rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
             rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
@@ -1369,7 +1369,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
         xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ThumbnailGraphicURL")) ) >>= aStr;
         if( aStr.getLength() )
         {
-            aStr = rExport.AddEmbeddedGraphicObject( GetExport().GetRelativeReference(aStr) );
+            aStr = rExport.AddEmbeddedGraphicObject( aStr );
             rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr );
 
             rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 901d455e2616..872ba3224fd0 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximpshap.cxx,v $
  *
- *  $Revision: 1.54 $
+ *  $Revision: 1.55 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: bm $ $Date: 2001-07-02 13:23:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -264,7 +264,7 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT nPrefix,
             {
                 if( IsXMLToken( aLocalName, XML_HREF ) )
                 {
-                    maThumbnailURL = GetImport().GetAbsoluteReference(xAttrList->getValueByIndex( i ));
+                    maThumbnailURL = xAttrList->getValueByIndex( i );
                     break;
                 }
             }
@@ -1952,7 +1952,7 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const
     {
         if( IsXMLToken( rLocalName, XML_HREF ) )
         {
-            maURL = GetImport().GetAbsoluteReference(rValue);
+            maURL = rValue;
             return;
         }
     }
@@ -2270,7 +2270,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
     case XML_NAMESPACE_XLINK:
         if( IsXMLToken( rLocalName, XML_HREF ) )
         {
-            maHref = GetImport().GetAbsoluteReference(rValue);
+            maHref = rValue;
             return;
         }
         break;