sd/source/ui/animations/CustomAnimationDialog.cxx | 4 ++++
solenv/bin/native-code.py | 1 +
2 files changed, 5 insertions(+)
New commits:
commit a52f8c9e0a279303436b9dc427cd693caf1e13c7
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed Oct 9 09:31:52 2019 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Oct 9 12:46:07 2019 +0200
make impress sidebar work on iOS - missing PanelFactory
add org_openoffice_comp_Draw_framework_PanelFactory_get_implementation
make it build
Reviewed-on: https://gerrit.libreoffice.org/80514
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 400cc072ab8498048aad7d07930e1503bb1a0406)
Change-Id: I738fe4c2d08437986976eaa29483c30a5ba42e62
Reviewed-on: https://gerrit.libreoffice.org/80531
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index d8b2baa6e533..09552e8cbf27 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <com/sun/star/presentation/EffectNodeType.hpp>
#include <com/sun/star/animations/Timing.hpp>
#include <com/sun/star/animations/Event.hpp>
@@ -2243,6 +2245,7 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
void CustomAnimationEffectTabPage::onSoundPreview()
{
+#if HAVE_FEATURE_AVMEDIA
const auto nPos = mxLBSound->get_active();
if( nPos >= 2 ) try
@@ -2255,6 +2258,7 @@ void CustomAnimationEffectTabPage::onSoundPreview()
{
OSL_FAIL("CustomAnimationEffectTabPage::onSoundPreview(), exception
caught!" );
}
+#endif
}
class CustomAnimationDurationTabPage
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 794f236ddd86..b5fbdfbfc5d0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -383,6 +383,7 @@ draw_constructor_list = [
"com_sun_star_comp_Draw_framework_ResourceID_get_implementation",
"com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation",
"com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation",
+ "org_openoffice_comp_Draw_framework_PanelFactory_get_implementation",
# sd/util/sdd.component
"com_sun_star_comp_draw_FormatDetector_get_implementation",
# sd/util/sdfilt.component
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
