From e9da29679bce3b544add9233a4aca2b19b78da1a Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Wed, 6 May 2009 13:20:55 +0000 Subject: CWS-TOOLING: integrate CWS os127 2009-04-27 15:37:53 +0200 hde r271284 : i101363 2009-04-27 11:21:04 +0200 hde r271256 : #i101363 2009-03-26 12:56:13 +0100 os r270070 : #i97437# call ErrorHandler if necessary 2009-03-17 14:47:12 +0100 os r269609 : CWS-TOOLING: rebase CWS os127 to trunk@269297 (milestone: DEV300:m43) 2009-03-16 11:45:30 +0100 os r269516 : #i97471# SwDrawTextShell::Init(): mouse double click and key input in group objects at the same time: prevent crash 2009-03-12 12:02:45 +0100 os r269381 : #i100069# label Herma 5116 added 2009-03-12 12:01:21 +0100 os r269380 : #i100069# label description fixed 2009-02-16 15:10:22 +0100 os r267817 : #i96791# mark label names with x-no-translate 2009-01-26 15:41:13 +0100 os r266932 : #i97572# selection should not be kill in update of a TOX 2009-01-22 15:17:37 +0100 os r266719 : #i97850# reconversion patch applied 2009-01-22 15:01:00 +0100 os r266717 : #i98023# enable loading from InputStream 2009-01-21 16:04:52 +0100 os r266679 : #97667# names from database column: keep dots and extensions 2009-01-21 15:58:03 +0100 os r266678 : #i97577# disable address list access if csv-file has been removed 2009-01-21 12:47:19 +0100 os r266658 : #i97577# disable address list access if csv-file has been removed 2009-01-19 14:37:03 +0100 os r266499 : #i97437# catch exceptions in storeToURL 2009-01-19 13:54:44 +0100 os r266494 : #i98237# SwRVPMark removed --- sw/source/ui/dbui/mmoutputpage.cxx | 40 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) (limited to 'sw/source/ui/dbui/mmoutputpage.cxx') diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 4a5884a9daeb..64fd024fab57 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -55,6 +55,8 @@ #include #include #include +#include +#include #include #include #include @@ -752,7 +754,24 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) pValues[0].Value <<= ::rtl::OUString(sFilter); uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY); - xStore->storeToURL( sPath, aValues ); + sal_uInt32 nErrorCode = ERRCODE_NONE; + try + { + xStore->storeToURL( sPath, aValues ); + } + catch( task::ErrorCodeIOException& aErrorEx ) + { + nErrorCode = (sal_uInt32)aErrorEx.ErrCode; + } + catch( Exception& ) + { + nErrorCode = ERRCODE_IO_GENERAL; + } + if( nErrorCode != ERRCODE_NONE ) + { + SfxErrorContext aEc(ERRCTX_SFX_SAVEASDOC, pTargetView->GetDocShell()->GetTitle()); + ErrorHandler::HandleError( nErrorCode ); + } } else { @@ -787,7 +806,24 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName()); uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY); - xStore->storeToURL( sTargetTempURL, aValues ); + sal_uInt32 nErrorCode = ERRCODE_NONE; + try + { + xStore->storeToURL( sTargetTempURL, aValues ); + } + catch( task::ErrorCodeIOException& aErrorEx ) + { + nErrorCode = (sal_uInt32)aErrorEx.ErrCode; + } + catch( Exception& ) + { + nErrorCode = ERRCODE_IO_GENERAL; + } + if( nErrorCode != ERRCODE_NONE ) + { + SfxErrorContext aEc(ERRCTX_SFX_SAVEASDOC, pTargetView->GetDocShell()->GetTitle()); + ErrorHandler::HandleError( nErrorCode ); + } SwView* pSourceView = rConfigItem.GetSourceView(); PrintMonitor aSaveMonitor(this, PrintMonitor::MONITOR_TYPE_SAVE); -- cgit