diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index fdb6a2c9480f..3ab50fcbbd47 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.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 * either of the following licenses @@ -73,8 +73,8 @@ #ifndef _TIME_HXX #include #endif -#ifndef _TOOLS_TEMPFILE_HXX -#include +#ifndef _UNOTOOLS_TEMPFILE_HXX +#include #endif #ifndef SVTOOLS_URIHELPER_HXX #include @@ -1064,7 +1064,7 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) String GetTmpFileName() { - String sRet = TempFile::CreateTempName(0); + String sRet = utl::TempFile::CreateTempName(0); return sRet; } @@ -1096,6 +1096,9 @@ BOOL SetHTMLTemplate( SwDoc & rDoc ) /************************************************************************* $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 use the new FileStatHelper class diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index b59591295a76..10270d227e05 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -70,9 +70,6 @@ #endif -#ifndef _TOOLS_TEMPFILE_HXX -#include -#endif #ifndef __RSC //autogen #include #endif @@ -3483,6 +3480,7 @@ xub_StrLen SwxPosition::GetCntIdx() const #include #include #include +#include static SvFileStream* pOut = 0; static void OutAttr( const SfxItemSet& rSet ) @@ -3740,9 +3738,9 @@ static void OutText( const SwPaM& rPam, const char* pText ) static void DumpStart() { - TempFile aTempFile; + utl::TempFile aTempFile; - pOut = new SvFileStream( aTempFile.GetName(), + pOut = new SvFileStream( aTempFile.GetFileName(), STREAM_WRITE | STREAM_TRUNC ); *pOut << "Dump des RTF30-Parsers" << endl; } @@ -3761,11 +3759,14 @@ static void DumpEnde() 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 $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 OpenOffice header added. diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index c12eae379cad..71c130d3efa5 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -74,8 +74,8 @@ #ifndef _URLOBJ_HXX //autogen #include #endif -#ifndef _TOOLS_TEMPFILE_HXX -#include +#ifndef _UNOTOOLS_TEMPFILE_HXX +#include #endif #ifndef _SV_CLIP_HXX //autogen #include @@ -912,9 +912,9 @@ void SwDocShell::Execute(SfxRequest& rReq) bSetModified = IsModified() || pSrcView->IsModified(); if(pSrcView->IsModified()||pSrcView->HasSourceSaved()) { - TempFile aTempFile; + utl::TempFile aTempFile; aTempFile.EnableKillingFile(); - pSrcView->SaveContent(aTempFile.GetName()); + pSrcView->SaveContent(aTempFile.GetFileName()); bDone = TRUE; SetActualSize(pSrcView->GetEditWin().GetSizePixel()); 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_ACTIVATEDOC, aMac, this); pEvent->ConfigureEvent(SFX_EVENT_DEACTIVATEDOC, aMac, this); - ReloadFromHtml(aTempFile.GetName(), pSrcView); + ReloadFromHtml(aTempFile.GetFileName(), pSrcView); nSlot = 0; } else @@ -1692,6 +1692,9 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL, /*------------------------------------------------------------------------ $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 change usage of filestream to medium diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 3334ef551f37..2a4e1e0b70cb 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.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 * either of the following licenses @@ -93,8 +93,8 @@ #ifndef _LSTBOX_HXX //autogen #include #endif -#ifndef _TOOLS_TEMPFILE_HXX -#include +#ifndef _UNOTOOLS_TEMPFILE_HXX +#include #endif #ifndef SVTOOLS_URIHELPER_HXX #include @@ -1120,7 +1120,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh) String sLeading(aEntry.GetBase()); aEntry.removeSegment(); sPath = aEntry.GetMainURL(); - TempFile aTemp(sLeading,&sExt,&sPath ); + utl::TempFile aTemp(sLeading,&sExt,&sPath ); if( !aTemp.IsValid() ) { @@ -1130,7 +1130,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh) } else { - INetURLObject aTempFile(aTemp.GetName()); + INetURLObject aTempFile(aTemp.GetFileName()); aPrtMonDlg.aPrinter.SetText( aTempFile.GetBase() ); String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief sStat += ' '; diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 29c7e1a8c366..eae52ac97bfc 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -70,8 +70,8 @@ #ifndef _URLOBJ_HXX #include #endif -#ifndef _TOOLS_TEMPFILE_HXX -#include +#ifndef _UNOTOOLS_TEMPFILE_HXX +#include #endif #ifndef _STREAM_HXX #include @@ -185,7 +185,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, String sPath(*(*pPathArr)[i]); aPathLB.InsertEntry(sPath); ULONG nCaseReadonly = 0; - TempFile aTempFile(&sPath); + utl::TempFile aTempFile(&sPath); aTempFile.EnableKillingFile(); if(!aTempFile.IsValid()) nCaseReadonly |= PATH_READONLY; @@ -194,7 +194,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, Reference< lang::XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory(); try { - INetURLObject aTempObj(aTempFile.GetName()); + INetURLObject aTempObj(aTempFile.GetFileName()); aTempObj.SetBase(aTempObj.GetBase().ToLowerAscii()); Reference xRef1 = new ::ucb::ContentIdentifier( xMSF, aTempObj.GetMainURL() ); @@ -679,6 +679,9 @@ void SwGlossaryGroupTLB::Clear() Source Code Control System - Update $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 initial import diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 4ddead4cc1a2..eb25cb66d515 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -73,8 +73,8 @@ #endif -#ifndef _TOOLS_TEMPFILE_HXX -#include +#ifndef _UNOTOOLS_TEMPFILE_HXX +#include #endif #ifndef _URLOBJ_HXX //autogen #include @@ -1076,9 +1076,9 @@ void SwSrcView::Load(SwDocShell* pDocShell) } else { - TempFile aTempFile; + utl::TempFile aTempFile; aTempFile.EnableKillingFile(); - String sFileURL( aTempFile.GetName() ), + String sFileURL( aTempFile.GetFileName() ), sBaseURL( INetURLObject::GetBaseURL() ); BOOL bIsRemote = pMedium->IsRemote(); SvtSaveOptions aOpt;