load graphics on demand

4 files changed, 30 insertions, 15 deletions

diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index ff8a3819ae5c..6749d7524a7c 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltexte.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mtg $ $Date: 2001-02-26 13:27:54 $
+ *  last change: $Author: mib $ $Date: 2001-03-02 14:03:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -287,6 +287,22 @@ void SwXMLTextParagraphExport::getTextEmbeddedObjectProperties(
     }
 }
 
+void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
+    const Reference < XPropertySet >& rPropSet,
+    OUString& rURL) const
+{
+    if( !rURL.getLength() )
+        return;
+
+    SwGrfNode *pGrfNd = GetNoTxtNode( rPropSet )->GetGrfNode();
+    if( !pGrfNd->IsGrfLink() )
+    {
+        String aNewURL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.Package:") );
+        aNewURL += String(rURL.copy( 1 ) );
+        pGrfNd->SetNewStreamName( aNewURL );
+    }
+}
+
 void SwXMLTextParagraphExport::_exportTextEmbedded(
         const Reference < XPropertySet > & rPropSet,
         const Reference < XPropertySetInfo > & rPropSetInfo )
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 3f1b3e735b0d..53d390374d88 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltexte.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: mtg $ $Date: 2001-02-23 14:33:30 $
+ *  last change: $Author: mib $ $Date: 2001-03-02 14:03:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,6 +110,10 @@ public:
                 ::com::sun::star::beans::XPropertySet >& rPropSet,
         ::rtl::OUString& rStreamName,
         ::rtl::OUString& rClassId ) const;
+    virtual void setTextEmbeddedGraphicURL(
+        const ::com::sun::star::uno::Reference <
+                ::com::sun::star::beans::XPropertySet >& rPropSet,
+        ::rtl::OUString& rStreamName ) const;
 };
 
 
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index e61827b4a03a..67486300aeaf 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltexti.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mtg $ $Date: 2001-02-23 14:33:52 $
+ *  last change: $Author: mib $ $Date: 2001-03-02 14:03:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,9 +127,8 @@ SwXMLTextImportHelper::SwXMLTextImportHelper(
         const Reference < XModel>& rModel,
         sal_Bool bInsertM, sal_Bool bStylesOnlyM, sal_Bool bProgress,
         sal_Bool bBlockM) :
-    XMLTextImportHelper( rModel, bInsertM, bStylesOnlyM, bProgress ),
-    pRedlineHelper(NULL),
-    bBlockMode(bBlockM)
+    XMLTextImportHelper( rModel, bInsertM, bStylesOnlyM, bProgress, bBlockM ),
+    pRedlineHelper(NULL)
 {
 }
 
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 886c6538435e..550f18dcfee9 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltexti.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: mtg $ $Date: 2001-02-23 14:33:45 $
+ *  last change: $Author: mib $ $Date: 2001-03-02 14:03:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,6 @@ class SvPlugInObjectRef;
 
 class SwXMLTextImportHelper : public XMLTextImportHelper
 {
-    sal_Bool bBlockMode;
     SwApplet_Impl *pAppletImpl;
     SvPlugInObjectRef xPlugin;
     SvCommandList aCmdList;
@@ -140,9 +139,6 @@ public:
 
     virtual sal_Bool IsInHeaderFooter() const;
 
-    virtual sal_Bool IsBlockMode() { return bBlockMode; }
-
-
     // redlining helper methods
     // (here is the real implementation)
     virtual void RedlineAdd(