[Libreoffice-commits] core.git: cui/source include/unotools sd/source unotools/source

[Stephan Bergmann]

 cui/source/dialogs/hldocntp.cxx               |    3 +--
 include/unotools/ucbstreamhelper.hxx          |    2 --
 sd/source/filter/html/pubdlg.cxx              |    3 +--
 unotools/source/ucbhelper/ucbstreamhelper.cxx |    6 ------
 4 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 38ff65644f38f631239f36f85877e3b134dfc4e2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Aug 16 14:59:30 2016 +0200

    Remove unnecessary UcbStreamHelper::CreateStream overload
    
    ...with an explicit XInteractionHandler, but which was only ever called with a
    null XInteractionHandler, so could just as well call the overload that doesn't
    specify one (but internally uses a special SimpleFilaAccessInteraction handler
    since f60eaab748add19683e66c7e4bc073c9ce7887f7 "Related: tdf#99312, add
    specialized interaction handler", which is probably also what is wanted for
    these two calls to UcbStreamHelper::CreateStream in cui and sd).
    
    Change-Id: I2bf7bebd32f1c06b7414a4646631a19b689ee52f

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 2545c72..d7d5676 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -313,8 +313,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
 
             // check if file exists, warn before we overwrite it
             {
-                css::uno::Reference < css::task::XInteractionHandler > xHandler;
-                SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ, xHandler );
+                SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ );
 
                 bool bOk = pIStm && ( pIStm->GetError() == 0);
 
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index 904e132..42bdc4a 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -54,8 +54,6 @@ namespace utl
     public:
         static SvStream*    CreateStream( const OUString& rFileName, StreamMode eOpenMode );
         static SvStream*    CreateStream( const OUString& rFileName, StreamMode eOpenMode,
-                                          const css::uno::Reference < css::task::XInteractionHandler >& );
-        static SvStream*    CreateStream( const OUString& rFileName, StreamMode eOpenMode,
                                           bool bFileExists );
         static SvStream*    CreateStream( const css::uno::Reference < css::io::XInputStream >& xStream );
         static SvStream*    CreateStream( const css::uno::Reference < css::io::XStream >& xStream );
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index e3dee04..a926105 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1513,8 +1513,7 @@ void SdPublishingDlg::Load()
 
     // check if file exists, SfxMedium shows an errorbox else
     {
-        css::uno::Reference < css::task::XInteractionHandler > xHandler;
-        SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ, xHandler );
+        SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ );
 
         bool bOk = pIStm && ( pIStm->GetError() == 0);
 
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 133fa28..e4a3990 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -153,12 +153,6 @@ SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode e
 }
 
 SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
-                                         const Reference < XInteractionHandler >& xInteractionHandler )
-{
-    return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, true /* bEnsureFileExists */ );
-}
-
-SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
                                          bool bFileExists )
 {
     // related tdf#99312