access the html.vor only at used time, not in startup

4 files changed, 41 insertions, 14 deletions

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 6ec9e5ec318a..0eab6aa06e46 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shellio.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-06 11:08:07 $
+ *  last change: $Author: jp $ $Date: 2001-04-05 15:00:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -268,6 +268,9 @@ protected:
     BOOL bReadUTF8: 1;      // Stream als UTF-8 interpretieren
     BOOL bBlockMode: 1;
     BOOL bOrganizerMode : 1;
+    BOOL bHasAskTemplateName : 1;
+
+    virtual String GetTemplateName() const;
 
 public:
     Reader();
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index d21f63bc5458..ecf5c5e5f834 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shellio.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-07 08:05:56 $
+ *  last change: $Author: jp $ $Date: 2001-04-05 15:01:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -547,7 +547,8 @@ SwReader::SwReader( SfxMedium& rMedium, const String& rFileName, SwPaM& rPam )
 Reader::Reader()
     : pStrm(0), pStg(0), pMedium(0), pTemplate(0),
     bTmplBrowseMode( FALSE ), bInsertMode( FALSE ),
-    bReadUTF8( FALSE ), bBlockMode( FALSE ), bOrganizerMode( FALSE )
+    bReadUTF8( FALSE ), bBlockMode( FALSE ), bOrganizerMode( FALSE ),
+    bHasAskTemplateName( FALSE )
 {
 }
 
@@ -556,9 +557,20 @@ Reader::~Reader()
     delete pTemplate;
 }
 
+String Reader::GetTemplateName() const
+{
+    return aEmptyStr;
+}
+
 // Die Filter-Vorlage laden, setzen und wieder freigeben
 SwDoc* Reader::GetTemplateDoc()
 {
+    if( !bHasAskTemplateName )
+    {
+        SetTemplateName( GetTemplateName() );
+        bHasAskTemplateName = TRUE;
+    }
+
     if( !aTemplateNm.Len() )
         ClearTemplate();
     else
@@ -1133,6 +1145,9 @@ BOOL SetHTMLTemplate( SwDoc & rDoc )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.9  2001/03/07 08:05:56  mib
+      #84201#: 6.0 template support
+
       Revision 1.8  2001/03/06 11:08:40  mib
       organizer support for XML file format
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index c4df8a175685..f152440857e4 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swhtml.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-07 08:06:13 $
+ *  last change: $Author: jp $ $Date: 2001-04-05 15:01:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -329,7 +329,10 @@ SV_IMPL_PTRARR( _HTMLAttrs, _HTMLAttrPtr )
 HTMLReader::HTMLReader()
 {
     bTmplBrowseMode = TRUE;
+}
 
+String HTMLReader::GetTemplateName() const
+{
     String sTemplate(
             String::CreateFromAscii(TOOLS_CONSTASCII_STRINGPARAM("internal")) );
     sTemplate += INET_PATH_TOKEN;
@@ -352,13 +355,15 @@ HTMLReader::HTMLReader()
         bSet = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
     }
 #endif
-    if( bSet )
-        SetTemplateName( sTemplate );
-#ifndef PRODUCT
-    else
+
+    if( !bSet )
+    {
+        sTemplate.Erase();
         ASSERT( !this,
             "Die html.vor befindet sich nicht mehr im definierten Directory!");
-#endif
+    }
+
+    return sTemplate;
 }
 
 int HTMLReader::SetStrmStgPtr()
@@ -5262,6 +5267,9 @@ void _HTMLAttr::InsertPrev( _HTMLAttr *pPrv )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.7  2001/03/07 08:06:13  mib
+      #84201#: 6.0 template support
+
       Revision 1.6  2000/12/08 15:14:18  mib
       #75662#: Don't add blanks to comments
 
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index d83692fd7518..66bf746d2782 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fltini.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mib $ $Date: 2000-12-02 11:04:42 $
+ *  last change: $Author: jp $ $Date: 2001-04-05 15:00:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,6 +130,7 @@ class HTMLReader: public Reader
     // wir wollen die Streams / Storages nicht geoeffnet haben
     virtual int SetStrmStgPtr();
     virtual ULONG Read(SwDoc &,SwPaM &,const String &);
+    virtual String GetTemplateName() const;
 public:
     HTMLReader();
 };