diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-06-24 14:27:19 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-06-24 14:12:24 +0200 |
| commit | dbed4a84189f4b349162b518ca2d211ba4c89404 (patch) | |
| tree | 0a1ef9e8d163c1b446ffd9236832d172041d39be /svx | |
| parent | cf5a3cb687a502e7f71cefb5f7001a73925bee56 (diff) | |
don't compile MediaPlaybackPanel if we don't have avmedia
This sidebar panel causes missing symbols when compiling for ios,
where we disable avmedia support.
Change-Id: Ib79a6debc27e5d5be4b4c388077ac1a3bf8c97b4
Reviewed-on: https://gerrit.libreoffice.org/74626
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svx.mk | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/PanelFactory.cxx | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 6589179eb025..a3a2cec79a1d 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -204,7 +204,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/sidebar/line/LinePropertyPanelBase \ svx/source/sidebar/line/LineWidthValueSet \ svx/source/sidebar/line/LineWidthPopup \ - svx/source/sidebar/media/MediaPlaybackPanel \ + $(call gb_Helper_optional,AVMEDIA,svx/source/sidebar/media/MediaPlaybackPanel) \ svx/source/sidebar/possize/PosSizePropertyPanel \ svx/source/sidebar/possize/SidebarDialControl \ svx/source/sidebar/shapes/DefaultShapesPanel \ diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index deabe5f4adb2..304ec88328dd 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "text/TextPropertyPanel.hxx" #include "styles/StylesPropertyPanel.hxx" #include "paragraph/ParaPropertyPanel.hxx" @@ -27,7 +29,9 @@ #include "line/LinePropertyPanel.hxx" #include "possize/PosSizePropertyPanel.hxx" #include <DefaultShapesPanel.hxx> +#if HAVE_FEATURE_AVMEDIA #include "media/MediaPlaybackPanel.hxx" +#endif #include <GalleryControl.hxx> #include "EmptyPanel.hxx" #include <sfx2/sidebar/SidebarPanelBase.hxx> @@ -160,10 +164,12 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( { pControl = DefaultShapesPanel::Create(pParentWindow, xFrame); } +#if HAVE_FEATURE_AVMEDIA else if (rsResourceURL.endsWith("/MediaPlaybackPanel")) { pControl = MediaPlaybackPanel::Create(pParentWindow, xFrame, pBindings); } +#endif else if (rsResourceURL.endsWith("/GalleryPanel")) { pControl.reset(VclPtr<GalleryControl>::Create(pParentWindow)); |