diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:08:06 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:08:06 +0000 |
| commit | a20ad957f1ef26a9a137f1cdb3f7cd1ceb51a66e (patch) | |
| tree | a983b74b6abbe3e3e3bd95864114434b93c43b13 /sw/source/core/frmedt/feflyole.cxx | |
| parent | 0e785f0275962bf001ba23ef227a3aa6819d0a6d (diff) | |
INTEGRATION: CWS inplaceobjects (1.10.68); FILE MERGED
2006/09/28 13:47:19 mba 1.10.68.3: RESYNC: (1.11-1.12); FILE MERGED
2006/08/21 15:33:13 mba 1.10.68.2: RESYNC: (1.10-1.11); FILE MERGED
2006/06/15 14:39:50 mba 1.10.68.1: #i66239#: centralize object deactivation code
Diffstat (limited to 'sw/source/core/frmedt/feflyole.cxx')
| -rw-r--r-- | sw/source/core/frmedt/feflyole.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index 2e4b96a31c5b..f17710039059 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -4,9 +4,9 @@ * * $RCSfile: feflyole.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: obo $ $Date: 2006-09-16 21:14:24 $ + * last change: $Author: vg $ $Date: 2006-11-01 18:08:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -206,12 +206,8 @@ BOOL SwFEShell::FinishOLEObj() // Server wird beendet IsCheckForOLEInCaption() ) SetCheckForOLEInCaption( !IsCheckForOLEInCaption() ); - //InPlace beenden. - xObj->changeState( embed::EmbedStates::RUNNING ); - //TODO/CLEANUP - //SetViewFrame nur SFX - SfxViewFrame::SetViewFrame( GetSfxViewShell()->GetViewFrame() ); - + // leave UIActive state + pIPClient->DeactivateObject(); } return bRet; } |