LOAndroid3: log and handle error after document load

Change-Id: I0486a6530565919588dae8411e10d7e8e27020be

1 files changed, 14 insertions, 2 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index f5b44f773040..e7931582f93a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -1,6 +1,7 @@
 package org.libreoffice;
 
 import android.graphics.Bitmap;
+import android.util.Log;
 
 import org.libreoffice.kit.Document;
 import org.libreoffice.kit.LibreOfficeKit;
@@ -13,6 +14,8 @@ import org.mozilla.gecko.gfx.SubTile;
 import java.nio.ByteBuffer;
 
 public class LOKitTileProvider implements TileProvider {
+    private static final String LOGTAG = LOKitShell.class.getSimpleName();
+
     private final LayerController mLayerController;
 
     public static int TILE_SIZE = 256;
@@ -40,10 +43,19 @@ public class LOKitTileProvider implements TileProvider {
         LibreOfficeKit.init(LibreOfficeMainActivity.mAppContext);
 
         mOffice = new Office(LibreOfficeKit.getLibreOfficeKitHandle());
+
         mDocument = mOffice.documentLoad(input);
 
-        mTileWidth  = pixelToTwip(TILE_SIZE, mDPI);
-        mTileHeight = pixelToTwip(TILE_SIZE, mDPI);
+        if(mDocument == null) {
+            Log.e(LOGTAG, "Error: " + mOffice.getError());
+        } else {
+            Log.i(LOGTAG, "Document parts: " + mDocument.getParts());
+            if (mDocument.getParts() >= 1) {
+                mDocument.setPart(1);
+            }
+            mTileWidth = pixelToTwip(TILE_SIZE, mDPI);
+            mTileHeight = pixelToTwip(TILE_SIZE, mDPI);
+        }
     }
 
     @Override