#80795#: use packages

xmloff/source/core/xmlimp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimp.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: ka $ $Date: 2000-12-01 11:14:43 $
+ *  last change: $Author: mib $ $Date: 2000-12-02 10:25:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -101,8 +101,12 @@
 #include "xmlnumfi.hxx"
 #endif
 
-#ifndef _COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HDL_
-#include <com/sun/star/lang/ServiceNotRegisteredException.hdl>
+#ifndef _XMLOFF_PROGRESSBARHELPER_HXX
+#include "ProgressBarHelper.hxx"
+#endif
+
+#ifndef _COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HPP_
+#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #endif
 
 using namespace ::rtl;
@@ -194,8 +198,6 @@ void SvXMLImport::_InitCtor()
                                sXML_n_table_old, XML_NAMESPACE_TABLE );
     pNamespaceMap->AddAtIndex( XML_OLD_NAMESPACE_META_IDX, sXML_np__meta_old,
                                sXML_n_meta_old, XML_NAMESPACE_META );
-
-    sPicturesPath = OUString( RTL_CONSTASCII_USTRINGPARAM( "#Pictures/" ) );
     sPackageProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
 }
 
@@ -610,7 +612,9 @@ const Reference< container::XNameContainer > & SvXMLImport::GetDashHelper()
     return xDashHelper;
 }
 
-::rtl::OUString SvXMLImport::ResolveGraphicObjectURL( const ::rtl::OUString& rURL, sal_Bool bLoadOnDemand )
+::rtl::OUString SvXMLImport::ResolveGraphicObjectURL(
+                                    const ::rtl::OUString& rURL,
+                                    sal_Bool bLoadOnDemand )
 {
     ::rtl::OUString sRet;
 

xmloff/source/style/XMLBackgroundImageContext.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLBackgroundImageContext.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mib $ $Date: 2000-10-19 14:25:17 $
+ *  last change: $Author: mib $ $Date: 2000-12-02 10:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -366,7 +366,7 @@ void XMLBackgroundImageContext::ProcessAttrs(
     else if( GraphicLocation_NONE == ePos )
         ePos = GraphicLocation_TILED;
 
-    aProp.maValue <<= sURL;
+    aProp.maValue <<= GetImport().ResolveGraphicObjectURL( sURL, sal_False );
     aPosProp.maValue <<= ePos;
     aFilterProp.maValue <<= sFilter;
 }

xmloff/source/style/xmlnumi.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlnumi.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cl $ $Date: 2000-12-01 18:59:51 $
+ *  last change: $Author: mib $ $Date: 2000-12-02 10:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -285,7 +285,7 @@ public:
 
     sal_Int32 GetLevel() const { return nLevel; }
     Sequence<beans::PropertyValue> GetProperties(
-            const SvI18NMap *pI18NMap=0 ) const;
+            const SvI18NMap *pI18NMap=0 );
 };
 
 SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
@@ -427,7 +427,7 @@ SvXMLImportContext *SvxXMLListLevelStyleContext_Impl::CreateChildContext(
 }
 
 Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
-        const SvI18NMap *pI18NMap ) const
+        const SvI18NMap *pI18NMap )
 {
     sal_Int16 eType;
 
@@ -530,11 +530,10 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
 
         if( bImage )
         {
-            String sURL( sImageURL );
-            INetURLObject::RelToAbs( sURL );
             pProps[nPos].Name =
                     OUString::createFromAscii( XML_UNO_NAME_NRULE_GRAPHICURL );
-            pProps[nPos++].Value <<= OUString(sURL);
+            pProps[nPos++].Value <<= GetImport().ResolveGraphicObjectURL( sImageURL,
+                                                                       sal_False );
 
             awt::Size aSize( nImageWidth, nImageHeight );
             pProps[nPos].Name =
@@ -939,7 +938,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
         sal_Int32 nLevels = rNumRule->getCount();
         for( sal_uInt16 i=0; i < nCount; i++ )
         {
-            const SvxXMLListLevelStyleContext_Impl *pLevelStyle =
+            SvxXMLListLevelStyleContext_Impl *pLevelStyle =
                 (*pLevelStyles)[i];
             sal_Int32 nLevel = pLevelStyle->GetLevel();
             if( nLevel >= 0 && nLevel < nLevels )

xmloff/source/text/XMLTextFrameContext.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextFrameContext.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mib $ $Date: 2000-11-27 13:37:09 $
+ *  last change: $Author: mib $ $Date: 2000-12-02 10:26:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -580,7 +580,7 @@ XMLTextFrameContext::XMLTextFrameContext(
     if( XML_TEXT_FRAME_GRAPHIC == nType )
     {
         // URL
-        aAny <<=sHRef;
+        aAny <<= GetImport().ResolveGraphicObjectURL( sHRef, sal_False );
         xPropSet->setPropertyValue( sGraphicURL, aAny );
 
         // filter name