mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

must changes: tempfile

Browse Source
This commit is contained in:
jp
2000-11-06 08:30:33 +00:00
parent 01ac0546d3
commit 8b71a8bae4
6 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sw/source/filter/basflt/shellio.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: shellio.cxx,v $ * $RCSfile: shellio.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: jp $ $Date: 2000-10-25 12:04:22 $ * last change: $Author: jp $ $Date: 2000-11-06 09:27:12 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -73,8 +73,8 @@
#ifndef _TIME_HXX #ifndef _TIME_HXX
#include <tools/time.hxx> #include <tools/time.hxx>
#endif #endif
#ifndef _TOOLS_TEMPFILE_HXX #ifndef _UNOTOOLS_TEMPFILE_HXX
#include <tools/tempfile.hxx> #include <unotools/tempfile.hxx>
#endif #endif
#ifndef SVTOOLS_URIHELPER_HXX #ifndef SVTOOLS_URIHELPER_HXX
#include <svtools/urihelper.hxx> #include <svtools/urihelper.hxx>
@@ -1064,7 +1064,7 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
String GetTmpFileName() String GetTmpFileName()
{ {
String sRet = TempFile::CreateTempName(0); String sRet = utl::TempFile::CreateTempName(0);
return sRet; return sRet;
} }
@@ -1096,6 +1096,9 @@ BOOL SetHTMLTemplate( SwDoc & rDoc )
/************************************************************************* /*************************************************************************
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2000/10/25 12:04:22 jp
Spellchecker/Hyphenator are not longer member of the shells
Revision 1.2 2000/09/27 09:46:57 jp Revision 1.2 2000/09/27 09:46:57 jp
use the new FileStatHelper class use the new FileStatHelper class

17
sw/source/filter/rtf/swparrtf.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: swparrtf.cxx,v $ * $RCSfile: swparrtf.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: hr $ $Date: 2000-09-18 17:14:56 $ * last change: $Author: jp $ $Date: 2000-11-06 09:30:33 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -70,9 +70,6 @@
#endif #endif
#ifndef _TOOLS_TEMPFILE_HXX
#include <tools/tempfile.hxx>
#endif
#ifndef __RSC //autogen #ifndef __RSC //autogen
#include <tools/errinf.hxx> #include <tools/errinf.hxx>
#endif #endif
@@ -3483,6 +3480,7 @@ xub_StrLen SwxPosition::GetCntIdx() const
#include <svx/wghtitem.hxx> #include <svx/wghtitem.hxx>
#include <svx/wrlmitem.hxx> #include <svx/wrlmitem.hxx>
#include <svx/adjitem.hxx> #include <svx/adjitem.hxx>
#include <unotools/tempfile.hxx>
static SvFileStream* pOut = 0; static SvFileStream* pOut = 0;
static void OutAttr( const SfxItemSet& rSet ) static void OutAttr( const SfxItemSet& rSet )
@@ -3740,9 +3738,9 @@ static void OutText( const SwPaM& rPam, const char* pText )
static void DumpStart() static void DumpStart()
{ {
TempFile aTempFile; utl::TempFile aTempFile;
pOut = new SvFileStream( aTempFile.GetName(), pOut = new SvFileStream( aTempFile.GetFileName(),
STREAM_WRITE | STREAM_TRUNC ); STREAM_WRITE | STREAM_TRUNC );
*pOut << "Dump des RTF30-Parsers" << endl; *pOut << "Dump des RTF30-Parsers" << endl;
} }
@@ -3761,11 +3759,14 @@ static void DumpEnde()
Source Code Control System - Header Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/swparrtf.cxx,v 1.1.1.1 2000-09-18 17:14:56 hr Exp $ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/swparrtf.cxx,v 1.2 2000-11-06 09:30:33 jp Exp $
Source Code Control System - Update Source Code Control System - Update
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.1.1.1 2000/09/18 17:14:56 hr
initial import
Revision 1.159 2000/09/18 16:04:51 willem.vandorp Revision 1.159 2000/09/18 16:04:51 willem.vandorp
OpenOffice header added. OpenOffice header added.

17
sw/source/ui/app/docsh2.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: docsh2.cxx,v $ * $RCSfile: docsh2.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: jp $ $Date: 2000-11-01 10:13:28 $ * last change: $Author: jp $ $Date: 2000-11-06 09:21:17 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -74,8 +74,8 @@
#ifndef _URLOBJ_HXX //autogen #ifndef _URLOBJ_HXX //autogen
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#endif #endif
#ifndef _TOOLS_TEMPFILE_HXX #ifndef _UNOTOOLS_TEMPFILE_HXX
#include <tools/tempfile.hxx> #include <unotools/tempfile.hxx>
#endif #endif
#ifndef _SV_CLIP_HXX //autogen #ifndef _SV_CLIP_HXX //autogen
#include <vcl/clip.hxx> #include <vcl/clip.hxx>
@@ -912,9 +912,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
bSetModified = IsModified() || pSrcView->IsModified(); bSetModified = IsModified() || pSrcView->IsModified();
if(pSrcView->IsModified()||pSrcView->HasSourceSaved()) if(pSrcView->IsModified()||pSrcView->HasSourceSaved())
{ {
TempFile aTempFile; utl::TempFile aTempFile;
aTempFile.EnableKillingFile(); aTempFile.EnableKillingFile();
pSrcView->SaveContent(aTempFile.GetName()); pSrcView->SaveContent(aTempFile.GetFileName());
bDone = TRUE; bDone = TRUE;
SetActualSize(pSrcView->GetEditWin().GetSizePixel()); SetActualSize(pSrcView->GetEditWin().GetSizePixel());
SfxEventConfiguration* pEvent = SFX_APP()->GetEventConfig(); SfxEventConfiguration* pEvent = SFX_APP()->GetEventConfig();
@@ -923,7 +923,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
pEvent->ConfigureEvent(SFX_EVENT_CLOSEDOC, aMac, this); pEvent->ConfigureEvent(SFX_EVENT_CLOSEDOC, aMac, this);
pEvent->ConfigureEvent(SFX_EVENT_ACTIVATEDOC, aMac, this); pEvent->ConfigureEvent(SFX_EVENT_ACTIVATEDOC, aMac, this);
pEvent->ConfigureEvent(SFX_EVENT_DEACTIVATEDOC, aMac, this); pEvent->ConfigureEvent(SFX_EVENT_DEACTIVATEDOC, aMac, this);
ReloadFromHtml(aTempFile.GetName(), pSrcView); ReloadFromHtml(aTempFile.GetFileName(), pSrcView);
nSlot = 0; nSlot = 0;
} }
else else
@@ -1692,6 +1692,9 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL,
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.8 2000/11/01 10:13:28 jp
new method LoadStyleFromFile for docshell and uno
Revision 1.7 2000/10/31 20:32:32 jp Revision 1.7 2000/10/31 20:32:32 jp
change usage of filestream to medium change usage of filestream to medium

12
sw/source/ui/dbui/dbmgr.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: dbmgr.cxx,v $ * $RCSfile: dbmgr.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: hr $ $Date: 2000-10-31 15:51:02 $ * last change: $Author: jp $ $Date: 2000-11-06 09:23:24 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -93,8 +93,8 @@
#ifndef _LSTBOX_HXX //autogen #ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>
#endif #endif
#ifndef _TOOLS_TEMPFILE_HXX #ifndef _UNOTOOLS_TEMPFILE_HXX
#include <tools/tempfile.hxx> #include <unotools/tempfile.hxx>
#endif #endif
#ifndef SVTOOLS_URIHELPER_HXX #ifndef SVTOOLS_URIHELPER_HXX
#include <svtools/urihelper.hxx> #include <svtools/urihelper.hxx>
@@ -1120,7 +1120,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh)
String sLeading(aEntry.GetBase()); String sLeading(aEntry.GetBase());
aEntry.removeSegment(); aEntry.removeSegment();
sPath = aEntry.GetMainURL(); sPath = aEntry.GetMainURL();
TempFile aTemp(sLeading,&sExt,&sPath ); utl::TempFile aTemp(sLeading,&sExt,&sPath );
if( !aTemp.IsValid() ) if( !aTemp.IsValid() )
{ {
@@ -1130,7 +1130,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh)
} }
else else
{ {
INetURLObject aTempFile(aTemp.GetName()); INetURLObject aTempFile(aTemp.GetFileName());
aPrtMonDlg.aPrinter.SetText( aTempFile.GetBase() ); aPrtMonDlg.aPrinter.SetText( aTempFile.GetBase() );
String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief
sStat += ' '; sStat += ' ';

15
sw/source/ui/misc/glosbib.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: glosbib.cxx,v $ * $RCSfile: glosbib.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: os $ $Date: 2000-10-20 14:18:05 $ * last change: $Author: jp $ $Date: 2000-11-06 09:19:24 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -70,8 +70,8 @@
#ifndef _URLOBJ_HXX #ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#endif #endif
#ifndef _TOOLS_TEMPFILE_HXX #ifndef _UNOTOOLS_TEMPFILE_HXX
#include <tools/tempfile.hxx> #include <unotools/tempfile.hxx>
#endif #endif
#ifndef _STREAM_HXX #ifndef _STREAM_HXX
#include <tools/stream.hxx> #include <tools/stream.hxx>
@@ -185,7 +185,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
String sPath(*(*pPathArr)[i]); String sPath(*(*pPathArr)[i]);
aPathLB.InsertEntry(sPath); aPathLB.InsertEntry(sPath);
ULONG nCaseReadonly = 0; ULONG nCaseReadonly = 0;
TempFile aTempFile(&sPath); utl::TempFile aTempFile(&sPath);
aTempFile.EnableKillingFile(); aTempFile.EnableKillingFile();
if(!aTempFile.IsValid()) if(!aTempFile.IsValid())
nCaseReadonly |= PATH_READONLY; nCaseReadonly |= PATH_READONLY;
@@ -194,7 +194,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
Reference< lang::XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory(); Reference< lang::XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory();
try try
{ {
INetURLObject aTempObj(aTempFile.GetName()); INetURLObject aTempObj(aTempFile.GetFileName());
aTempObj.SetBase(aTempObj.GetBase().ToLowerAscii()); aTempObj.SetBase(aTempObj.GetBase().ToLowerAscii());
Reference<XContentIdentifier> xRef1 = new Reference<XContentIdentifier> xRef1 = new
::ucb::ContentIdentifier( xMSF, aTempObj.GetMainURL() ); ::ucb::ContentIdentifier( xMSF, aTempObj.GetMainURL() );
@@ -679,6 +679,9 @@ void SwGlossaryGroupTLB::Clear()
Source Code Control System - Update Source Code Control System - Update
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2000/10/20 14:18:05 os
use comphelper methods
Revision 1.1.1.1 2000/09/18 17:14:44 hr Revision 1.1.1.1 2000/09/18 17:14:44 hr
initial import initial import

12
sw/source/ui/uiview/srcview.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: srcview.cxx,v $ * $RCSfile: srcview.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: jp $ $Date: 2000-11-01 19:32:39 $ * last change: $Author: jp $ $Date: 2000-11-06 09:24:39 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -73,8 +73,8 @@
#endif #endif
#ifndef _TOOLS_TEMPFILE_HXX #ifndef _UNOTOOLS_TEMPFILE_HXX
#include <tools/tempfile.hxx> #include <unotools/tempfile.hxx>
#endif #endif
#ifndef _URLOBJ_HXX //autogen #ifndef _URLOBJ_HXX //autogen
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
@@ -1076,9 +1076,9 @@ void SwSrcView::Load(SwDocShell* pDocShell)
} }
else else
{ {
TempFile aTempFile; utl::TempFile aTempFile;
aTempFile.EnableKillingFile(); aTempFile.EnableKillingFile();
String sFileURL( aTempFile.GetName() ), String sFileURL( aTempFile.GetFileName() ),
sBaseURL( INetURLObject::GetBaseURL() ); sBaseURL( INetURLObject::GetBaseURL() );
BOOL bIsRemote = pMedium->IsRemote(); BOOL bIsRemote = pMedium->IsRemote();
SvtSaveOptions aOpt; SvtSaveOptions aOpt;