diff options
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 7 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 123d234734f7..a8f39d06f492 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Any.h> -#include <com/sun/star/task/ErrorCodeRequest.hpp> +#include <com/sun/star/task/ErrorCodeRequest2.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> @@ -1757,8 +1757,9 @@ bool SfxObjectShell::UseInteractionToHandleError( pAbort, pApprove }; - task::ErrorCodeRequest aErrorCode; - aErrorCode.ErrCode = sal_uInt32(nError.GetCode()); + task::ErrorCodeRequest2 aErrorCode(OUString(), uno::Reference<XInterface>(), + sal_Int32(sal_uInt32(nError.GetCode())), nError.GetArg1(), nError.GetArg2(), + static_cast<sal_Int16>(nError.GetDialogMask())); aInteraction <<= aErrorCode; xHandler->handle(::framework::InteractionRequest::CreateRequest (aInteraction,lContinuations)); bResult = pAbort->wasSelected(); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index b3d0d78b5e2a..f4b1f8305588 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/ErrorCodeIOException.hpp> -#include <com/sun/star/task/ErrorCodeRequest.hpp> +#include <com/sun/star/task/ErrorCodeRequest2.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/view/XPrintJobListener.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -3220,8 +3220,9 @@ void SfxBaseModel::impl_store( const OUString& sURL // TODO/LATER: a general way to set the error context should be available SfxErrorContext aEc( ERRCTX_SFX_SAVEASDOC, m_pData->m_pObjectShell->GetTitle() ); - task::ErrorCodeRequest aErrorCode; - aErrorCode.ErrCode = sal_uInt32(nErrCode.GetCode()); + task::ErrorCodeRequest2 aErrorCode(OUString(), uno::Reference<XInterface>(), + sal_Int32(sal_uInt32(nErrCode.GetCode())), nErrCode.GetArg1(), nErrCode.GetArg2(), + static_cast<sal_Int16>(nErrCode.GetDialogMask())); SfxMedium::CallApproveHandler( xHandler, Any( aErrorCode ), false ); } } |