diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-24 12:40:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-24 12:40:32 +0000 |
| commit | b51c8ee7ce8421d7f3648d3e772a784244d59744 (patch) | |
| tree | 33db7bb94bece2632350ddfbea1141487f5c4b5c /framework | |
| parent | 5ff7b003e5df58b6c13c1f3c959b6772a3479502 (diff) | |
INTEGRATION: CWS fwk34 (1.5.70); FILE MERGED
2006/03/02 15:59:13 cd 1.5.70.2: #i62706# Remove generic catch clause to not cover serious problems
2006/03/01 08:23:34 as 1.5.70.1: #120210# dont hinder office to show error message about corrupt filter configuration
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/newmenucontroller.cxx | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 3d9e54f9951c..6ae96887a687 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: newmenucontroller.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2005-11-03 12:01:23 $ + * last change: $Author: obo $ $Date: 2006-03-24 13:40:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -88,6 +88,9 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> #endif +#ifndef _COM_SUN_STAR_DOCUMENT_CORRUPTEDFILTERCONFIGURATIONEXCEPTION_HPP_ +#include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> +#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -671,17 +674,25 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) IMPL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument*, pNewDocument ) { +/* i62706: Don't catch all exceptions. We hide all problems here and are not able + to handle them on higher levels. try { +*/ // Asynchronous execution as this can lead to our own destruction! // Framework can recycle our current frame and the layout manager disposes all user interface // elements if a component gets detached from its frame! pNewDocument->xDispatch->dispatch( pNewDocument->aTargetURL, pNewDocument->aArgSeq ); +/* } - catch ( Exception& ) + catch (const ::com::sun::star::document::CorruptedFilterConfigurationException& exFilters) { + throw exFilters; } - + catch (const Exception& ) + { + } +*/ delete pNewDocument; return 0; } |