diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-10 17:21:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-10 17:42:25 +0200 |
| commit | 67f4626d079678e125f74fe0897d86341cda272d (patch) | |
| tree | def7af7d76780bc50cd86b333fec73b6396d69e5 /ucb/source/ucp/file/filinsreq.cxx | |
| parent | 93ab0ff24cb71c36c9e7958046e96d7472b5af90 (diff) | |
ucb: fix mergedlib duplicate WeakImplHelper<XInteractionRequest>
Change-Id: I0666bb38e43240a0cbd972a141ecc36573c2ad6a
Diffstat (limited to 'ucb/source/ucp/file/filinsreq.cxx')
| -rw-r--r-- | ucb/source/ucp/file/filinsreq.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index a2eb9709e1fc..e6466b9a59d3 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -20,6 +20,9 @@ #include "filinsreq.hxx" #include "shell.hxx" #include "filglob.hxx" + +#include <comphelper/interaction.hxx> + #include <com/sun/star/ucb/IOErrorCode.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <com/sun/star/ucb/NameClashException.hpp> @@ -45,21 +48,14 @@ XInteractionRequestImpl::XInteractionRequestImpl( p2( new XInteractionAbortImpl ), m_nErrorCode(0), m_nMinorError(0), - m_aSeq( 2 ), m_aClashingName(aClashingName), m_xOrigin(xOrigin) { if( pShell ) pShell->retrieveError(CommandId,m_nErrorCode,m_nMinorError); - m_aSeq[0] = Reference<XInteractionContinuation>(p1); - m_aSeq[1] = Reference<XInteractionContinuation>(p2); -} - - -Any SAL_CALL -XInteractionRequestImpl::getRequest() - throw(RuntimeException, std::exception) -{ + uno::Sequence<uno::Reference<task::XInteractionContinuation>> continuations{ + Reference<XInteractionContinuation>(p1), + Reference<XInteractionContinuation>(p2) }; Any aAny; if(m_nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR) { @@ -67,7 +63,7 @@ XInteractionRequestImpl::getRequest() excep.Name = m_aClashingName; excep.Classification = InteractionClassification_ERROR; excep.Context = m_xOrigin; - excep.Message = "folder exists and overwritte forbidden"; + excep.Message = "folder exists and overwrite forbidden"; aAny <<= excep; } else if(m_nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR) @@ -87,7 +83,7 @@ XInteractionRequestImpl::getRequest() aAny <<= excep; } - return aAny; + m_xRequest.set(new ::comphelper::OInteractionRequest(aAny, continuations)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |