diff options
Diffstat (limited to 'sw/source/ui/app/docsh2.cxx')
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 40265dc364b7..182bda09d7b8 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -863,7 +863,7 @@ void SwDocShell::Execute(SfxRequest& rReq) bMerge = 0 != (nFlags&SFX_MERGE_STYLES); aOpt.SetMerge( !bMerge ); - SetError( LoadStylesFromFile( aFileName, aOpt, FALSE )); + SetError( LoadStylesFromFile( aFileName, aOpt, FALSE ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if ( !GetError() ) rReq.Done(); } @@ -918,33 +918,6 @@ void SwDocShell::Execute(SfxRequest& rReq) if(!pBool || !pBool->GetValue()) break; } - else - { - // try to store the document - sal_uInt32 nErrorCode = ERRCODE_NONE; - try - { - uno::Reference< frame::XStorable > xStorable( GetModel(), uno::UNO_QUERY_THROW ); - xStorable->store(); - } - catch( task::ErrorCodeIOException& aErrEx ) - { - nErrorCode = (sal_uInt32)aErrEx.ErrCode; - } - catch( uno::Exception& ) - { - nErrorCode = ERRCODE_IO_GENERAL; - } - - if ( nErrorCode != ERRCODE_NONE ) - { - // if the saving has failed show the error and break the action - if ( nErrorCode != ERRCODE_ABORT ) - ErrorHandler::HandleError( nErrorCode ); - - break; - } - } } #ifdef DBG_UTIL { |