diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 08:44:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 08:44:45 +0000 |
| commit | 44ff98d3565507aff2e1bc0bd47c3b8d643fbe5b (patch) | |
| tree | 257a512975ed8d941be5d215e657808ad4175ece /ucbhelper | |
| parent | 55d6db12ff6d60a4f8f8bfcd169e4466917b19f6 (diff) | |
INTEGRATION: CWS kso12 (1.2.158); FILE MERGED
2004/12/02 08:47:30 kso 1.2.158.1: #i37781# - Fixed exception handling. No more 'unexpected' exceptions from
CommandProcessorInfo::getCommands() and
PropertySetInfo::getProperties().
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/provider/contentinfo.cxx | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 592c20548166..c7f084256053 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -2,9 +2,9 @@ * * $RCSfile: contentinfo.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kso $ $Date: 2001-03-27 14:02:48 $ + * last change: $Author: vg $ $Date: 2004-12-23 09:44:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - /************************************************************************** TODO ************************************************************************** @@ -154,8 +153,20 @@ Sequence< Property > SAL_CALL PropertySetInfo::getProperties() // Get info for core ( native) properties. ////////////////////////////////////////////////////////////// - Sequence< Property > aProps = m_pContent->getProperties( m_xEnv ); - m_pProps = new Sequence< Property >( aProps ); + try + { + Sequence< Property > aProps + = m_pContent->getProperties( m_xEnv ); + m_pProps = new Sequence< Property >( aProps ); + } + catch ( RuntimeException const & ) + { + throw; + } + catch ( Exception const & ) + { + m_pProps = new Sequence< Property >( 0 ); + } ////////////////////////////////////////////////////////////// // Get info for additional properties. @@ -314,8 +325,20 @@ Sequence< CommandInfo > SAL_CALL CommandProcessorInfo::getCommands() // Get info for commands. ////////////////////////////////////////////////////////////// - Sequence< CommandInfo > aCmds = m_pContent->getCommands( m_xEnv ); - m_pCommands = new Sequence< CommandInfo >( aCmds ); + try + { + Sequence< CommandInfo > aCmds + = m_pContent->getCommands( m_xEnv ); + m_pCommands = new Sequence< CommandInfo >( aCmds ); + } + catch ( RuntimeException const & ) + { + throw; + } + catch ( Exception const & ) + { + m_pCommands = new Sequence< CommandInfo >( 0 ); + } } } return *m_pCommands; |