diff options
| -rw-r--r-- | sw/source/core/doc/docglbl.cxx | 9 | ||||
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 11 | ||||
| -rw-r--r-- | sw/source/ui/uiview/srcview.cxx | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index fd77fae252b3..604c9c8d5eb2 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docglbl.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-11-06 09:44:13 $ + * last change: $Author: jp $ $Date: 2001-01-15 18:47:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -364,11 +364,8 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, // und noch alle Bookmarks // ????? - INetURLObject aEntry2(rPath); - aEntry2.removeSegment(); - String sPath = aEntry2.GetMainURL(); utl::TempFile aTempFile2(sLeading,&sExt,&sPath ); - sFileName = aTempFile2.GetFileName(); + sFileName = aTempFile2.GetURL(); SfxMedium* pTmpMed = new SfxMedium( sFileName, STREAM_STD_READWRITE, TRUE ); pTmpMed->SetFilter( pFilter ); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 71c130d3efa5..4f68cfbad71f 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.9 $ + * $Revision: 1.10 $ * - * last change: $Author: jp $ $Date: 2000-11-06 09:21:17 $ + * last change: $Author: jp $ $Date: 2001-01-15 18:47:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -914,7 +914,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { utl::TempFile aTempFile; aTempFile.EnableKillingFile(); - pSrcView->SaveContent(aTempFile.GetFileName()); + pSrcView->SaveContent(aTempFile.GetURL()); 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.GetFileName(), pSrcView); + ReloadFromHtml(aTempFile.GetURL(), pSrcView); nSlot = 0; } else @@ -1692,6 +1692,9 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL, /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.9 2000/11/06 09:21:17 jp + must changes: tempfile + Revision 1.8 2000/11/01 10:13:28 jp new method LoadStyleFromFile for docshell and uno diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 3d71f07d8f5f..5866865d4ad3 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.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jp $ $Date: 2000-11-20 09:26:31 $ + * last change: $Author: jp $ $Date: 2001-01-15 18:46:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1081,7 +1081,7 @@ void SwSrcView::Load(SwDocShell* pDocShell) { utl::TempFile aTempFile; aTempFile.EnableKillingFile(); - String sFileURL( aTempFile.GetFileName() ), + String sFileURL( aTempFile.GetURL() ), sBaseURL( INetURLObject::GetBaseURL() ); BOOL bIsRemote = pMedium->IsRemote(); SvtSaveOptions aOpt; |