Kaydet (Commit) 1d78c73b authored tarafından Thomas Arnhold's avatar Thomas Arnhold

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.
üst 34997ca8
...@@ -130,6 +130,7 @@ ...@@ -130,6 +130,7 @@
#include <editeng/acorrcfg.hxx> #include <editeng/acorrcfg.hxx>
#include <unotools/moduleoptions.hxx> #include <unotools/moduleoptions.hxx>
#include <avmedia/mediaplayer.hxx>
#include <avmedia/mediatoolbox.hxx> #include <avmedia/mediatoolbox.hxx>
#include <annotsh.hxx> #include <annotsh.hxx>
...@@ -422,6 +423,7 @@ void SwDLL::RegisterControls() ...@@ -422,6 +423,7 @@ void SwDLL::RegisterControls()
GalleryChildWindow::RegisterChildWindow(0, pMod); GalleryChildWindow::RegisterChildWindow(0, pMod);
::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod); ::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod);
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod); SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pMod ); ::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pMod );
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <sfx2/viewfrm.hxx> #include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx> #include <sfx2/bindings.hxx>
#include <uivwimp.hxx> #include <uivwimp.hxx>
#include <avmedia/mediaplayer.hxx>
#include <swmodule.hxx> #include <swmodule.hxx>
#include <sfx2/objface.hxx> #include <sfx2/objface.hxx>
...@@ -120,6 +121,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) ...@@ -120,6 +121,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT); SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT);
SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG); SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG);
SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(::avmedia::MediaPlayer::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY); SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY);
SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS, CHILDWIN_LABEL ); SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS, CHILDWIN_LABEL );
SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_MAILMERGE_CHILDWINDOW, CHILDWIN_MAILMERGE); SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_MAILMERGE_CHILDWINDOW, CHILDWIN_MAILMERGE);
......
...@@ -345,6 +345,7 @@ ...@@ -345,6 +345,7 @@
<menu:menuitem menu:id=".uno:FootnoteDialog"/> <menu:menuitem menu:id=".uno:FootnoteDialog"/>
<menu:menuseparator/> <menu:menuseparator/>
<menu:menuitem menu:id=".uno:Gallery"/> <menu:menuitem menu:id=".uno:Gallery"/>
<menu:menuitem menu:id=".uno:AVMediaPlayer"/>
<menu:menuseparator/> <menu:menuseparator/>
<menu:menuitem menu:id=".uno:BibliographyComponent"/> <menu:menuitem menu:id=".uno:BibliographyComponent"/>
<menu:menuseparator/> <menu:menuseparator/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment