diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-08-12 08:28:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-08-12 08:28:09 +0000 |
| commit | 6121fa29c009a67b56d7f21fc90c28c1b2fff060 (patch) | |
| tree | 532bc5ffc22a267871e414883c3ec3cc020dd15e /sc/source/ui/app/scdll.cxx | |
| parent | 6455305247190d1eeb7e52a1fa649791678c77cf (diff) | |
INTEGRATION: CWS jmf2 (1.18.126); FILE MERGED
2004/07/23 12:56:47 ka 1.18.126.3: media cleanup
2004/07/22 18:35:51 ka 1.18.126.2: #i3316#: media support for calc
2004/07/19 10:43:37 ka 1.18.126.1: #i3316#: media support
Diffstat (limited to 'sc/source/ui/app/scdll.cxx')
| -rw-r--r-- | sc/source/ui/app/scdll.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index fb1177fc6193..67f2b6234f66 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -1,9 +1,9 @@ /* * $RCSfile: scdll.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2004-08-02 10:12:57 $ + * last change: $Author: obo $ $Date: 2004-08-12 09:28:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,8 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> +#include <avmedia/mediaplayer.hxx> +#include <avmedia/mediatoolbox.hxx> #include <comphelper/types.hxx> #ifndef _SVX_EXTRUSION_CONTROLS_HXX @@ -114,6 +116,7 @@ #include "oleobjsh.hxx" #include "chartsh.hxx" #include "graphsh.hxx" +#include "mediash.hxx" #include "pgbrksh.hxx" #include "docpool.hxx" @@ -269,6 +272,7 @@ void ScDLL::Init() ScOleObjectShell ::RegisterInterface(pMod); ScChartShell ::RegisterInterface(pMod); ScGraphicShell ::RegisterInterface(pMod); + ScMediaShell ::RegisterInterface(pMod); ScPageBreakShell ::RegisterInterface(pMod); // eigene Controller @@ -314,6 +318,9 @@ void ScDLL::Init() SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod); SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod); + //Media Controller + ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod ); + // Svx-StatusBar-Controller SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); @@ -365,6 +372,7 @@ void ScDLL::Init() SvxHyperlinkDlgWrapper ::RegisterChildWindow(FALSE, pMod); SvxIMapDlgChildWindow ::RegisterChildWindow(FALSE, pMod); GalleryChildWindow ::RegisterChildWindow(FALSE, pMod); + ::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod); // Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init |