diff options
author | Oliver Specht <os@openoffice.org> | 2000-10-17 14:17:16 +0000 |
---|---|---|
committer | Oliver Specht <os@openoffice.org> | 2000-10-17 14:17:16 +0000 |
commit | 2720b9bf92db252a90851bec05d17287ec4805dc (patch) | |
tree | d1b8b81cf761a930678d3e50fa02809ed8c8a736 | |
parent | bbe01a3fccfd4a9782e8ea0b78965346840630d3 (diff) |
Change: SfxMedium Ctor
-rw-r--r-- | sw/source/filter/writer/writer.cxx | 13 | ||||
-rw-r--r-- | sw/source/ui/dochdl/gloshdl.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/docvw/romenu.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 8 |
4 files changed, 25 insertions, 16 deletions
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 677df928acee..faf0b4089283 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: writer.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:57 $ + * last change: $Author: os $ $Date: 2000-10-17 15:13:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -462,7 +462,7 @@ BOOL Writer::CopyLocalFileToINet( String& rFileNm, BOOL bCIdTarget ) ASSERT( !bCIdTarget, "CopyLocalFile: file->net: CId-Flag gesetzt" ); SfxMedium aMedium( *pDest, STREAM_WRITE | STREAM_SHARE_DENYNONE, - FALSE, FALSE ); + FALSE ); SvFileStream aCpy( aMedium.GetPhysicalName(), STREAM_WRITE ); aCpy << aTmp; @@ -484,7 +484,7 @@ BOOL Writer::CopyLocalFileToINet( String& rFileNm, BOOL bCIdTarget ) "CopyLocalFile: cid->file: CId-Flag nicht gesetzt" ); SfxMedium aMedium( *pSrc, STREAM_READ | STREAM_SHARE_DENYNONE, - FALSE, TRUE ); + FALSE ); if( aMedium.GetInStream() ) { // Eine CID-URL wird in eine Datei kopiert, wenn eine @@ -701,11 +701,14 @@ ULONG StgWriter::Write( SwPaM& rPaM, SvStorage& rStg, const String* pFName ) Source Code Control System - Header - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/writer/writer.cxx,v 1.1.1.1 2000-09-18 17:14:57 hr Exp $ + $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/writer/writer.cxx,v 1.2 2000-10-17 15:13:50 os Exp $ Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:57 hr + initial import + Revision 1.103 2000/09/18 16:04:55 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index aee3290dc6a0..9927653a823d 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gloshdl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:34 $ + * last change: $Author: os $ $Date: 2000-10-17 15:15:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -974,7 +974,7 @@ BOOL SwGlossaryHdl::ImportGlossaries( const String& rName ) if( rName.Len() ) { const SfxFilter* pFilter = 0; - SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, TRUE, TRUE, 0, 0 ); + SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, TRUE, 0, 0 ); SfxFilterMatcher aMatcher( SwDocShell::Factory().GetFilterContainer() ); if( !aMatcher.GuessFilter( *pMed, &pFilter, FALSE ) ) { @@ -1012,6 +1012,9 @@ String SwGlossaryHdl::GetValidShortCut( const String& rLong, /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:34 hr + initial import + Revision 1.150 2000/09/18 16:05:22 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx index 4e5f4a7e7915..281bfa7cf781 100644 --- a/sw/source/ui/docvw/romenu.cxx +++ b/sw/source/ui/docvw/romenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: romenu.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2000-10-06 13:33:32 $ + * last change: $Author: os $ $Date: 2000-10-17 15:16:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -598,11 +598,11 @@ String SwReadOnlyPopup::SaveGraphic( USHORT nId ) { //Versuchen die Originalgrafik zu speichern. SfxMedium aIn( sGrfName, STREAM_READ | STREAM_NOCREATE, - TRUE, TRUE ); + TRUE ); if( aIn.GetInStream() && !aIn.GetInStream()->GetError() ) { SfxMedium aOut( sPath, STREAM_WRITE | STREAM_SHARE_DENYNONE, - FALSE, FALSE ); + FALSE); if( aOut.GetOutStream() && !aOut.GetOutStream()->GetError()) { *aOut.GetOutStream() << *aIn.GetInStream(); @@ -635,6 +635,9 @@ String SwReadOnlyPopup::SaveGraphic( USHORT nId ) /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.2 2000/10/06 13:33:32 jp + should changes: don't use IniManager + Revision 1.1.1.1 2000/09/18 17:14:35 hr initial import diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 8fe5fe70261a..31a7931253f0 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2000-10-12 06:32:55 $ + * last change: $Author: os $ $Date: 2000-10-17 15:17:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1245,7 +1245,7 @@ long SwView::InsertDoc( USHORT nSlotId, const String& rFileName, } if ( !pFilter ) { - pMed = new SfxMedium(rFileName, STREAM_READ, TRUE, TRUE, 0, 0 ); + pMed = new SfxMedium(rFileName, STREAM_READ, TRUE, 0, 0 ); SfxFilterMatcher aMatcher( rFact.GetFilterContainer() ); ErrCode nErr = aMatcher.GuessFilter( *pMed, &pFilter, FALSE ); if ( nErr ) @@ -1254,7 +1254,7 @@ long SwView::InsertDoc( USHORT nSlotId, const String& rFileName, pMed->SetFilter( pFilter ); } else - pMed = new SfxMedium(rFileName, STREAM_READ, TRUE, TRUE, pFilter, 0); + pMed = new SfxMedium(rFileName, STREAM_READ, TRUE, pFilter, 0); } else { |