From 55d6db12ff6d60a4f8f8bfcd169e4466917b19f6 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 23 Dec 2004 08:44:31 +0000 Subject: INTEGRATION: CWS kso12 (1.8.18); FILE MERGED 2004/12/02 08:47:29 kso 1.8.18.1: #i37781# - Fixed exception handling. No more 'unexpected' exceptions from CommandProcessorInfo::getCommands() and PropertySetInfo::getProperties(). --- ucbhelper/source/provider/contenthelper.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ucbhelper') diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index b373a5c3dc35..23521cfcaaae 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: contenthelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2004-09-08 14:17:27 $ + * last change: $Author: vg $ $Date: 2004-12-23 09:44:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - /************************************************************************** TODO ************************************************************************** @@ -973,6 +972,7 @@ void SAL_CALL ContentImplHelper::removePropertySetInfoChangeListener( Reference< XInterface > SAL_CALL ContentImplHelper::getParent() throw( RuntimeException ) { + Reference< XInterface > xParent; OUString aURL = getParentURL(); if ( aURL.getLength() ) @@ -981,14 +981,14 @@ Reference< XInterface > SAL_CALL ContentImplHelper::getParent() new ::ucb::ContentIdentifier( m_xSMgr, aURL ) ); try { - return m_xProvider->queryContent( xId ); + xParent.set( m_xProvider->queryContent( xId ) ); } catch ( IllegalIdentifierException const & ) { } } - return Reference< XInterface >(); + return xParent; } //========================================================================= -- cgit