diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 13:42:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 13:42:20 +0000 |
| commit | 1d03c9e52e8bd57dfe5660f7efec7b276aaa47d1 (patch) | |
| tree | 46606ce16d840efb501bf848e2a879f558b7a623 /sfx2 | |
| parent | 20840d4d1cde75038e3dc59a399f878fe7008aa4 (diff) | |
INTEGRATION: CWS fwk97_DEV300 (1.42.144); FILE MERGED
2008/08/22 14:43:11 mst 1.42.144.1: workaround for 158429 (stack id 6011):
- sfx2/source/doc/doctemplates.cxx:
+ SfxDocTplService_Impl::init_Impl:
handle exceptions thrown by failing DocumentProperties creation
(there have been 20 crash reports on this last week)
- sfx2/source/doc/objcont.cxx:
+ SfxObjectShell::UpdateFromTemplate_Impl: handle similar case here as well
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 5d426cefad..af244991e7 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: doctemplates.cxx,v $ - * $Revision: 1.42 $ + * $Revision: 1.43 $ * * This file is part of OpenOffice.org. * @@ -430,7 +430,13 @@ void SfxDocTplService_Impl::init_Impl() if ( bIsInitialized ) { OUString aService( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_DOCINFO ) ); - mxInfo = uno::Reference< XStandaloneDocumentInfo > ( mxFactory->createInstance( aService ), UNO_QUERY ); + try { + mxInfo = uno::Reference< XStandaloneDocumentInfo > ( + mxFactory->createInstance( aService ), UNO_QUERY ); + } catch (uno::RuntimeException &) { + OSL_ENSURE(false, "SfxDocTplService_Impl::init_Impl: " + "cannot create DocumentProperties service"); + } aService = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_TYPEDETECTION ) ); mxType = uno::Reference< XTypeDetection > ( mxFactory->createInstance( aService ), UNO_QUERY ); |