[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/app/swdll.cxx    |    3 ---
 sw/source/uibase/app/swmodule.cxx |    4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 265e3fa0d81099719a911893569d53a7e5318988
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 13 16:25:48 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Mar 13 16:28:51 2019 +0200

    tdf#124057: Do call RegisterControls() on non-DESKTOP
    
    Otherwise the Tools > Word Count dialog doesn't show up in the iOS
    app.
    
    Change-Id: Ic425749cc8f3245d7a16d7784d77b02f6d47253f

diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index a126f56524ea..399d56d4ffc7 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <memory>
-#include <config_features.h>
 
 #include <svx/svdobj.hxx>
 
@@ -133,10 +132,8 @@ SwDLL::SwDLL()
     // register your shell-interfaces here
     RegisterInterfaces();
 
-#if HAVE_FEATURE_DESKTOP
     // register your controllers here
     RegisterControls();
-#endif
 
     if (!utl::ConfigManager::IsFuzzing())
     {
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index a9844d5bb039..e6132e8d4bd9 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -371,10 +371,10 @@ void SwDLL::RegisterControls()
 
     SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
     SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
-
+#if HAVE_FEATURE_AVMEDIA
     ::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod);
     ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod);
-
+#endif
     ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
 
     SwJumpToSpecificPageControl::RegisterControl(SID_JUMP_TO_SPECIFIC_PAGE, pMod);