[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 3 commits - android/source

[Christian Lohmaier]

 android/source/src/java/org/libreoffice/FormattingController.java |    8 ++++----
 android/source/src/java/org/libreoffice/ui/FileUtilities.java     |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f71dfdc54085fac835bd0199c4776a0b576c473d
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Nov 21 14:54:43 2015 +0100

    android: another part where underline and strikethrough commands were swapped
    
    Change-Id: I8fdde4b46e3e315a5b6a35cabc4495ebf69db057
    (cherry picked from commit 6f5589d5ed1e42512a04658ce57f1088b1fc1757)

diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/source/src/java/org/libreoffice/FormattingController.java
index bec4ea1..be8639b 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -51,10 +51,10 @@ public class FormattingController implements View.OnClickListener {
                 LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Italic"));
                 break;
             case R.id.button_strikethrough:
-                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Underline"));
+                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Strikeout"));
                 break;
             case R.id.button_underlined:
-                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Strikeout"));
+                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Underline"));
                 break;
             case R.id.button_align_left:
                 LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:LeftPara"));
commit 1dcb91f2fc59e6c834d3a150ac35b8ae8305b6de
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Nov 21 10:51:40 2015 +0100

    android: underline and strikethrough commands were swapped
    
    Change-Id: Id7157ea5fadd684dceec52f69ec9279c4107b5f1
    (cherry picked from commit 9feffdbe0d588fb8307e35737150a16d18ee8595)

diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/source/src/java/org/libreoffice/FormattingController.java
index 26ea085..bec4ea1 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -85,10 +85,10 @@ public class FormattingController implements View.OnClickListener {
                         buttonId = R.id.button_italic;
                         break;
                     case Document.UNDERLINE:
-                        buttonId = R.id.button_strikethrough;
+                        buttonId = R.id.button_underlined;
                         break;
                     case Document.STRIKEOUT:
-                        buttonId = R.id.button_underlined;
+                        buttonId = R.id.button_strikethrough;
                         break;
                     case Document.ALIGN_LEFT:
                         buttonId = R.id.button_align_left;
commit 6ae0e7cdf1115324404846fd2cc91beb8a987761
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 17 14:52:00 2015 +0000

    android: don't crash on empty filelist
    
    Change-Id: I46caceed3fdf0ad0aa51c8a8ede1177ca3d1855e
    (cherry picked from commit 506432f505b41e7f5b29cf8492caab4545a4548c)

diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
index ce3953e..ba9e46c 100644
--- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java
+++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
@@ -200,6 +200,8 @@ public class FileUtilities {
     }
 
     static void sortFiles(List<IFile> files, int sortMode) {
+        if (files == null)
+            return;
         switch (sortMode) {
             case SORT_AZ:
                 Collections.sort(files , new Comparator<IFile>() {