diff options
Diffstat (limited to 'framework/source/services/frame.cxx')
-rw-r--r-- | framework/source/services/frame.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 3d7b28697dd9..a83a7120c40e 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -62,6 +62,7 @@ // interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XCloseable.hpp> @@ -991,10 +992,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl sal_Int32 nCount = xContainer->getCount(); for( sal_Int32 i=0; i<nCount; ++i ) { - css::uno::Any aItem = xContainer->getByIndex(i); css::uno::Reference< css::frame::XFrame > xSibling; if ( - ( !(aItem>>=xSibling) ) || // control unpacking + ( !(xContainer->getByIndex(i)>>=xSibling) ) || // control unpacking ( ! xSibling.is() ) || // check for valid items ( xSibling==static_cast< ::cppu::OWeakObject* >(this) ) // ignore ourself! (We are a part of this container too - but search on our children was already done.) ) @@ -2899,11 +2899,7 @@ void Frame::implts_setIconOnWindow() { try { - css::uno::Any aID = xSet->getPropertyValue( DECLARE_ASCII("IconId") ); - if( aID.hasValue() == sal_True ) - { - aID >>= nIcon; - } + xSet->getPropertyValue( DECLARE_ASCII("IconId") )>>= nIcon; } catch( css::beans::UnknownPropertyException& ) { |