diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-27 21:44:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-28 13:35:04 +0100 |
| commit | 2e6d96408ea726b652215b11c4fc9ef56c8e1361 (patch) | |
| tree | 540235850980a39d3fa14da8433e7d806a713e98 /sfx2 | |
| parent | 1e21c32a2f81b4ae5302fc8d537e4f200a1a3e76 (diff) | |
Revert "temp tinderbox fix"
This reverts commit d4cb9c3a8851cb874fd8b6c77d4d7521da7579b7.
Change-Id: Ifd11427ea6b4137d0e0c007e7f140fbc6caa3f31
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a77589bd0630..7af4a7795844 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -416,24 +416,16 @@ Reference < XContent > SfxMedium::GetContent() const if ( !pImpl->aContent.get().is() ) { Reference < css::ucb::XContent > xContent; - Reference < css::ucb::XCommandEnvironment > xEnv; - try - { - // tdf#95144 add a default css::ucb::XCommandEnvironment - // in order to have http and https protocol manage certificates correctly - css:: uno::Reference< task::XInteractionHandler > xIH( - css::task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), nullptr ) ); + // tdf#95144 add a default css::ucb::XCommandEnvironment + // in order to have http and https protocol manage certificates correctly + css:: uno::Reference< task::XInteractionHandler > xIH( + css::task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), nullptr ) ); - css::uno::Reference< css::ucb::XProgressHandler > xProgress; - ::ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment(new comphelper::SimpleFileAccessInteraction( xIH ), xProgress); + css::uno::Reference< css::ucb::XProgressHandler > xProgress; + ::ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment(new comphelper::SimpleFileAccessInteraction( xIH ), xProgress); - xEnv = Reference < css::ucb::XCommandEnvironment >(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); - } - catch(...) - { - //temp tinderbox fix - } + Reference < css::ucb::XCommandEnvironment > xEnv(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); const SfxUnoAnyItem* pItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pImpl->m_pSet, SID_CONTENT, false); if ( pItem ) |