summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-12-21 12:54:25 +0000
committerjp <jp@openoffice.org>2000-12-21 12:54:25 +0000
commita3c93b48fc03ffa458b450045e408afccd0da146 (patch)
treeec2238c3b34ced1de246e185e432de575cbdd5d6 /sw/source
parent627c3b28884bf7f66e3d73b02cbea69f6fef124a (diff)
remove function GetTmpFileName
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/basflt/shellio.cxx17
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx11
2 files changed, 11 insertions, 17 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 3ab50fcbbd47..e1fa70fd0efc 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.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jp $ $Date: 2000-11-06 09:27:12 $
+ * last change: $Author: jp $ $Date: 2000-12-21 13:50:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,9 +73,6 @@
#ifndef _TIME_HXX
#include <tools/time.hxx>
#endif
-#ifndef _UNOTOOLS_TEMPFILE_HXX
-#include <unotools/tempfile.hxx>
-#endif
#ifndef SVTOOLS_URIHELPER_HXX
#include <svtools/urihelper.hxx>
#endif
@@ -1062,13 +1059,6 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
/* */
-String GetTmpFileName()
-{
- String sRet = utl::TempFile::CreateTempName(0);
- return sRet;
-}
-
-
// ----------------------------------------------------------------------
@@ -1096,6 +1086,9 @@ BOOL SetHTMLTemplate( SwDoc & rDoc )
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.4 2000/11/06 09:27:12 jp
+ must changes: tempfile
+
Revision 1.3 2000/10/25 12:04:22 jp
Spellchecker/Hyphenator are not longer member of the shells
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index d220875db97a..ce355cbf3c14 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dbmgr.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: fs $ $Date: 2000-12-18 10:12:48 $
+ * last change: $Author: jp $ $Date: 2000-12-21 13:54:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1023,10 +1023,11 @@ BOOL SwNewDBMgr::MergeMailing(SwWrtShell* pSh)
{
SfxMedium* pOrig = pSh->GetView().GetDocShell()->GetMedium();
- pSfxFlt = SwIoSystem::GetFileFilter( pOrig->GetPhysicalName(), ::aEmptyStr );
+ pSfxFlt = SwIoSystem::GetFileFilter( pOrig->GetPhysicalName(),
+ ::aEmptyStr );
- String sFileName = ::GetTmpFileName();
- String sTmpName = URIHelper::SmartRelToAbs(sFileName);
+ String sTmpName = URIHelper::SmartRelToAbs(
+ utl::TempFile::CreateTempName(0) );
BOOL bCopyCompleted = TRUE;
try