[Libreoffice-commits] .: android/Bootstrap

Tor Lillqvist tml at kemper.freedesktop.org
Wed Jan 11 04:35:38 PST 2012


 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3267d34fb9f57e8a4549b8fb9e8c362a64447cfc
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Jan 11 14:18:20 2012 +0200

    Need to trim trailing newline from the indirect command line string

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 9cd9c3b..f8331ac 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -120,7 +120,7 @@ public class Bootstrap extends NativeActivity
             if (indirectFile != null) {
                 try {
                     // Somewhat stupid but short way to read a file into a string
-                    cmdLine = new Scanner(new File(indirectFile), "UTF-8").useDelimiter("\\A").next();
+                    cmdLine = new Scanner(new File(indirectFile), "UTF-8").useDelimiter("\\A").next().trim();
                 }
                 catch (java.io.FileNotFoundException e) {
                     Log.i(TAG, String.format("Could not read %s: %s",indirectFile, e.toString()));


More information about the Libreoffice-commits mailing list