Kaydet (Commit) 265e3fa0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 9efe3886
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
*/ */
#include <memory> #include <memory>
#include <config_features.h>
#include <svx/svdobj.hxx> #include <svx/svdobj.hxx>
...@@ -133,10 +132,8 @@ SwDLL::SwDLL() ...@@ -133,10 +132,8 @@ SwDLL::SwDLL()
// register your shell-interfaces here // register your shell-interfaces here
RegisterInterfaces(); RegisterInterfaces();
#if HAVE_FEATURE_DESKTOP
// register your controllers here // register your controllers here
RegisterControls(); RegisterControls();
#endif
if (!utl::ConfigManager::IsFuzzing()) if (!utl::ConfigManager::IsFuzzing())
{ {
......
...@@ -371,10 +371,10 @@ void SwDLL::RegisterControls() ...@@ -371,10 +371,10 @@ void SwDLL::RegisterControls()
SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod); SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod); SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
#if HAVE_FEATURE_AVMEDIA
::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod); ::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod);
::avmedia::MediaPlayer::RegisterChildWindow(false, pMod); ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod);
#endif
::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod); ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
SwJumpToSpecificPageControl::RegisterControl(SID_JUMP_TO_SPECIFIC_PAGE, pMod); SwJumpToSpecificPageControl::RegisterControl(SID_JUMP_TO_SPECIFIC_PAGE, pMod);
......
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