summaryrefslogtreecommitdiff
path: root/sd/source/ui/app/sddll.cxx
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2017-10-09 19:10:13 +0200
committerjan Iversen <jani@libreoffice.org>2017-10-09 19:13:55 +0200
commit64b3b366da326ca4eeb42c8c6195f21e2c563663 (patch)
tree1c0a9267227009dadb6abb76eb9557608912c239 /sd/source/ui/app/sddll.cxx
parentd9675f7a9b99b7d729b3d5318b905aaf5b2aedec (diff)
sd, implement HAVE_FEATURE_AVMEDIA
iOS does not support avmedia, therefore HAVE_FEATURE_AVMEDIA is set, however not all sources test for it. Change-Id: I7315dce08fef6e18c026d628c87d29ca201b1f8a
Diffstat (limited to 'sd/source/ui/app/sddll.cxx')
-rw-r--r--sd/source/ui/app/sddll.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 4e2c083d27d8..34c64345caf5 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <avmedia/mediaplayer.hxx>
#include <avmedia/mediatoolbox.hxx>
#include <editeng/eeitem.hxx>
@@ -173,7 +175,9 @@ void SdDLL::RegisterControllers(SdModule* pMod)
SvxIMapDlgChildWindow::RegisterChildWindow(false, pMod);
SvxHlinkDlgWrapper::RegisterChildWindow(false, pMod);
::sd::SpellDialogChildWindow::RegisterChildWindow(false, pMod);
+#if HAVE_FEATURE_AVMEDIA
::avmedia::MediaPlayer::RegisterChildWindow(false, pMod);
+#endif
::sd::LeftPaneImpressChildWindow::RegisterChildWindow(false, pMod);
::sd::LeftPaneDrawChildWindow::RegisterChildWindow(false, pMod);
::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
@@ -221,7 +225,9 @@ void SdDLL::RegisterControllers(SdModule* pMod)
svx::TextCharacterSpacingPopup::RegisterControl(SID_ATTR_CHAR_KERNING, pMod);
svx::TextUnderlinePopup::RegisterControl(SID_ATTR_CHAR_UNDERLINE, pMod);
+#if HAVE_FEATURE_AVMEDIA
::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod );
+#endif
XmlSecStatusBarControl::RegisterControl( SID_SIGNATURE, pMod );
SdTemplateControl::RegisterControl( SID_STATUS_LAYOUT, pMod );
SvxTableToolBoxControl::RegisterControl(SID_INSERT_TABLE, pMod );