diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-04-19 08:17:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 07:11:43 +0000 |
| commit | 37d34e2b6a96569313178ce864096722230cb3b9 (patch) | |
| tree | b93f747d3315b8881e41e9a45050fdce3ca1314a /cui | |
| parent | bbe51f039dffca2506ea542feb78571b6358b981 (diff) | |
Related tdf#88502 a better implementation than the one in...
...commit 70bb8c257e7fc402da60fa70109cece1fe4c69d1.
This commit reverts previous implementation in commit
70bb8c257e7fc402da60fa70109cece1fe4c69d1 and makes use of a dedicated
interaction wrapper instead.
See comphelper::SimpleFileAccessInteraction for details.
Change-Id: Ia037ea14267afaf66d8f9aa2324649264a7cb4bf
Reviewed-on: https://gerrit.libreoffice.org/24275
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/personalization.cxx | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 57298ae26243..799da445cfc5 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -29,10 +29,12 @@ #include <dialmgr.hxx> #include "cuires.hrc" +#include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include "ucbhelper/content.hxx" +#include <comphelper/simplefileaccessinteraction.hxx> using namespace com::sun::star; using namespace ::com::sun::star::uno; @@ -579,10 +581,26 @@ void SearchAndParseThread::execute() return; try { + css:: uno::Reference< task::XInteractionHandler > xIH( + css::task::InteractionHandler::createWithParent( xContext, nullptr ) ); + + xFileAccess->setInteractionHandler( new comphelper::SimpleFileAccessInteraction( xIH ) ); + xStream = xFileAccess->openFileRead( m_aURL ); + if( !xStream.is() ) + { + // in case of a returned CommandFailedException + // SimpleFileAccess serves it, returning an empty stream + sProgress = CUI_RES(RID_SVXSTR_SEARCHERROR); + sProgress = sProgress.replaceAll("%1", m_aURL); + m_pPersonaDialog->SetProgress(sProgress); + return; + } } catch (...) { + // a catch all clause, in case the exception is not + // served elsewhere sProgress = CUI_RES(RID_SVXSTR_SEARCHERROR); sProgress = sProgress.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress(sProgress); |