diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-16 14:59:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-16 14:59:30 +0200 |
| commit | 38ff65644f38f631239f36f85877e3b134dfc4e2 (patch) | |
| tree | 7e198f5b0ffadfed894a51e0432a28b03bb7bf97 | |
| parent | 9e3c49f4449519680f2b149c71367f44dfa7736f (diff) | |
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
| -rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 3 | ||||
| -rw-r--r-- | include/unotools/ucbstreamhelper.hxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/html/pubdlg.cxx | 3 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/ucbstreamhelper.cxx | 6 |
4 files changed, 2 insertions, 12 deletions
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 2545c726f4fd..d7d56760d304 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 904e1320094a..42bdc4ad7714 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 e3dee04acf1b..a926105d31c6 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 133fa28e3c4f..e4a399058c59 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 |