diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-08-12 08:30:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-08-12 08:30:19 +0000 |
| commit | 3d6b8cd96d21a27f1ee6ec7c11694b4642a0a89c (patch) | |
| tree | ab1cb4c4833dee9e7d3213fa80a88ce331ffed3d /sc/source/ui/view/drawview.cxx | |
| parent | 271c54cf4a6fe832fcf7c4d12fa301272d75fd82 (diff) | |
INTEGRATION: CWS jmf2 (1.24.72); FILE MERGED
2004/07/23 22:14:46 ka 1.24.72.2: RESYNC: (1.24-1.25); FILE MERGED
2004/07/22 18:35:54 ka 1.24.72.1: #i3316#: media support for calc
Diffstat (limited to 'sc/source/ui/view/drawview.cxx')
| -rw-r--r-- | sc/source/ui/view/drawview.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index f62580b013c1..96d8321ba67e 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawview.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: hr $ $Date: 2004-08-03 13:29:10 $ + * last change: $Author: obo $ $Date: 2004-08-12 09:30:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,7 @@ #include <svx/svditer.hxx> #include <svx/svdograf.hxx> +#include <svx/svdomedia.hxx> #include <svx/svdogrp.hxx> #include <svx/svdoole2.hxx> #include <svx/svdouno.hxx> @@ -536,6 +537,7 @@ void __EXPORT ScDrawView::MarkListHasChanged() SdrOle2Obj* pOle2Obj = NULL; SdrGrafObj* pGrafObj = NULL; + SdrMediaObj* pMediaObj = NULL; const SdrMarkList& rMarkList = GetMarkedObjectList(); ULONG nMarkCount = rMarkList.GetMarkCount(); @@ -567,6 +569,12 @@ void __EXPORT ScDrawView::MarkListHasChanged() pViewSh->SetGraphicShell(TRUE); bSubShellSet = TRUE; } + else if (pObj->GetObjIdentifier() == OBJ_MEDIA) + { + pMediaObj = (SdrMediaObj*) pObj; + pViewSh->SetMediaShell(TRUE); + bSubShellSet = TRUE; + } else if (pObj->GetObjIdentifier() != OBJ_TEXT // Verhindern, das beim Anlegen || !pViewSh->IsDrawTextShell()) // eines TextObjekts auf die { // DrawShell umgeschaltet wird. |