[Libreoffice-commits] core.git: android/experimental

[Tor Lillqvist]

 android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java |   13 +++-------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 754bd309dd346f9930a6ede418ab01fcfa5f74f9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Feb 22 20:46:27 2013 +0200

    BitmapView can be a member class
    
    Change-Id: I172cfc0bcad780e99469ac01c9ba7467befe53de

diff --git a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
index 6087528..3bf2da9 100644
--- a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
+++ b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
@@ -287,31 +287,28 @@ public class Desktop
         }
 
         Log.i(TAG, "onCreate - set content view\n");
-        setContentView(new BitmapView(this, this));
+        setContentView(new BitmapView());
     }
-}
 
     class BitmapView extends android.view.View
     {
-        Desktop mDesktop;
         Bitmap mBitmap;
 
-        public BitmapView(Context context, Desktop desktop)
+        public BitmapView()
         {
-            super(context);
-            mDesktop = desktop;
+            super(Desktop.this);
             mBitmap = Bitmap.createBitmap(1000, 600, Bitmap.Config.ARGB_8888);
         }
 
         @Override protected void onDraw(Canvas canvas) {
 //            canvas.drawColor(0xFF1ABCDD);
 
-            mDesktop.renderVCL(mBitmap);
+            renderVCL(mBitmap);
             canvas.drawBitmap(mBitmap, 0, 0, null);
 
             // re-call ourselves a bit later ...
             invalidate();
         }
     }
-
+}
 // vim:set shiftwidth=4 softtabstop=4 expandtab: