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

63 files changed, 105 insertions, 109 deletions

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 500f377f7fa3..a397e494c2b3 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -447,7 +447,7 @@ sal_Bool ModulWindow::LoadBasic()
     {
         Sequence< ::rtl::OUString > aPaths = xFP->getFiles();
         aCurPath = aPaths[0];
-        SfxMedium aMedium( aCurPath, STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE, sal_True );
+        SfxMedium aMedium( aCurPath, STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE );
         SvStream* pStream = aMedium.GetInStream();
         if ( pStream )
         {
@@ -507,7 +507,7 @@ sal_Bool ModulWindow::SaveBasicSource()
     {
         Sequence< ::rtl::OUString > aPaths = xFP->getFiles();
         aCurPath = aPaths[0];
-        SfxMedium aMedium( aCurPath, STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, sal_True, sal_False );
+        SfxMedium aMedium( aCurPath, STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC );
         SvStream* pStream = aMedium.GetOutStream();
         if ( pStream )
         {
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index fa8c8a59bbb6..7536a90c607e 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -94,7 +94,7 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
 {
     String aFilter;
     SfxMedium* pMedium = new SfxMedium( aUrl,
-                                        STREAM_STD_READ, sal_False );
+                                        STREAM_STD_READ );
 
     const SfxFilter *pSfxFilter = NULL;
     if( nFlags == SFX_FILTER_EXPORT )
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index d57c80a9ea1b..8896be84a802 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -738,7 +738,7 @@ namespace frm
             if (m_pMedium)
                 delete m_pMedium;
 
-            m_pMedium = new SfxMedium(rURL, STREAM_STD_READ, sal_False);
+            m_pMedium = new SfxMedium(rURL, STREAM_STD_READ);
             m_pMedium->SetDataAvailableLink(
                     STATIC_LINK(this, OClickableImageBaseModel, DataAvailableLink));
 
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index ff59c792442d..92867fcad684 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -454,7 +454,7 @@ sal_Bool IsWordProStr(const sal_Int8 *pBuf)
 sal_Bool IsWordproFile(rtl::OUString file)
 {
     sal_Bool bRet = sal_False;
-    SfxMedium aMedium( file, STREAM_STD_READ, sal_False);
+    SfxMedium aMedium( file, STREAM_STD_READ);
     SvStream* pStm = aMedium.GetInStream();
 
     if(pStm)
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index de17ced857b0..68c03172478c 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -149,7 +149,7 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUStr
     aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
 
     ScDocShellRef xDocShRef = new ScDocShell;
-    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
+    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
     pSrcMed->SetFilter(aFilter);
     if (!xDocShRef->DoLoad(pSrcMed))
     {
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index da349f7fcbd1..e6ec96b5efd1 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -178,7 +178,7 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUStr
     aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
 
     ScDocShellRef xDocShRef = new ScDocShell;
-    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
+    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
     pSrcMed->SetFilter(aFilter);
     if (!xDocShRef->DoLoad(pSrcMed))
     {
@@ -720,7 +720,7 @@ void ScFiltersTest::testPassword_Impl(const rtl::OUString& aFileNameBase)
     aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
 
     ScDocShellRef xDocSh = new ScDocShell;
-    SfxMedium* pMedium = new SfxMedium(aFileName, STREAM_STD_READWRITE, true);
+    SfxMedium* pMedium = new SfxMedium(aFileName, STREAM_STD_READWRITE);
     SfxItemSet* pSet = pMedium->GetItemSet();
     pSet->Put(SfxStringItem(SID_PASSWORD, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test"))));
     pMedium->SetFilter(aFilter);
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index f8fa79bfbc06..ff2cef68a587 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1033,7 +1033,7 @@ bool ScAutoFormat::Load()
     aURL.setFinalSlash();
     aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
 
-    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ, true );
+    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ );
     SvStream* pStream = aMedium.GetInStream();
     bRet = (pStream && pStream->GetError() == 0);
     if (bRet)
@@ -1096,7 +1096,7 @@ bool ScAutoFormat::Save()
     aURL.setFinalSlash();
     aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
 
-    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE, true );
+    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE );
     SvStream* pStream = aMedium.GetOutStream();
     bRet = (pStream && pStream->GetError() == 0);
     if (bRet)
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index a8aa11b371a3..d57a6d004076 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1328,8 +1328,7 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( String& rFileNm,
         }
         else
         {
-            SfxMedium aMedium( aDest, STREAM_WRITE | STREAM_SHARE_DENYNONE,
-                                false );
+            SfxMedium aMedium( aDest, STREAM_WRITE | STREAM_SHARE_DENYNONE );
 
             {
                 SvFileStream aCpy( aMedium.GetPhysicalName(), STREAM_WRITE );
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 72a2827f61d4..68902b6f248d 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -85,7 +85,7 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
     {// versuchen *.FM3-File zu laden
         INetURLObject aURL( rMedium.GetURLObject() );
         aURL.setExtension( CREATE_STRING( "FM3" ) );
-        SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_STD_READ, sal_True );
+        SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_STD_READ );
         pStream = aMedium.GetInStream();
         if ( pStream )
         {
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index c28f6d25ff09..9fc1347a7414 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -271,7 +271,7 @@ sal_Bool ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
     if ( aOptions.Len() )
         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
 
-    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, false, pFilter);
+    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, pFilter);
 
     // aRef->DoClose() will be closed explicitly, but it is still more safe to use SfxObjectShellLock here
     ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index a55f46f47cc5..2543d2368e2d 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -722,7 +722,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
                     if ( nVersion != 0 )
                         pSet->Put( SfxInt16Item( SID_VERSION, nVersion ) );
-                    pMed = new SfxMedium( aFileName, STREAM_STD_READ, false, pFilter, pSet );
+                    pMed = new SfxMedium( aFileName, STREAM_STD_READ, pFilter, pSet );
                 }
                 else
                 {
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 746d5133ccf6..cbbd53e2214f 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2221,7 +2221,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt
     pSet->Put( SfxBoolItem(SID_HIDDEN, true) );
 
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    auto_ptr<SfxMedium> pMedium(new SfxMedium(aFile, STREAM_STD_READ, false, pFilter, pSet));
+    auto_ptr<SfxMedium> pMedium(new SfxMedium(aFile, STREAM_STD_READ, pFilter, pSet));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     if (pMedium->GetError() != ERRCODE_NONE)
         return NULL;
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 1b65a7ea7585..fc1a37083a4c 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -215,7 +215,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
     if (!aOptions.isEmpty())
         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
 
-    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, false, pFilter, pSet);
+    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, pFilter, pSet);
 
     if ( bInEdit )                              // only if using the edit dialog,
         pMed->UseInteractionHandler(true);    // enable the filter options dialog
@@ -494,7 +494,7 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName,
     //  Filter-Detection
 
     const SfxFilter* pSfxFilter = NULL;
-    SfxMedium* pMedium = new SfxMedium( rFileName, STREAM_STD_READ, false );
+    SfxMedium* pMedium = new SfxMedium( rFileName, STREAM_STD_READ );
     if ( pMedium->GetError() == ERRCODE_NONE )
     {
         if ( bWithInteraction )
@@ -558,7 +558,7 @@ ScDocumentLoader::ScDocumentLoader( const rtl::OUString& rFileName,
     if ( !rOptions.isEmpty() )
         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, rOptions ) );
 
-    pMedium = new SfxMedium( rFileName, STREAM_STD_READ, false, pFilter, pSet );
+    pMedium = new SfxMedium( rFileName, STREAM_STD_READ, pFilter, pSet );
     if ( pMedium->GetError() != ERRCODE_NONE )
         return ;
 
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 7fe787da7d02..7e254d9cd592 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -341,7 +341,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
             pFilter = aMatcher.GetFilter4EA( aTypeName );
 
         // ctor of SfxMedium uses owner transition of ItemSet
-        SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, false, NULL, pSet );
+        SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet );
         aMedium.UseInteractionHandler( sal_True );
 
         sal_Bool bIsStorage = aMedium.IsStorage();
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index b03a446ea066..8192b4269324 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -624,7 +624,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool
 
         // nur nach eigenen Filtern suchen, ohne Auswahlbox (wie in ScDocumentLoader)
         SfxFilterMatcher aMatcher( ScDocShell::Factory().GetFilterContainer()->GetName() );
-        SfxMedium aSfxMedium( aStrURL, (STREAM_READ | STREAM_SHARE_DENYNONE), false );
+        SfxMedium aSfxMedium( aStrURL, (STREAM_READ | STREAM_SHARE_DENYNONE) );
         // #i73992# GuessFilter no longer calls UseInteractionHandler.
         // This is UI, so it can be called here.
         aSfxMedium.UseInteractionHandler(sal_True);
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index b6afb39bf339..2b474bc442c6 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -117,7 +117,7 @@ FileFormat aFileFormats[] = {
     aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
 
     ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
-    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
+    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
     pSrcMed->SetFilter(aFilter);
     if ( !xDocShRef->DoLoad(pSrcMed) )
     {
@@ -167,7 +167,7 @@ bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL
         rUserData, rtl::OUString() );
 
     ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
-    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
+    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
     pSrcMed->SetFilter(&aFilter);
     bool bLoaded = xDocShRef->DoLoad(pSrcMed);
     xDocShRef->DoClose();
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 )
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 70fae05fb33b..f7f85d5502c5 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -77,8 +77,7 @@ class DateTime;
 class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
 {
     sal_uInt32          eError;
-    sal_Bool            bDirect:1,
-                        bRoot:1,
+    sal_Bool            bRoot:1,
                         bSetFilter:1,
                         bTriedStorage;
     StreamMode          nStorOpenMode;
@@ -113,9 +112,19 @@ public:
                         SfxMedium();
                         SfxMedium( const String &rName,
                                    StreamMode nOpenMode,
-                                   sal_Bool bDirect=sal_False,
                                    const SfxFilter *pFilter = 0,
                                    SfxItemSet *pSet = 0 );
+                        //TODO: the next, non-defined overload is only there to
+                        // detect uses of the above (String, StreamMode, etc.)
+                        // overload from when it still had an additional third
+                        // parameter sal_Bool bDirect, where now a leftover
+                        // "false" or "sal_False" could be mistaken for a null
+                        // pointer argument for the pFilter parameter; it can be
+                        // removed once we are confident all old uses of the
+                        // original overload have been adapted (in platform
+                        // specific code etc.):
+                        SfxMedium(String const &, StreamMode, void *)
+                            /* = delete */;
 
                         SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
                                     const String& rBaseURL,
@@ -178,8 +187,7 @@ public:
     void                CloseStorage();
 
     StreamMode          GetOpenMode() const { return nStorOpenMode; }
-    void                SetOpenMode( StreamMode nStorOpen, sal_Bool bDirect, sal_Bool bDontClose = sal_False );
-    sal_Bool            IsDirect() const { return bDirect? sal_True: sal_False; }
+    void                SetOpenMode( StreamMode nStorOpen, sal_Bool bDontClose = sal_False );
 
     SvStream*           GetInStream();
     SvStream*           GetOutStream();
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 33b5183b0e13..15fe9047173e 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -404,7 +404,7 @@ sal_uInt32 CheckPasswd_Impl
 sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, sal_Bool bCopy, SfxItemSet* pSet )
 {
     const SfxFilter* pFilter = NULL;
-    SfxMedium aMedium( rFileName,  ( STREAM_READ | STREAM_SHARE_DENYNONE ), sal_False );
+    SfxMedium aMedium( rFileName,  ( STREAM_READ | STREAM_SHARE_DENYNONE ) );
 
     if ( !aMedium.GetStorage( sal_True ).is() )
         aMedium.GetInStream();
@@ -460,7 +460,7 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String
         if ( !xDoc.Is() )
             xDoc = SfxObjectShell::CreateObject( pFilter->GetServiceName() );
 
-        SfxMedium *pMedium = new SfxMedium( rFileName, STREAM_STD_READ, sal_False, pFilter, pSet );
+        SfxMedium *pMedium = new SfxMedium( rFileName, STREAM_STD_READ, pFilter, pSet );
         if(!xDoc->DoLoad(pMedium))
         {
             ErrCode nErrCode = xDoc->GetErrorCode();
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index d9190d6162bc..d0fe61ebe5f3 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -270,7 +270,7 @@ sal_Bool SvFileObject::LoadFile_Impl()
         return sal_False;
 
     // at the moment on the current DocShell
-    xMed = new SfxMedium( sFileNm, STREAM_STD_READ, sal_True );
+    xMed = new SfxMedium( sFileNm, STREAM_STD_READ );
     SvLinkSource::StreamToLoadFrom aStreamToLoadFrom =
         getStreamToLoadFrom();
     xMed->setStreamToLoadFrom(
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index a0dc6e435932..cfc00a72a314 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -138,7 +138,7 @@ short SvxOpenGraphicDialog::Execute()
             // non-local?
             if ( INET_PROT_FILE != aObj.GetProtocol() )
             {
-                SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
+                SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
                 aMed.DownLoad();
                 SvStream* pStream = aMed.GetInStream();
 
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 6a3fee662876..51d597f6164c 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -242,7 +242,7 @@ void SfxHTMLParser::StartFileDownload( const String& rURL,
     if( pDLMedium )
         return;
 
-    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, sal_False );
+    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY );
     if( pSh )
     {
         // Register the medium, so that it can be stopped.
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2daebaee8c3f..4da155678152 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -360,7 +360,6 @@ SfxMedium_Impl::~SfxMedium_Impl()
 #define IMPL_CTOR(rootVal,URLVal)           \
      eError( SVSTREAM_OK ),                 \
                                             \
-     bDirect( sal_False ),                  \
      bRoot( rootVal ),                      \
      bSetFilter( sal_False ),               \
      bTriedStorage( sal_False ),            \
@@ -1480,7 +1479,6 @@ sal_Bool SfxMedium::WillDisposeStorageOnClose_Impl()
 
 //------------------------------------------------------------------
 void SfxMedium::SetOpenMode( StreamMode nStorOpen,
-                             sal_Bool bDirectP,
                              sal_Bool bDontClose )
 {
     if ( nStorOpenMode != nStorOpen )
@@ -1496,7 +1494,6 @@ void SfxMedium::SetOpenMode( StreamMode nStorOpen,
         }
     }
 
-    bDirect     = bDirectP;
     bSetFilter  = sal_False;
 }
 
@@ -2821,7 +2818,7 @@ void SfxMedium::CompleteReOpen()
 //------------------------------------------------------------------
 SfxMedium::SfxMedium
 (
-    const String &rName, StreamMode nOpenMode,  sal_Bool bDirectP,
+    const String &rName, StreamMode nOpenMode,
     const SfxFilter *pFlt, SfxItemSet *pInSet
 )
 :   IMPL_CTOR( sal_False, 0 ),  // bRoot, pURLObj
@@ -2831,7 +2828,6 @@ SfxMedium::SfxMedium
 {
     aLogicName = rName;
     nStorOpenMode = nOpenMode;
-    bDirect = bDirectP;
     Init_Impl();
 }
 
@@ -2887,7 +2883,6 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
     if (!pFileNameItem) throw uno::RuntimeException();
     aLogicName = pFileNameItem->GetValue();
     nStorOpenMode = bReadOnly ? SFX_STREAM_READONLY : SFX_STREAM_READWRITE;
-    bDirect = sal_False;
     Init_Impl();
 }
 
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 8ad6af137945..a9629aaaf73c 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -98,7 +98,7 @@ SfxMedium* DocumentInserter::CreateMedium()
         DBG_ASSERT( m_pURLList.size() == 1, "DocumentInserter::CreateMedium(): invalid URL list count" );
         String sURL(m_pURLList[0]);
         pMedium = new SfxMedium(
-                sURL, SFX_STREAM_READONLY, sal_False,
+                sURL, SFX_STREAM_READONLY,
                 SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
         pMedium->UseInteractionHandler( sal_True );
         SfxFilterMatcher* pMatcher = NULL;
@@ -131,7 +131,7 @@ SfxMediumList* DocumentInserter::CreateMediumList()
         for(std::vector<rtl::OUString>::const_iterator i = m_pURLList.begin(); i != m_pURLList.end(); ++i)
         {
             SfxMedium* pMedium = new SfxMedium(
-                    *i, SFX_STREAM_READONLY, sal_False,
+                    *i, SFX_STREAM_READONLY,
                     SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
 
             pMedium->UseInteractionHandler( sal_True );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 900858c1f923..037f4bcc2504 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -442,7 +442,7 @@ void SfxObjectShell::SetReadOnly()
         if ( !pMedium->HasStorage_Impl() && IsLoadingFinished() )
             pMedium->CloseInStream();
 
-        pMedium->SetOpenMode( SFX_STREAM_READONLY, pMedium->IsDirect(), sal_True );
+        pMedium->SetOpenMode( SFX_STREAM_READONLY, sal_True );
         pMedium->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
 
         if ( !bWasROUI )
@@ -1402,7 +1402,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad()
 
         // templates are never readonly
         pTmpMedium->GetItemSet()->ClearItem( SID_DOC_READONLY );
-        pTmpMedium->SetOpenMode( SFX_STREAM_READWRITE, sal_True, sal_True );
+        pTmpMedium->SetOpenMode( SFX_STREAM_READWRITE, sal_True );
 
         // notifications about possible changes in readonly state and document info
         Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index d8406dcdb6c2..313d95d19054 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2421,7 +2421,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs )
     // create a medium as a copy; this medium is only for writingm, because it
     // uses the same name as the original one writing is done through a copy,
     // that will be transferred to the target (of course after calling HandsOff)
-    SfxMedium* pMediumTmp = new SfxMedium( pRetrMedium->GetName(), pRetrMedium->GetOpenMode(), pRetrMedium->IsDirect(), pFilter, pSet );
+    SfxMedium* pMediumTmp = new SfxMedium( pRetrMedium->GetName(), pRetrMedium->GetOpenMode(), pFilter, pSet );
     pMediumTmp->SetLongName( pRetrMedium->GetLongName() );
     if ( pMediumTmp->GetErrorCode() != ERRCODE_NONE )
     {
@@ -2504,7 +2504,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet )
             pFilter = SfxFilterMatcher( String::CreateFromAscii( GetFactory().GetShortName()) ).GetFilter4FilterName( aFilterName );
 
         SfxMedium *pMed = new SfxMedium(
-            pSalvageItem->GetValue(), STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, sal_False, pFilter );
+            pSalvageItem->GetValue(), STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, pFilter );
 
         SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False );
         if ( pPasswordItem )
@@ -2710,7 +2710,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
     pParams = pMergedParams;
 
     // create a medium for the target URL
-    SfxMedium *pNewFile = new SfxMedium( rFileName, STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, sal_False, 0, pParams );
+    SfxMedium *pNewFile = new SfxMedium( rFileName, STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, 0, pParams );
 
     // set filter; if no filter is given, take the default filter of the factory
     if ( aFilterName.Len() )
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 34929e20702c..579a10d17fe9 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -472,7 +472,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
                     pMed->CloseAndRelease();
                     pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & STREAM_WRITE ) ) );
-                    pMed->SetOpenMode( nOpenMode, pMed->IsDirect() );
+                    pMed->SetOpenMode( nOpenMode );
 
                     pMed->CompleteReOpen();
                     if ( nOpenMode & STREAM_WRITE )
@@ -493,7 +493,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                     else
                     {
                         pMed->ResetError();
-                        pMed->SetOpenMode( SFX_STREAM_READONLY, pMed->IsDirect() );
+                        pMed->SetOpenMode( SFX_STREAM_READONLY );
                         pMed->ReOpen();
                         pSh->DoSaveCompleted( pMed );
                     }
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 42be1f70fb88..05f6056821c5 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -185,7 +185,7 @@ SmFilterDetect::~SmFilterDetect()
     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( true );
 
         bool bIsStorage = aMedium.IsStorage();
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index f6fe5620b529..5927b43746ab 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -116,7 +116,7 @@ sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
                              String& rFilterName, sal_Bool bShowProgress )
 {
     sal_uInt16      nRet = SGA_IMPORT_NONE;
-    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
+    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
     String      aFilterName;
 
     aMedium.DownLoad();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 7da31b22f79e..d82f72cda713 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -92,7 +92,7 @@ const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilter
 {
     Graphic aGraphic;
 
-    SfxMedium xMed( aFileName, STREAM_STD_READ, true );
+    SfxMedium xMed( aFileName, STREAM_STD_READ );
     xMed.DownLoad();
 
     SvStream* pInStrm = xMed.GetInStream();
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 3c85086a884b..9fab3b72eada 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1542,7 +1542,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
                 // normal link
                 String              aFilterName;
                 const SfxFilter*    pSfxFilter = NULL;
-                SfxMedium           aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, sal_False );
+                SfxMedium           aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE );
 
                 SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
 
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index cdc69dcc5076..a2f8322b1763 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -263,7 +263,7 @@ bool SvxXMLXTableExportComponent::save(
                 xSubStorage = ::comphelper::OStorageHelper::GetStorageFromURL( rURL, eCreate );
             else
             {
-                pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
+                pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC );
                 pMedium->IsRemote();
 
                 SvStream* pStream = pMedium->GetOutStream();
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 8efc492a8b38..e445d910be2f 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -406,7 +406,7 @@ bool SvxXMLXTableImport::load( const rtl::OUString &rPath,
 
         if( !bUseStorage || !xStorage.is() )
         {
-            SfxMedium aMedium( rPath, STREAM_READ | STREAM_NOCREATE, sal_True );
+            SfxMedium aMedium( rPath, STREAM_READ | STREAM_NOCREATE );
             aParserInput.sSystemId = aMedium.GetName();
 
             if( aMedium.IsStorage() )
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 291e7491175e..1bb0b38e0e21 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -188,7 +188,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
                     aURL.setExtension( aExt );
                 rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
 
-                SfxMedium   aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
+                SfxMedium   aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC );
                 SvStream*   pOStm = aMedium.GetOutStream();
 
                 if( pOStm && aGfxLink.GetDataSize() && aGfxLink.GetData() )
@@ -318,7 +318,7 @@ sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObje
 {
     DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
 
-    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
+    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC );
     SvStream*   pOStm = aMedium.GetOutStream();
     sal_uInt16      nRet = GRFILTER_IOERROR;
 
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 99292710f515..2257d2f63549 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -81,7 +81,7 @@ bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL
         rUserData, rtl::OUString() );
 
     SwDocShellRef xDocShRef = new SwDocShell;
-    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
+    SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
     pSrcMed->SetFilter(pFilter);
     bool bLoaded = xDocShRef->DoLoad(pSrcMed);
     if (xDocShRef.Is())
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index 8f30f5755868..a3f795a6a43a 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -124,7 +124,7 @@ void SwDocTest::testFileNameFields()
 
     INetURLObject aTempFileURL(aTempFile.GetURL());
     String sFileURL = aTempFileURL.GetMainURL(INetURLObject::NO_DECODE);
-    SfxMedium aDstMed(sFileURL, STREAM_STD_READWRITE, true);
+    SfxMedium aDstMed(sFileURL, STREAM_STD_READWRITE);
 
     SfxFilter aFilter(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text")),
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index be89526e3047..24f716648bbd 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -326,7 +326,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
                     utl::TempFile aTempFile2(sLeading,&sExt,&sPath );
                     sFileName = aTempFile2.GetURL();
                     SfxMedium* pTmpMed = new SfxMedium( sFileName,
-                                                STREAM_STD_READWRITE, sal_True );
+                                                STREAM_STD_READWRITE );
                     pTmpMed->SetFilter( pFilter );
 
                     // We need to have a Layout for the HTMLFilter, so that
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 893f7b440f78..de42e92ed55b 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1133,7 +1133,7 @@ sal_Bool SwTableAutoFmtTbl::Load()
     SvtPathOptions aOpt;
     if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
     {
-        SfxMedium aStream( sNm, STREAM_STD_READ, sal_True );
+        SfxMedium aStream( sNm, STREAM_STD_READ );
         bRet = Load( *aStream.GetInStream() );
     }
     else
@@ -1147,7 +1147,7 @@ sal_Bool SwTableAutoFmtTbl::Save() const
     String sNm( aPathOpt.GetUserConfigPath() );
     sNm += INET_PATH_TOKEN;
     sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( sAutoTblFmtName ));
-    SfxMedium aStream(sNm, STREAM_STD_WRITE, sal_True );
+    SfxMedium aStream(sNm, STREAM_STD_WRITE );
     return Save( *aStream.GetOutStream() ) && aStream.Commit();
 }
 
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 402f7b77dda7..d4fc3db8fd35 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1276,7 +1276,7 @@ int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
 
     // 2. selbst die Date oeffnen
     SfxMedium* pMed = new SfxMedium( aTmpObj.GetMainURL(
-                             INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
+                             INetURLObject::NO_DECODE ), STREAM_READ );
     if( INET_PROT_FILE == aTmpObj.GetProtocol() )
         pMed->DownLoad();     // nur mal das Medium anfassen (DownLoaden)
 
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index c47a6059ebe4..a9c2fdb9402a 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -338,7 +338,7 @@ void SwEditShell::ApplyAutoMark()
         }
 
         //2.
-        SfxMedium aMedium( sAutoMarkURL, STREAM_STD_READ, sal_True );
+        SfxMedium aMedium( sAutoMarkURL, STREAM_STD_READ );
         SvStream& rStrm = *aMedium.GetInStream();
         const String sZero('0');
         Push();
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index ea77e4f3103e..0993721b22f1 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -832,7 +832,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
         else
             pMed = xReadStorage.is() ?
                 new SfxMedium(xReadStorage, sBaseURL, 0 ) :
-                new SfxMedium(sFileName, STREAM_READ, sal_True, 0, 0 );
+                new SfxMedium(sFileName, STREAM_READ, 0, 0 );
         if( !sBaseURL.isEmpty() )
             pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) );
 
@@ -861,7 +861,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
                     pMed->SetFilter( pFilter );
                 }
                 else
-                    pMed = new SfxMedium(sFileName, STREAM_READ, sal_True, pFilter, 0);
+                    pMed = new SfxMedium(sFileName, STREAM_READ, pFilter, 0);
             }
         }
         if(!sFilterOptions.isEmpty())
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 121cb69079f5..41adf6762445 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -310,7 +310,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
             INetURLObject aObj;
             aObj.SetSmartProtocol( INET_PROT_FILE );
             aObj.SetSmartURL( rFileName );
-            pMedium = new SfxMedium( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ, sal_False );
+            pMedium = new SfxMedium( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ );
         }
 
         // templates should not get precedence over "normal" filters (#i35508, #i33168)
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index ebac2311e8cc..336ee583f22f 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1744,7 +1744,7 @@ sal_Bool SwHTMLParser::FileDownload( const String& rURL,
     ViewShell *pOldVSh = CallEndAction();
 
     // Ein Medium anlegen
-    SfxMedium aDLMedium( rURL, STREAM_READ | STREAM_SHARE_DENYWRITE, sal_False );
+    SfxMedium aDLMedium( rURL, STREAM_READ | STREAM_SHARE_DENYWRITE );
 
     // Medium registrieren, damit abgebrochen werden kann
     if( pDoc->GetDocShell() )
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index c0f780ea58b7..5942209fc9bf 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -340,8 +340,8 @@ sal_Bool Writer::CopyLocalFileToINet( String& rFileNm )
     String aDest = aTargetUrl.GetPartBeforeLastName();
     aDest += String(aFileUrl.GetName());
 
-    SfxMedium aSrcFile( aSrc, STREAM_READ, sal_False );
-    SfxMedium aDstFile( aDest, STREAM_WRITE | STREAM_SHARE_DENYNONE, sal_False );
+    SfxMedium aSrcFile( aSrc, STREAM_READ );
+    SfxMedium aDstFile( aDest, STREAM_WRITE | STREAM_SHARE_DENYNONE );
 
     *aDstFile.GetOutStream() << *aSrcFile.GetInStream();
 
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 24b4c9d20922..7b73e115fdbd 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1668,7 +1668,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
 
     SubInitNew();
 
-    SfxMedium aMed( rStreamName, STREAM_READ, sal_False );
+    SfxMedium aMed( rStreamName, STREAM_READ );
     // #i48748# - use class <SwReloadFromHtmlReader>, because
     // the base URL has to be set to the filename of the document <rMedname>
     // and not to the base URL of the temporary file <aMed> in order to get
@@ -1713,7 +1713,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
     SfxFilterMatcher aMatcher( sFactory );
 
     // search for filter in WebDocShell, too
-    SfxMedium aMed( rURL, STREAM_STD_READ, sal_False );
+    SfxMedium aMed( rURL, STREAM_STD_READ );
     const SfxFilter* pFlt = 0;
     aMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
     if(!pFlt)
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 26be3dc57983..64170c2bf7d9 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -89,7 +89,7 @@ SwBaseNumRules::~SwBaseNumRules()
         INetURLObject aTempObj(sNm);
         sNm = aTempObj.GetFull();
         SfxMedium aStrm( sNm, STREAM_WRITE | STREAM_TRUNC |
-                                        STREAM_SHARE_DENYALL, sal_True );
+                                        STREAM_SHARE_DENYALL );
         Store( *aStrm.GetOutStream() );
     }
 
@@ -106,7 +106,7 @@ void  SwBaseNumRules::Init()
     SvtPathOptions aOpt;
     if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
     {
-        SfxMedium aStrm( sNm, STREAM_STD_READ, sal_True );
+        SfxMedium aStrm( sNm, STREAM_STD_READ );
         Load( *aStrm.GetInStream() );
     }
 }
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index b3cd41d955b3..f3359a9aa629 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -398,7 +398,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
     if(m_sURL.Len())
     {
         //file exists, has to be loaded here
-        SfxMedium aMedium( m_sURL, STREAM_READ, sal_True );
+        SfxMedium aMedium( m_sURL, STREAM_READ );
         SvStream* pStream = aMedium.GetInStream();
         if(pStream)
         {
@@ -585,7 +585,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl)
     }
     if(m_sURL.Len())
     {
-        SfxMedium aMedium( m_sURL, STREAM_READWRITE|STREAM_TRUNC, sal_True );
+        SfxMedium aMedium( m_sURL, STREAM_READWRITE|STREAM_TRUNC );
         SvStream* pStream = aMedium.GetOutStream();
         pStream->SetLineDelimiter( LINEEND_LF );
         pStream->SetStreamCharSet(RTL_TEXTENCODING_UTF8);
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 900ada03d97f..30d9fa697828 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1043,7 +1043,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                         // Create and save new document
                         // The SfxObjectShell will be closed explicitly later but it is more safe to use SfxObjectShellLock here
                         SfxObjectShellLock xWorkDocSh( new SwDocShell( SFX_CREATE_MODE_INTERNAL ));
-                        SfxMedium* pWorkMed = new SfxMedium( sSourceDocumentURL, STREAM_STD_READ, sal_True );
+                        SfxMedium* pWorkMed = new SfxMedium( sSourceDocumentURL, STREAM_STD_READ );
                         pWorkMed->SetFilter( pSfxFlt );
 
                         if (xWorkDocSh->DoLoad(pWorkMed))
@@ -1141,7 +1141,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                 String sFileURL =  aTempFileURL.GetMainURL( INetURLObject::NO_DECODE );
                                 SfxMedium* pDstMed = new SfxMedium(
                                     sFileURL,
-                                    STREAM_STD_READWRITE, sal_True );
+                                    STREAM_STD_READWRITE );
                                 pDstMed->SetFilter( pStoreToFilter );
                                 if(pDstMed->GetItemSet())
                                 {
@@ -1198,7 +1198,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                         {
                                             {
                                                 //read in the temporary file and use it as mail body
-                                                SfxMedium aMedium( sFileURL, STREAM_READ, sal_True);
+                                                SfxMedium aMedium( sFileURL, STREAM_READ);
                                                 SvStream* pInStream = aMedium.GetInStream();
                                                 OSL_ENSURE(pInStream, "no output file created?");
                                                 if(pInStream)
@@ -1263,7 +1263,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                     INetURLObject aTempFileURL(bAsSingleFile ? sSubject : aTempFile->GetURL());
                     SfxMedium* pDstMed = new SfxMedium(
                         aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ),
-                        STREAM_STD_READWRITE, sal_True );
+                        STREAM_STD_READWRITE );
                     pDstMed->SetFilter( pStoreToFilter );
                     if(pDstMed->GetItemSet())
                     {
@@ -2473,7 +2473,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
                 // the shell will be explicitly closed, but it is more safe to use SfxObjectShellLock here
                 // especially for the case that the loading has failed
                 SfxObjectShellLock xWorkDocSh( new SwDocShell( SFX_CREATE_MODE_INTERNAL ));
-                SfxMedium* pWorkMed = new SfxMedium( sTempURL, STREAM_STD_READ, sal_True );
+                SfxMedium* pWorkMed = new SfxMedium( sTempURL, STREAM_STD_READ );
                 pWorkMed->SetFilter( pSfxFlt );
                 if( xWorkDocSh->DoLoad(pWorkMed) )
                 {
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index 8d90fdfc0841..fe15c9ac4b53 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -716,7 +716,7 @@ uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*
     else
     {
         Sequence<sal_Int8> aData;
-        SfxMedium aMedium( m_aURL, STREAM_STD_READ, sal_False );
+        SfxMedium aMedium( m_aURL, STREAM_STD_READ );
         SvStream* pStream = aMedium.GetInStream();
         if ( aMedium.GetErrorCode() == ERRCODE_NONE && pStream)
         {
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 9cccd38ec403..8a59351d4b97 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1237,7 +1237,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
         {
             {
                 //read in the temporary file and use it as mail body
-                SfxMedium aMedium( aName.GetValue(),    STREAM_READ, sal_True);
+                SfxMedium aMedium( aName.GetValue(),    STREAM_READ);
                 SvStream* pInStream = aMedium.GetInStream();
                 if(pInStream)
                     pInStream->SetStreamCharSet( eEncoding );
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 75dc1ea2b413..d6473b7c20e9 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -775,7 +775,7 @@ sal_Bool SwGlossaryHdl::ImportGlossaries( const String& rName )
     if( rName.Len() )
     {
         const SfxFilter* pFilter = 0;
-        SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, sal_True, 0, 0 );
+        SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, 0, 0 );
         SfxFilterMatcher aMatcher( String::CreateFromAscii("swriter") );
         pMed->UseInteractionHandler( sal_True );
         if( !aMatcher.GuessFilter( *pMed, &pFilter, sal_False ) )
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 3da5f50a8373..f3f90d50d66b 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -2296,7 +2296,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         // or should the file be an ImageMap-File?
         ImageMap aMap;
         SfxMedium aMed( INetURLObject(aBkmk.GetURL()).GetFull(),
-                            STREAM_STD_READ, sal_False );
+                            STREAM_STD_READ );
         SvStream* pStream = aMed.GetInStream();
         if( pStream != NULL  &&
             !pStream->GetError()  &&
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 4db8c60b8d20..068ec3e36935 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -471,12 +471,10 @@ String ExportGraphic( const Graphic &rGraphic, const String &rGrfName )
                  nDfltFilter == rGF.GetExportFormatNumber( xFltMgr->getCurrentFilter()))
             {
                 // try to save the original graphic
-                SfxMedium aIn( rGrfName, STREAM_READ | STREAM_NOCREATE,
-                                sal_True );
+                SfxMedium aIn( rGrfName, STREAM_READ | STREAM_NOCREATE );
                 if( aIn.GetInStream() && !aIn.GetInStream()->GetError() )
                 {
-                    SfxMedium aOut( sPath, STREAM_WRITE | STREAM_SHARE_DENYNONE,
-                                            sal_False);
+                    SfxMedium aOut( sPath, STREAM_WRITE | STREAM_SHARE_DENYNONE);
                     if( aOut.GetOutStream() && !aOut.GetOutStream()->GetError())
                     {
                         *aOut.GetOutStream() << *aIn.GetInStream();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 84a6eec0843f..619889fefe73 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -4205,7 +4205,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkU
         aEntriesBB.RowInserted(0, 1, sal_True);
     else
     {
-        SfxMedium aMed( sAutoMarkURL, STREAM_STD_READ, sal_False );
+        SfxMedium aMed( sAutoMarkURL, STREAM_STD_READ );
         if( aMed.GetInStream() && !aMed.GetInStream()->GetError() )
             aEntriesBB.ReadEntries( *aMed.GetInStream() );
         else
@@ -4227,8 +4227,7 @@ IMPL_LINK_NOARG(SwAutoMarkDlg_Impl, OkHdl)
     {
         SfxMedium aMed( sAutoMarkURL,
                         bCreateMode ? STREAM_WRITE
-                                    : STREAM_WRITE| STREAM_TRUNC,
-                        sal_False );
+                                    : STREAM_WRITE| STREAM_TRUNC );
         SvStream* pStrm = aMed.GetOutStream();
         pStrm->SetStreamCharSet( RTL_TEXTENCODING_MS_1253 );
         if( !pStrm->GetError() )
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index ccb164ea22da..7126d2f0d998 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -288,7 +288,7 @@ SwDocShell*     SwSrcView::GetDocShell()
 
 void SwSrcView::SaveContent(const String& rTmpFile)
 {
-    SfxMedium aMedium( rTmpFile,    STREAM_WRITE, sal_True);
+    SfxMedium aMedium( rTmpFile,    STREAM_WRITE);
     SvStream* pOutStream = aMedium.GetOutStream();
     pOutStream->SetStreamCharSet( lcl_GetStreamCharSet(eLoadEncoding) );
     aEditWin.Write(*pOutStream);
@@ -334,8 +334,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
             if( aDlgHelper.Execute() == ERRCODE_NONE)
             {
                 SfxMedium aMedium( xFP->getFiles().getConstArray()[0],
-                                    STREAM_WRITE | STREAM_SHARE_DENYNONE,
-                                    sal_False );
+                                    STREAM_WRITE | STREAM_SHARE_DENYNONE );
                 SvStream* pOutStream = aMedium.GetOutStream();
                 pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(eLoadEncoding));
                 aEditWin.Write( *pOutStream );
@@ -829,7 +828,7 @@ void SwSrcView::Load(SwDocShell* pDocShell)
         SvtSaveOptions aOpt;
 
         {
-            SfxMedium aMedium( sFileURL,STREAM_READWRITE, sal_True );
+            SfxMedium aMedium( sFileURL,STREAM_READWRITE );
             SwWriter aWriter( aMedium, *pDocShell->GetDoc() );
             WriterRef xWriter;
             ::GetHTMLWriter(aEmptyStr, aMedium.GetBaseURL( true ), xWriter);
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 64dccd6d31d8..febc0764ba2d 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1938,7 +1938,7 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const String& rFileName, const Strin
         const SfxFilter* pFilter = rFact.GetFilterContainer()->GetFilter4FilterName( rFilterName );
         if ( !pFilter )
         {
-            pMed = new SfxMedium(rFileName, STREAM_READ, sal_True, 0, 0 );
+            pMed = new SfxMedium(rFileName, STREAM_READ, 0, 0 );
             SfxFilterMatcher aMatcher( rFact.GetFilterContainer()->GetName() );
             pMed->UseInteractionHandler( sal_True );
             ErrCode nErr = aMatcher.GuessFilter( *pMed, &pFilter, sal_False );
@@ -1948,7 +1948,7 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const String& rFileName, const Strin
                 pMed->SetFilter( pFilter );
         }
         else
-            pMed = new SfxMedium(rFileName, STREAM_READ, sal_True, pFilter, 0);
+            pMed = new SfxMedium(rFileName, STREAM_READ, pFilter, 0);
     }
     else
     {
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 7552c080f49f..c9feb5c5bda5 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -187,7 +187,7 @@ SwFilterDetect::~SwFilterDetect()
     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 ( aMedium.GetErrorCode() == ERRCODE_NONE )
         {