diff options
author | Iain Billett <iainbillett@gmail.com> | 2012-08-06 14:38:44 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-07 15:24:25 +0100 |
commit | 95ef04b5364845f41d9484905e70ba09a018950d (patch) | |
tree | 9b4fc6fc6e3fdef5c8390aedf4f60a8aba47faf1 /android | |
parent | 36e1debe4ad0c8a58095501ead01993bd8c120d5 (diff) |
Fixed problems after rebase.
Change-Id: I7fa1dedd33e3ef59a99112e4ddc73e9ac38e7752
Diffstat (limited to 'android')
-rw-r--r-- | android/experimental/LibreOffice4Android/jni/Application.mk | 2 | ||||
-rw-r--r-- | android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/android/experimental/LibreOffice4Android/jni/Application.mk b/android/experimental/LibreOffice4Android/jni/Application.mk index 9b408d093282..a11b28debc0c 100644 --- a/android/experimental/LibreOffice4Android/jni/Application.mk +++ b/android/experimental/LibreOffice4Android/jni/Application.mk @@ -1,2 +1,2 @@ -APP_ABI := x86 +APP_ABI := armeabi-v7a APP_PLATFORM := android-14 diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java index f69d26299280..2e731a5a5465 100644 --- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java +++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java @@ -1127,11 +1127,7 @@ public class DocumentLoader bmp.compress(Bitmap.CompressFormat.PNG, 40, bytes); thumbnailFile.createNewFile(); FileOutputStream fo = new FileOutputStream( thumbnailFile ); - fo.write(bytes.toByteArray());*/ - if( !thumbnailFile.isFile() ) - thumbnailFile.createNewFile(); - FileOutputStream fo = new FileOutputStream( thumbnailFile ); - bmp.compress(Bitmap.CompressFormat.PNG, 40, fo); + fo.write(bytes.toByteArray()); } catch (IOException e) { // TODO: handle exception } |