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

[Thomas Arnhold]

 sw/source/ui/app/swmodule.cxx        |    2 ++
 sw/source/ui/uiview/view0.cxx        |    2 ++
 sw/uiconfig/sweb/menubar/menubar.xml |    1 +
 3 files changed, 5 insertions(+)

New commits:
commit cb124e782b5d11d97560dc0de721a3c4482aea5a
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Feb 25 12:28:23 2011 +0100

    Revert Remove Tools -> Media Player from Writer
    
    Bring background calls back, so anyone who needs this could add
    add a working Media Player with Customize -> Menus. Bring back
    Media Player back for web per default.

diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index a9a6ae4..616ad54 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -130,6 +130,7 @@
 #include <editeng/acorrcfg.hxx>
 #include <unotools/moduleoptions.hxx>
 
+#include <avmedia/mediaplayer.hxx>
 #include <avmedia/mediatoolbox.hxx>
 
 #include <annotsh.hxx>
@@ -422,6 +423,7 @@ 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 d8c46f4..6c76749 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -47,6 +47,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <uivwimp.hxx>
+#include <avmedia/mediaplayer.hxx>
 #include <swmodule.hxx>
 
 #include <sfx2/objface.hxx>
@@ -120,6 +121,7 @@ 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/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 823f9be..fa417a6 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -345,6 +345,7 @@
       <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/>