[Libreoffice-commits] .: sw/source sw/uiconfig

[Thomas Arnhold]

 sw/source/ui/app/swmodule.cxx            |    2 --
 sw/source/ui/uiview/view0.cxx            |    2 --
 sw/uiconfig/sglobal/menubar/menubar.xml  |    1 -
 sw/uiconfig/sweb/menubar/menubar.xml     |    1 -
 sw/uiconfig/swform/menubar/menubar.xml   |    1 -
 sw/uiconfig/swreport/menubar/menubar.xml |    1 -
 sw/uiconfig/swriter/menubar/menubar.xml  |    1 -
 sw/uiconfig/swxform/menubar/menubar.xml  |    1 -
 8 files changed, 10 deletions(-)

New commits:
commit 218173c2bce790170ba099888f5ec2f08b1b5bc4
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 22 21:31:04 2011 +0100

    Remove Tools -> Media Player from Writer

diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 616ad54..a9a6ae4 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -130,7 +130,6 @@
 #include <editeng/acorrcfg.hxx>
 #include <unotools/moduleoptions.hxx>
 
-#include <avmedia/mediaplayer.hxx>
 #include <avmedia/mediatoolbox.hxx>
 
 #include <annotsh.hxx>
@@ -423,7 +422,6 @@ void SwDLL::RegisterControls()
     GalleryChildWindow::RegisterChildWindow(0, pMod);
 
     ::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod);
-    ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
 
     SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
     ::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pMod );
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 6c76749..d8c46f4 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -47,7 +47,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <uivwimp.hxx>
-#include <avmedia/mediaplayer.hxx>
 #include <swmodule.hxx>
 
 #include <sfx2/objface.hxx>
@@ -121,7 +120,6 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
     SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT);
     SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG);
     SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId());
-    SFX_CHILDWINDOW_REGISTRATION(::avmedia::MediaPlayer::GetChildWindowId());
     SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY);
         SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS,           CHILDWIN_LABEL    );
         SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_MAILMERGE_CHILDWINDOW, CHILDWIN_MAILMERGE);
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 8cd46b6..fb15ddc 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -402,7 +402,6 @@
       <menu:menuitem menu:id=".uno:FootnoteDialog"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Gallery"/>
-      <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:BibliographyComponent"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index fa417a6..823f9be 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -345,7 +345,6 @@
       <menu:menuitem menu:id=".uno:FootnoteDialog"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Gallery"/>
-      <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:BibliographyComponent"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index cc8b013..7e6af86 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -398,7 +398,6 @@
       <menu:menuitem menu:id=".uno:FootnoteDialog"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Gallery"/>
-      <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:BibliographyComponent"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index cc8b013..7e6af86 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -398,7 +398,6 @@
       <menu:menuitem menu:id=".uno:FootnoteDialog"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Gallery"/>
-      <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:BibliographyComponent"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 58422d9..ce16b1a 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -406,7 +406,6 @@
       <menu:menuitem menu:id=".uno:FootnoteDialog"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Gallery"/>
-      <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:BibliographyComponent"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 32df447..1cebe43 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -399,7 +399,6 @@
       <menu:menuitem menu:id=".uno:FootnoteDialog"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Gallery"/>
-      <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:BibliographyComponent"/>
       <menu:menuseparator/>