From 3267d34fb9f57e8a4549b8fb9e8c362a64447cfc Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Wed, 11 Jan 2012 14:18:20 +0200
Subject: [PATCH] Need to trim trailing newline from the indirect command line
 string

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

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 9cd9c3bcef82..f8331acf1573 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()));