From 683312377a294e9dbe0a96b7b1b489e3d5b4f1f7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 24 May 2012 11:38:12 +0200 Subject: Removed unused SfxMedium::bDirect See the TODO comment in sfx2/inc/sfx2/docfile.hxx about a temporary SfxMedium ctor overload to find not yet adapted uses of another overload, to be removed again in due time. Change-Id: Ie22c33c32f8870ce6ebf6d500abc7a4e33d97183 --- sd/source/core/drawdoc3.cxx | 2 +- sd/source/filter/html/pubdlg.cxx | 4 ++-- sd/source/ui/dlg/navigatr.cxx | 5 ++--- sd/source/ui/dlg/tpaction.cxx | 3 +-- sd/source/ui/func/fuinsfil.cxx | 2 +- sd/source/ui/unoidl/sddetect.cxx | 2 +- sd/source/ui/view/sdview4.cxx | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) (limited to 'sd/source') diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 870a9f15b009..a1d0f7b7f6f7 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -275,7 +275,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile) if (maBookmarkFile != rBookmarkFile && rBookmarkFile.Len()) { - SfxMedium* pMedium = new SfxMedium( rBookmarkFile, STREAM_READ, sal_False ); + SfxMedium* pMedium = new SfxMedium( rBookmarkFile, STREAM_READ ); pBookmarkDoc = OpenBookmarkDoc(*pMedium); } else if (mxBookmarkDocShRef.Is()) diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index a4c3f020dc7c..b799fed753da 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1620,7 +1620,7 @@ sal_Bool SdPublishingDlg::Load() return sal_False; } - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, sal_True ); + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE ); SvStream* pStream = aMedium.GetInStream(); @@ -1658,7 +1658,7 @@ sal_Bool SdPublishingDlg::Save() { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); aURL.Append( OUString( "designs.sod" ) ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, sal_False ); + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC ); aMedium.IsRemote(); SvStream* pStream = aMedium.GetOutStream(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index a6db87b8b26d..3e60b82b1e3e 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -610,7 +610,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) if (aFileName != maDropFileName) { - SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE), sal_False); + SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE)); SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") ); aMed.UseInteractionHandler( sal_True ); nErr = aMatch.GuessFilter(aMed, &pFilter); @@ -621,8 +621,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) // Das Medium muss ggf. mit READ/WRITE geoeffnet werden, daher wird // ersteinmal nachgeschaut, ob es einen Storage enthaelt SfxMedium* pMedium = new SfxMedium( aFileName, - STREAM_READ | STREAM_NOCREATE, - sal_True); // Download + STREAM_READ | STREAM_NOCREATE); if (pMedium->IsStorage()) { diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 2571bee8ea2b..d9372e4b9632 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -704,8 +704,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) { // Ueberpruefen, ob es eine gueltige Draw-Datei ist SfxMedium aMedium( aFile, - STREAM_READ | STREAM_NOCREATE, - sal_True ); // Download + STREAM_READ | STREAM_NOCREATE ); if( aMedium.IsStorage() ) { diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 260d6cbfc2fd..7f51e8e38cac 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -264,7 +264,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) mpDocSh->SetWaitCursor( sal_True ); - SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, sal_False ); + SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE ); const SfxFilter* pFilter = NULL; SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 888285da5b56..ba0fd114ec21 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -199,7 +199,7 @@ SdFilterDetect::~SdFilterDetect() else { // ctor of SfxMedium uses owner transition of ItemSet - SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, sal_False, NULL, pSet ); + SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet ); aMedium.UseInteractionHandler( sal_True ); if ( aPreselectedFilterName.Len() ) pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 395ddd392fcc..43e0d5018aa7 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) if( !bOK ) { const SfxFilter* pFoundFilter = NULL; - SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE, sal_False ); + SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE ); ErrCode nErr = SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); if( pFoundFilter && !nErr ) -- cgit