diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 15:35:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 15:35:29 +0000 |
| commit | 6eb3b8bd9765c77c404e49eb898a96cba9e3bb47 (patch) | |
| tree | d7886fad038dae418c3096e9a15b4e5863f2fe1f /sfx2 | |
| parent | 59928cd8565bd722a6588abc26955d6f97a043cd (diff) | |
INTEGRATION: CWS leanobjects (1.34.90); FILE MERGED
2004/11/18 11:04:30 mba 1.34.90.1: #i37278#: make objects loadable on demand
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index ae3a439e95c4..f17651b60406 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: kz $ $Date: 2004-10-04 21:02:08 $ + * last change: $Author: rt $ $Date: 2004-11-26 16:35:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,9 @@ * ************************************************************************/ +#ifndef _COM_SUN_STAR_EMBED_EMBEDSTATES_HPP_ +#include <com/sun/star/embed/EmbedStates.hpp> +#endif #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> #endif @@ -1593,7 +1596,7 @@ void SfxFrame::Resize() { SfxWorkWindow *pWork = GetWorkWindow_Impl(); SfxInPlaceClient* pClient = GetCurrentViewFrame()->GetViewShell()->GetIPClient(); - if ( pClient ) + if ( pClient && pClient->GetObject()->getCurrentState() != embed::EmbedStates::LOADED ) { uno::Reference < lang::XUnoTunnel > xObj( pClient->GetObject()->getComponent(), uno::UNO_QUERY ); uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() ); |