diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 08:52:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-21 08:42:30 +0200 |
| commit | 528632660b72b105345945c13c5b68060d94a91b (patch) | |
| tree | 860508d482959abeb9175f0ce6b9e65954269f95 /uui/source/iahndl.cxx | |
| parent | aee66aa85e75f67135e5c6079a281e18402d261a (diff) | |
convert ErrCode to strong typedef
would have preferred to re-use o3tl::strong_int, of which this
is a modified copy, but there are lots of convenience accessors
which are nice to define on the class.
Change-Id: I301b807aaf02fbced3bf75de1e1692cde6c0340a
Reviewed-on: https://gerrit.libreoffice.org/38497
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'uui/source/iahndl.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 2fa698b14ea7..6febfae49664 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -486,7 +486,7 @@ UUIInteractionHelper::handleRequest_impl( { std::vector< OUString > aArguments; handleErrorHandlerRequest( aAppException.Classification, - aAppException.Code, + ErrCode(aAppException.Code), aArguments, rRequest->getContinuations(), bObtainErrorStringOnly, @@ -725,7 +725,7 @@ UUIInteractionHelper::handleRequest_impl( task::ErrorCodeRequest aErrorCodeRequest; if (aAnyRequest >>= aErrorCodeRequest) { - handleGenericErrorRequest( aErrorCodeRequest.ErrCode, + handleGenericErrorRequest( ErrCode(aErrorCodeRequest.ErrCode), rRequest->getContinuations(), bObtainErrorStringOnly, bHasErrorString, @@ -736,7 +736,7 @@ UUIInteractionHelper::handleRequest_impl( task::ErrorCodeIOException aErrorCodeIOException; if (aAnyRequest >>= aErrorCodeIOException) { - handleGenericErrorRequest( aErrorCodeIOException.ErrCode, + handleGenericErrorRequest( ErrCode(aErrorCodeIOException.ErrCode), rRequest->getContinuations(), bObtainErrorStringOnly, bHasErrorString, @@ -1075,7 +1075,7 @@ UUIInteractionHelper::handleNameClashResolveRequest( void UUIInteractionHelper::handleGenericErrorRequest( - sal_Int32 nErrorCode, + ErrCode nErrorCode, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, @@ -1101,8 +1101,8 @@ UUIInteractionHelper::handleGenericErrorRequest( // Note: It's important to convert the transported long to the // required unsigned long value. Otherwhise using as flag field // can fail ... - ErrCode nError = static_cast< ErrCode >(nErrorCode); - bool bWarning = !ERRCODE_TOERROR(nError); + ErrCode nError(nErrorCode); + bool bWarning = !nError.IgnoreWarning(); if ( nError == ERRCODE_SFX_INCOMPLETE_ENCRYPTION ) { @@ -1274,7 +1274,7 @@ bool ErrorResource::getString(ErrCode nErrorCode, OUString &rString) const { - sal_uInt32 nIdx = m_aStringArray.FindIndex(nErrorCode & ERRCODE_RES_MASK); + sal_uInt32 nIdx = m_aStringArray.FindIndex(nErrorCode.GetRest()); if (nIdx == RESARRAY_INDEX_NOTFOUND) return false; rString = m_aStringArray.GetString(nIdx); |