diff options
Diffstat (limited to 'sfx2/source/doc/objserv.cxx')
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index fea3af2af67b..dc2cfa229ed1 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -519,7 +519,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // at the end of the method aModelGuard.Init_Impl( uno::Reference< util::XCloseable >( GetModel(), uno::UNO_QUERY ) ); - sal_uInt32 nErrorCode = ERRCODE_NONE; + ErrCode nErrorCode = ERRCODE_NONE; // by default versions should be preserved always except in case of an explicit // SaveAs via GUI, so the flag must be set accordingly @@ -633,7 +633,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // the user has decided not to store the document throw task::ErrorCodeIOException( "SfxObjectShell::ExecFile_Impl: ERRCODE_IO_ABORT", - uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT); + uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_IO_ABORT)); } // merge aDispatchArgs to the request @@ -654,7 +654,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } catch( const task::ErrorCodeIOException& aErrorEx ) { - nErrorCode = (sal_uInt32)aErrorEx.ErrCode; + nErrorCode = ErrCode(aErrorEx.ErrCode); } catch( Exception& ) { @@ -664,7 +664,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // by default versions should be preserved always except in case of an explicit // SaveAs via GUI, so the flag must be reset to guarantee this pImpl->bPreserveVersions = true; - sal_uIntPtr lErr=GetErrorCode(); + ErrCode lErr=GetErrorCode(); if ( !lErr && nErrorCode ) lErr = nErrorCode; @@ -790,7 +790,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } SetModified( false ); - sal_uIntPtr lErr = GetErrorCode(); + ErrCode lErr = GetErrorCode(); ErrorHandler::HandleError(lErr); rReq.SetReturnValue( SfxBoolItem(0, true) ); |