svx/Library_svx.mk | 2 +- svx/source/sidebar/PanelFactory.cxx | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 443389343c64887ff720c97ac1c2adfd18cf0edd Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon Jun 24 14:27:19 2019 +0900 Commit: Andras Timar <[email protected]> CommitDate: Tue Sep 3 13:43:08 2019 +0200 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/74617 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> (cherry picked from commit 293df527fc50cc11314be2adc190bec8159bc397) Reviewed-on: https://gerrit.libreoffice.org/78450 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index b9acb5e380e5..8c42eca33130 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -202,7 +202,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 4eb6270dab2f..2cd676fd5e2d 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" @@ -26,7 +28,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> @@ -155,10 +159,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)); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
