diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-22 21:32:42 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-22 21:34:14 +0100 |
commit | a97a5b0015f2468b6b242bbb526e9afe6b436ec9 (patch) | |
tree | 520ed3c5df7c4c382c094ad1621e87dc991efb1a | |
parent | ef3ea4637c46834bcac809b5b22538c182b891cb (diff) |
Remove Tools -> Media Player from Calc
-rw-r--r-- | sc/source/ui/app/scdll.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh9.cxx | 15 | ||||
-rw-r--r-- | sc/uiconfig/scalc/menubar/menubar.xml | 1 |
4 files changed, 0 insertions, 19 deletions
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 0853fc5694b8..961176c3f892 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -290,7 +290,6 @@ void ScDLL::Init() SvxIMapDlgChildWindow ::RegisterChildWindow(FALSE, pMod); GalleryChildWindow ::RegisterChildWindow(FALSE, pMod); ScSpellDialogChildWindow ::RegisterChildWindow(FALSE, pMod); - ::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod); ScValidityRefChildWin::RegisterChildWindow(FALSE, pMod); diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 04195db0b261..677762efea9e 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -43,7 +43,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/app.hxx> -#include <avmedia/mediaplayer.hxx> #include "tabvwsh.hxx" #include "docsh.hxx" @@ -96,7 +95,6 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG); SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScSpellDialogChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION( ::avmedia::MediaPlayer::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION(ScValidityRefChildWin::GetChildWindowId()); } diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 9b9ab82a894a..defc10ad19a8 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -43,7 +43,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <svl/whiter.hxx> -#include <avmedia/mediaplayer.hxx> #include "tabvwsh.hxx" #include "viewdata.hxx" @@ -84,15 +83,6 @@ void ScTabViewShell::ExecChildWin(SfxRequest& rReq) rReq.Ignore(); } break; - - case SID_AVMEDIA_PLAYER: - { - SfxViewFrame* pThisFrame = GetViewFrame(); - pThisFrame->ToggleChildWindow( ::avmedia::MediaPlayer::GetChildWindowId() ); - pThisFrame->GetBindings().Invalidate( SID_AVMEDIA_PLAYER ); - rReq.Ignore(); - } - break; } } @@ -103,11 +93,6 @@ void ScTabViewShell::GetChildWinState( SfxItemSet& rSet ) USHORT nId = GalleryChildWindow::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_GALLERY, GetViewFrame()->HasChildWindow( nId ) ) ); } - else if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_AVMEDIA_PLAYER ) ) - { - USHORT nId = ::avmedia::MediaPlayer::GetChildWindowId(); - rSet.Put( SfxBoolItem( SID_AVMEDIA_PLAYER, GetViewFrame()->HasChildWindow( nId ) ) ); - } } //------------------------------------------------------------------ diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index d66671cb97a6..de5887ede041 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -367,7 +367,6 @@ </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:Gallery"/> - <menu:menuitem menu:id=".uno:AVMediaPlayer"/> <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> |