[Libreoffice-commits] core.git: 3 commits - external/libpng oox/source solenv/bin

[Libreoffice Gerrit user]

 external/libpng/StaticLibrary_libpng.mk     |    2 +-
 oox/source/ppt/soundactioncontext.cxx       |    4 ++++
 oox/source/ppt/timetargetelementcontext.cxx |    7 ++++++-
 solenv/bin/native-code.py                   |    1 -
 4 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit b1fc81bed49dfa5b3aa6efa225273e1c0c873139
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Feb 12 15:28:53 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Feb 12 15:30:47 2019 +0200

    The ARM Neon stuff is needed for ARM64, too (iOS at least)
    
    Not sure why the code has now started to require that, even if have
    used the same bundled libpng as for a long time.
    
    Change-Id: I2da223bc46c24563ce9d170643c28cc5c93f7d56

diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
index f500720616a2..dbbc3848c541 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
 	UnpackedTarball/libpng/pngwrite \
 	UnpackedTarball/libpng/pngwtran \
 	UnpackedTarball/libpng/pngwutil \
-	$(if $(filter ARM,$(CPUNAME)),\
+	$(if $(filter ARM ARM64,$(CPUNAME)),\
 	    UnpackedTarball/libpng/arm/arm_init \
 	    UnpackedTarball/libpng/arm/filter_neon_intrinsics \
 	) \
commit 7f71294ba699e509e64d03878c2dddbad62264eb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Feb 12 15:24:59 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Feb 12 15:30:41 2019 +0200

    makeSvTabListBox is gone now
    
    Change-Id: Idc42c0649279cb710ca1dbf1a9a67da4d006c735

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0c26a25b3530..557c67d56aa7 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -504,7 +504,6 @@ custom_widgets = [
     'SuggestionDisplay',
     'SuggestionEdit',
     'SvSimpleTableContainer',
-    'SvTabListBox',
     'SvTreeListBox',
     'SvtFileView',
     'SvtIconChoiceCtrl',
commit 14eea8a7ad790a96e070247d7561eb42febdf6f8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Feb 12 15:14:24 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Feb 12 15:30:41 2019 +0200

    Fix build without HAVE_FEATURE_AVMEDIA (iOS at least)
    
    Change-Id: I72d7c7478eba13db93cb88b86e911163c38b312b

diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx
index 51b2c771867c..33f250a89d84 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <oox/ppt/soundactioncontext.hxx>
 
 #include <cppuhelper/exc_hlp.hxx>
@@ -56,6 +58,7 @@ namespace oox { namespace ppt {
             if( mbHasStartSound )
             {
                 OUString url;
+#if HAVE_FEATURE_AVMEDIA
                 if ( !msSndName.isEmpty() )
                 {
                     Reference<css::io::XInputStream>
@@ -66,6 +69,7 @@ namespace oox { namespace ppt {
                         xInputStream->closeInput();
                     }
                 }
+#endif
                 if ( !url.isEmpty() )
                 {
                     maSlideProperties.setProperty( PROP_Sound, url);
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 0f17e4bf5be5..43f10ee05df9 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "timetargetelementcontext.hxx"
 
 #include <cppuhelper/exc_hlp.hxx>
@@ -125,8 +127,10 @@ namespace oox { namespace ppt {
             return this;
         case PPT_TOKEN( sndTgt ):
         {
-            OUString srcFile = drawingml::getEmbeddedWAVAudioFile(getRelations(), rAttribs);
             mpTarget->mnType = XML_sndTgt;
+
+#if HAVE_FEATURE_AVMEDIA
+            OUString srcFile = drawingml::getEmbeddedWAVAudioFile(getRelations(), rAttribs);
             Reference<css::io::XInputStream>
                 xInputStream = getFilter().openInputStream(srcFile);
 
@@ -135,6 +139,7 @@ namespace oox { namespace ppt {
                 ::avmedia::EmbedMedia(getFilter().getModel(), srcFile, mpTarget->msValue, xInputStream);
                 xInputStream->closeInput();
             }
+#endif
             break;
         }
         case PPT_TOKEN( spTgt ):