android: remove unneeded layerView stuff

Change-Id: Ide81f4b5dd7f71a3dda21ff51d02a12d7fe9a315

2 files changed, 3 insertions, 18 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
index bcf22b53499f..38b5dc121932 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
@@ -14,8 +14,8 @@ public abstract class SelectionHandle extends BitmapHandle {
     private static final long MINIMUM_HANDLE_UPDATE_TIME = 50 * 1000000;
 
     private final PointF mDragStartPoint = new PointF();
-    private long mLastTime = 0;
     private final PointF mDragDocumentPosition = new PointF();
+    private long mLastTime = 0;
 
     public SelectionHandle(Bitmap bitmap) {
         super(bitmap);
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
index 74a0dc3f4107..44d0d5100e06 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
@@ -127,15 +127,9 @@ public class TextCursorView extends View implements View.OnTouchListener {
      * @param selectionRects - list of text selection rectangles
      */
     public void changeSelections(List<RectF> selectionRects) {
-        LayerView layerView = LOKitShell.getLayerView();
-        if (layerView == null) {
-            Log.e(LOGTAG, "Can't position selections because layerView is null");
-            return;
-        }
-
         mSelections = selectionRects;
 
-        ImmutableViewportMetrics metrics = layerView.getViewportMetrics();
+        ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics();
         repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor);
     }
 
@@ -147,15 +141,10 @@ public class TextCursorView extends View implements View.OnTouchListener {
         if (RectUtils.fuzzyEquals(mGraphicSelection.mRectangle, rectangle)) {
             return;
         }
-        LayerView layerView = LOKitShell.getLayerView();
-        if (layerView == null) {
-            Log.e(LOGTAG, "Can't position selections because layerView is null");
-            return;
-        }
 
         mGraphicSelection.mRectangle = rectangle;
 
-        ImmutableViewportMetrics metrics = layerView.getViewportMetrics();
+        ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics();
         repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor);
     }
 
@@ -348,10 +337,6 @@ public class TextCursorView extends View implements View.OnTouchListener {
         return false;
     }
 
-    public void setLayerView(LayerView layerView) {
-        this.mLayerView = layerView;
-    }
-
     public void positionHandle(SelectionHandle.HandleType type, RectF position) {
         SelectionHandle handle = getHandleForType(type);
         if (RectUtils.fuzzyEquals(handle.mDocumentPosition, position)) {