[Libreoffice-commits] .: Branch 'feature/androidapp' - android/qa vcl/android

[Libreoffice Gerrit user]

 android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java |    2 +-
 vcl/android/androidinst.cxx                                            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff8d7c587bd6ae56bb6136ac42cab89f518fa7cb
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Dec 17 12:18:00 2012 +0000

    fixup stride issue.

diff --git a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
index f0956b4..287dbb6 100644
--- a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
+++ b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
@@ -309,7 +309,7 @@ public class LODesktop
         }
 
         @Override protected void onDraw(Canvas canvas) {
-            canvas.drawColor(0xFF1ABCDD);
+//            canvas.drawColor(0xFF1ABCDD);
 
             mDesktop.renderVCL(mBitmap);
             canvas.drawBitmap(mBitmap, 0, 0, null);
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 44be265..85b8a0f 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -935,7 +935,7 @@ typedef struct ANativeWindow_Buffer {
     ANativeWindow_Buffer dummyOut; // look like a window for now ...
     dummyOut.width = info.width;
     dummyOut.height = info.height;
-    dummyOut.stride = info.stride;
+    dummyOut.stride = info.stride / 4; // sigh !
     dummyOut.format = info.format;
     dummyOut.bits = pixels;
     AndroidSalInstance::getInstance()->RedrawWindows (NULL, &dummyOut);