[Libreoffice-commits] core.git: 3 commits - android/source sw/qa

[Markus Mohrhard]

 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |    2 +-
 android/source/src/java/org/libreoffice/PresentationActivity.java    |    4 ++--
 sw/qa/extras/uiwriter/uiwriter.cxx                                   |    2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 17c7b7406d228488997ba6ddfc30ea3edc5336ff
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jul 23 21:39:13 2017 +0200

    these tests depend on our additional fonts
    
    Change-Id: I327047afbf05afb152d03669e67ba19a210cb0b7
    Reviewed-on: https://gerrit.libreoffice.org/40338
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 779cc46a1293..23bd72be9de1 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5006,6 +5006,7 @@ void SwUiWriterTest::testLinesInSectionInTable()
     assertXPath(pXmlDoc, "/root/page[2]/body/tab/row/cell/section", 1);
 }
 
+#if HAVE_MORE_FONTS
 void SwUiWriterTest::testLinesMoveBackwardsInSectionInTable()
 {
 #ifndef MACOSX
@@ -5058,6 +5059,7 @@ void SwUiWriterTest::testTableInNestedSection()
     assertXPath(pXmlDoc, "//page[1]//section/tab", 1);
     assertXPath(pXmlDoc, "//page[2]//section/tab", 1);
 }
+#endif
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 2cba4ea9672f1c308f7c5fa09ca775b77cdebf53
Author: Ximeng Zu <uznomis at yahoo.com>
Date:   Tue Jul 11 22:34:00 2017 -0500

    [Android Viewer] Fix crash after save dialog
    
    Fixed the crash after save dialog caused by
    a possible null pointer related to presentation
    mode.
    
    Change-Id: I2fcf254f4382eaa5b565e25679486a5158d56eac
    Reviewed-on: https://gerrit.libreoffice.org/39847
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 95c90de9b69a..8354dca63aa3 100755
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -414,7 +414,7 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin
                 // noinspection ResultOfMethodCallIgnored
                 mTempFile.delete();
             }
-            if (mTempSlideShowFile.exists()) {
+            if (mTempSlideShowFile != null && mTempSlideShowFile.exists()) {
                 // noinspection ResultOfMethodCallIgnored
                 mTempSlideShowFile.delete();
             }
commit cb79eba9be4edb6c78e7c8bba491ed7ff98227bb
Author: Ximeng Zu <uznomis at yahoo.com>
Date:   Tue Jul 11 11:51:17 2017 -0500

    [Android Viewer] Correct typo of class name
    
    Corrected the accidentally named inner class in
    PresentationActivity.java from camel case to
    Upper case.
    
    Change-Id: I0c27efe371611959e40cd656628a0fa2c9c0cdce
    Reviewed-on: https://gerrit.libreoffice.org/39832
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/android/source/src/java/org/libreoffice/PresentationActivity.java b/android/source/src/java/org/libreoffice/PresentationActivity.java
index 1eea5e3836fb..ae14796e9ee3 100644
--- a/android/source/src/java/org/libreoffice/PresentationActivity.java
+++ b/android/source/src/java/org/libreoffice/PresentationActivity.java
@@ -82,7 +82,7 @@ public class PresentationActivity extends AppCompatActivity {
         // set up presentation_gesture_view
         mGestureView = findViewById(R.id.presentation_gesture_view);
         final GestureDetectorCompat gestureDetector =
-                new GestureDetectorCompat(this, new presentationGestureViewListener());
+                new GestureDetectorCompat(this, new PresentationGestureViewListener());
         mGestureView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
@@ -94,7 +94,7 @@ public class PresentationActivity extends AppCompatActivity {
         mWebView.loadUrl(filePath);
     }
 
-    private class presentationGestureViewListener extends GestureDetector.SimpleOnGestureListener {
+    private class PresentationGestureViewListener extends GestureDetector.SimpleOnGestureListener {
         private static final int SWIPE_VELOCITY_THRESHOLD = 100;
         private static final int SCROLL_THRESHOLD = 10; // if scrollCounter is larger than this, a page switch is triggered
         private int scrollCounter = 0; // a counter for measuring scrolling distance