diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-01 22:06:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-02 16:59:58 +0100 |
| commit | 6fa618722e4c4546e6ad429883d380c9fc313a0f (patch) | |
| tree | 215f2fff1ad563a3852910aa5009e18a1b524379 /sfx2 | |
| parent | a4e5020f890abfbb4b95b299e70dd194502e7a2f (diff) | |
coverity#1219793 Uncaught exception
and hopefully a gadzillion others
Change-Id: I853e997aa6510ed99c1af39eecfd80dba2d5c2a9
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index fabd427c74c5..2a7e4c58a290 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -687,29 +687,29 @@ namespace } #endif - - BasicManager* SfxObjectShell::GetBasicManager() const { -#ifdef DISABLE_SCRIPTING - return NULL; -#else - BasicManager* pBasMgr = lcl_getBasicManagerForDocument( *this ); - if ( !pBasMgr ) - pBasMgr = SFX_APP()->GetBasicManager(); - return pBasMgr; + BasicManager* pBasMgr = NULL; +#ifndef DISABLE_SCRIPTING + try + { + pBasMgr = lcl_getBasicManagerForDocument( *this ); + if ( !pBasMgr ) + pBasMgr = SFX_APP()->GetBasicManager(); + } + catch (const css::ucb::ContentCreationException& e) + { + SAL_WARN("sfx.doc", "caught exception " << e.Message); + } #endif + return pBasMgr; } - - void SfxObjectShell::SetHasNoBasic() { pImp->m_bNoBasicCapabilities = true; } - - bool SfxObjectShell::HasBasic() const { #ifdef DISABLE_SCRIPTING |