diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:05:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:05:23 +0000 |
| commit | 5afd86bf9d3b884a8b52ebfe1c5dd899ba5a0781 (patch) | |
| tree | 3ac2878a4c4f22ec8285f6cbcc797c2dc836bcaf /sd/source/ui/view/drviews1.cxx | |
| parent | 0afba3cb6ddd7a9706c8f1dfc75b7bf376b935e8 (diff) | |
INTEGRATION: CWS inplaceobjects (1.66.50); FILE MERGED
2006/09/28 12:32:22 mba 1.66.50.3: RESYNC: (1.69-1.70); FILE MERGED
2006/08/21 14:33:09 mba 1.66.50.2: RESYNC: (1.66-1.69); FILE MERGED
2006/06/15 10:23:39 mba 1.66.50.1: #i66239#: centralize code for IP deactivation
Diffstat (limited to 'sd/source/ui/view/drviews1.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 2c8a265e0e6b..cd3758f1a0f8 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews1.cxx,v $ * - * $Revision: 1.70 $ + * $Revision: 1.71 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:36:12 $ + * last change: $Author: vg $ $Date: 2006-11-01 18:05:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -275,9 +275,7 @@ void DrawViewShell::SelectionHasChanged (void) // we need to deselect it now if (!pOleObj) { - // TODO/CLEANUP: SetViewFrame should be done in SFX only - pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING ); - SfxViewFrame::SetViewFrame( GetViewFrame() ); + pIPClient->DeactivateObject(); pDrView->ShowMarkHdl(NULL); } else |