diff options
| author | jp <jp@openoffice.org> | 2001-08-31 12:54:13 +0000 |
|---|---|---|
| committer | jp <jp@openoffice.org> | 2001-08-31 12:54:13 +0000 |
| commit | 1cf26637945fca3b1a5b610cbbfe97ec006f5432 (patch) | |
| tree | ca28fc4fcf431a8e22d456a519ec199de712bfe3 /sw/source/filter/basflt/shellio.cxx | |
| parent | 2c86c9a06ac3042e22b97866c084b0878f09c3b0 (diff) | |
Bug #89528#: use correct parameter for GetMainURL
Diffstat (limited to 'sw/source/filter/basflt/shellio.cxx')
| -rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index ecf5c5e5f834..602c11a2c49b 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.10 $ + * $Revision: 1.11 $ * - * last change: $Author: jp $ $Date: 2001-04-05 15:01:03 $ + * last change: $Author: jp $ $Date: 2001-08-31 13:49:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -585,8 +585,9 @@ SwDoc* Reader::GetTemplateDoc() { Date aTstDate; Time aTstTime; - if( FStatHelper::GetModifiedDateTimeOfFile( aTDir.GetMainURL(), - &aTstDate, &aTstTime ) && + if( FStatHelper::GetModifiedDateTimeOfFile( + aTDir.GetMainURL( INetURLObject::NO_DECODE ), + &aTstDate, &aTstTime ) && ( !pTemplate || aDStamp != aTstDate || aTStamp != aTstTime )) { bLoad = TRUE; @@ -659,7 +660,8 @@ SwDoc* Reader::GetTemplateDoc() } } - ASSERT( !pTemplate || FStatHelper::IsDocument( aTDir.GetMainURL() ) || + ASSERT( !pTemplate || FStatHelper::IsDocument( + aTDir.GetMainURL( INetURLObject::NO_DECODE ) ) || aTemplateNm.EqualsAscii( "$$Dummy$$" ), "TemplatePtr but no template exist!" ); } @@ -1145,6 +1147,9 @@ BOOL SetHTMLTemplate( SwDoc & rDoc ) /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.10 2001/04/05 15:01:03 jp + access the html.vor only at used time, not in startup + Revision 1.9 2001/03/07 08:05:56 mib #84201#: 6.0 template support |