diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-08 04:57:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-08 04:57:32 +0000 |
| commit | ca00697e3dae9a03573d11281fc8d9a4ee391d3d (patch) | |
| tree | c390c65f02f6f32b6d6d9faa600f4688a8c81857 /framework/source/services/frame.cxx | |
| parent | 047473d4f1a12e867ab7154113f7f1c5422d5368 (diff) | |
CWS-TOOLING: integrate CWS oj18
2009-08-21 15:08:49 +0200 oj r275263 : wrong check
2009-08-21 08:56:01 +0200 oj r275215 : missing not
2009-08-20 07:27:13 +0200 oj r275164 : use new method from global
2009-08-19 10:22:35 +0200 oj r275138 : call GetLocale instead of pLocale
2009-08-18 10:39:32 +0200 oj r275082 : missing header include
2009-08-18 10:09:44 +0200 oj r275081 : new methods at global
2009-08-18 10:09:00 +0200 oj r275080 : unused var
2009-08-18 08:59:04 +0200 oj r275078 : move files from classes to xml
2009-08-17 14:58:16 +0200 oj r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55)
2009-08-17 13:29:44 +0200 oj r275047 : compile error
2009-08-17 13:27:47 +0200 oj r275045 : compile error
2009-08-17 11:44:54 +0200 oj r275040 : add dep
2009-07-22 14:26:05 +0200 oj r274240 : move unused services into fwl
2009-07-22 14:25:35 +0200 oj r274239 : move unused services into fwl
2009-07-22 13:47:45 +0200 oj r274233 : remove some unused code
2009-07-22 09:06:20 +0200 oj r274219 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 08:48:58 +0200 oj r274218 : create NumberFormatter on demand
2009-07-22 08:39:23 +0200 oj r274217 : change char to sal_Char
2009-07-22 07:33:34 +0200 oj r274214 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 07:30:04 +0200 oj r274213 : late init of numberformatter and breakiterator
2009-07-22 07:28:55 +0200 oj r274212 : export dbtoolsclient dbcharsethelper for sc
2009-07-21 13:43:28 +0200 oj r274196 : check if quick start is enbaled
2009-07-21 13:40:09 +0200 oj r274195 : check config entry for UiEventsLogger
2009-07-21 13:37:40 +0200 oj r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:35:38 +0200 oj r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:33:41 +0200 oj r274192 : doc meta data will now be created on demand
2009-07-21 13:13:40 +0200 oj r274187 : load ldap functions on demand
2009-07-21 13:03:17 +0200 oj r274183 : late init of TransliterationImpl
2009-07-21 12:36:10 +0200 oj r274180 : late init of charClass
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& ) { |