Now get rid of the #if 0 blocks

Change-Id: I815cc4a703b7ca6d2894807396a06a3394b40676

1 files changed, 0 insertions, 444 deletions

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index c35321531fe1..187445057264 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -53,156 +53,6 @@ public:
     virtual bool ErrorTrapPop( bool ) { return false; }
 };
 
-#if 0  // Code from NativeActivity-based times left for reference inside #if 0 here and later
-
-static rtl::OString MotionEdgeFlagsToString(int32_t nFlags)
-{
-    rtl::OStringBuffer aStr;
-    if (nFlags == AMOTION_EVENT_EDGE_FLAG_NONE)
-        aStr.append ("no-edge");
-    if (nFlags & AMOTION_EVENT_EDGE_FLAG_TOP)
-        aStr.append (":top");
-    if (nFlags & AMOTION_EVENT_EDGE_FLAG_BOTTOM)
-        aStr.append (":bottom");
-    if (nFlags & AMOTION_EVENT_EDGE_FLAG_LEFT)
-        aStr.append (":left");
-    if (nFlags & AMOTION_EVENT_EDGE_FLAG_RIGHT)
-        aStr.append (":right");
-    return aStr.makeStringAndClear();
-}
-
-static rtl::OString KeyMetaStateToString(int32_t nFlags)
-{
-    rtl::OStringBuffer aStr;
-    if (nFlags == AMETA_NONE)
-        aStr.append ("no-meta");
-    if (nFlags & AMETA_ALT_ON)
-        aStr.append (":alt");
-    if (nFlags & AMETA_SHIFT_ON)
-        aStr.append (":shift");
-    if (nFlags & AMETA_SYM_ON)
-        aStr.append (":sym");
-    return aStr.makeStringAndClear();
-}
-
-static sal_uInt16 KeyMetaStateToCode(AInputEvent *event)
-{
-    sal_uInt16 nCode = 0;
-    int32_t nFlags = AKeyEvent_getMetaState(event);
-    if (nFlags & AMETA_SHIFT_ON)
-        nCode |= KEY_SHIFT;
-    if (nFlags & AMETA_SYM_ON)
-        nCode |= KEY_MOD1;
-    if (nFlags & AMETA_ALT_ON)
-        nCode |= KEY_MOD2;
-    return nCode;
-}
-
-static sal_uInt16 KeyToCode(AInputEvent *event)
-{
-    sal_uInt16 nCode = 0;
-    switch (AKeyEvent_getKeyCode(event)) {
-#define MAP(a,b)                                 \
-    case AKEYCODE_##a: nCode = KEY_##b; break
-#define MAP_SAME(a) MAP(a,a)
-
-    MAP_SAME(HOME);
-    MAP_SAME(0); MAP_SAME(1); MAP_SAME(2); MAP_SAME(3); MAP_SAME(4);
-    MAP_SAME(5); MAP_SAME(6); MAP_SAME(7); MAP_SAME(8); MAP_SAME(9);
-
-    MAP_SAME(A); MAP_SAME(B); MAP_SAME(C); MAP_SAME(D);
-    MAP_SAME(E); MAP_SAME(F); MAP_SAME(G); MAP_SAME(H);
-    MAP_SAME(I); MAP_SAME(J); MAP_SAME(K); MAP_SAME(L);
-    MAP_SAME(M); MAP_SAME(N); MAP_SAME(O); MAP_SAME(P);
-    MAP_SAME(Q); MAP_SAME(R); MAP_SAME(S); MAP_SAME(T);
-    MAP_SAME(U); MAP_SAME(V); MAP_SAME(W); MAP_SAME(X);
-    MAP_SAME(Y); MAP_SAME(Z);
-
-    MAP_SAME(TAB); MAP_SAME(SPACE); MAP_SAME(COMMA);
-
-    MAP(ENTER,RETURN);
-    MAP(PAGE_UP, PAGEUP);
-    MAP(PAGE_DOWN, PAGEDOWN);
-    MAP(DEL, DELETE);
-    MAP(PERIOD, POINT);
-
-    MAP(DPAD_UP, UP); MAP(DPAD_DOWN, DOWN);
-    MAP(DPAD_LEFT, LEFT); MAP(DPAD_RIGHT, RIGHT);
-
-    case AKEYCODE_BACK: // escape ?
-    case AKEYCODE_UNKNOWN:
-    case AKEYCODE_SOFT_LEFT:
-    case AKEYCODE_SOFT_RIGHT:
-    case AKEYCODE_CALL:
-    case AKEYCODE_ENDCALL:
-    case AKEYCODE_STAR:
-    case AKEYCODE_POUND:
-    case AKEYCODE_VOLUME_UP:
-    case AKEYCODE_VOLUME_DOWN:
-    case AKEYCODE_DPAD_CENTER:
-    case AKEYCODE_POWER:
-    case AKEYCODE_CAMERA:
-    case AKEYCODE_CLEAR:
-    case AKEYCODE_ALT_LEFT:
-    case AKEYCODE_ALT_RIGHT:
-    case AKEYCODE_SHIFT_LEFT:
-    case AKEYCODE_SHIFT_RIGHT:
-    case AKEYCODE_SYM:
-    case AKEYCODE_EXPLORER:
-    case AKEYCODE_ENVELOPE:
-    case AKEYCODE_GRAVE:
-    case AKEYCODE_MINUS:
-    case AKEYCODE_EQUALS:
-    case AKEYCODE_LEFT_BRACKET:
-    case AKEYCODE_RIGHT_BRACKET:
-    case AKEYCODE_BACKSLASH:
-    case AKEYCODE_SEMICOLON:
-    case AKEYCODE_APOSTROPHE:
-    case AKEYCODE_SLASH:
-    case AKEYCODE_AT:
-    case AKEYCODE_NUM:
-    case AKEYCODE_HEADSETHOOK:
-    case AKEYCODE_FOCUS: // not widget, but camera focus
-    case AKEYCODE_PLUS:
-    case AKEYCODE_MENU:
-    case AKEYCODE_NOTIFICATION:
-    case AKEYCODE_SEARCH:
-    case AKEYCODE_MEDIA_PLAY_PAUSE:
-    case AKEYCODE_MEDIA_STOP:
-    case AKEYCODE_MEDIA_NEXT:
-    case AKEYCODE_MEDIA_PREVIOUS:
-    case AKEYCODE_MEDIA_REWIND:
-    case AKEYCODE_MEDIA_FAST_FORWARD:
-    case AKEYCODE_MUTE:
-    case AKEYCODE_PICTSYMBOLS:
-    case AKEYCODE_SWITCH_CHARSET:
-    case AKEYCODE_BUTTON_A:
-    case AKEYCODE_BUTTON_B:
-    case AKEYCODE_BUTTON_C:
-    case AKEYCODE_BUTTON_X:
-    case AKEYCODE_BUTTON_Y:
-    case AKEYCODE_BUTTON_Z:
-    case AKEYCODE_BUTTON_L1:
-    case AKEYCODE_BUTTON_R1:
-    case AKEYCODE_BUTTON_L2:
-    case AKEYCODE_BUTTON_R2:
-    case AKEYCODE_BUTTON_THUMBL:
-    case AKEYCODE_BUTTON_THUMBR:
-    case AKEYCODE_BUTTON_START:
-    case AKEYCODE_BUTTON_SELECT:
-    case AKEYCODE_BUTTON_MODE:
-        LOGI("un-mapped keycode %d", nCode);
-        nCode = 0;
-        break;
-#undef MAP_SAME
-#undef MAP
-    }
-    LOGI("mapped %d -> %d", AKeyEvent_getKeyCode(event), nCode);
-    return nCode;
-}
-
-#endif
-
 static void BlitFrameRegionToWindow(ANativeWindow_Buffer *pOutBuffer,
                                     const basebmp::BitmapDeviceSharedPtr& aDev,
                                     const ARect &rSrcRect,
@@ -314,107 +164,12 @@ void AndroidSalInstance::damaged(AndroidSalFrame */* frame */)
         m_pJNIEnv->CallStaticVoidMethod(m_nDesktopClass, m_nCallbackDamaged);
 }
 
-#if 0
-
-static const char *app_cmd_name(int cmd)
-{
-    switch (cmd) {
-    case APP_CMD_INPUT_CHANGED: return "INPUT_CHANGED";
-    case APP_CMD_INIT_WINDOW: return "INIT_WINDOW";
-    case APP_CMD_TERM_WINDOW: return "TERM_WINDOW";
-    case APP_CMD_WINDOW_RESIZED: return "WINDOW_RESIZED";
-    case APP_CMD_WINDOW_REDRAW_NEEDED: return "WINDOW_REDRAW_NEEDED";
-    case APP_CMD_CONTENT_RECT_CHANGED: return "CONTENT_RECT_CHANGED";
-    case APP_CMD_GAINED_FOCUS: return "GAINED_FOCUS";
-    case APP_CMD_LOST_FOCUS: return "LOST_FOCUS";
-    case APP_CMD_CONFIG_CHANGED: return "CONFIG_CHANGED";
-    case APP_CMD_LOW_MEMORY: return "LOW_MEMORY";
-    case APP_CMD_START: return "START";
-    case APP_CMD_RESUME: return "RESUME";
-    case APP_CMD_SAVE_STATE: return "SAVE_STATE";
-    case APP_CMD_PAUSE: return "PAUSE";
-    case APP_CMD_STOP: return "STOP";
-    case APP_CMD_DESTROY: return "DESTROY";
-    default:
-        static char buf[10];
-        sprintf(buf, "%d", cmd);
-        return buf;
-    }
-}
-
-#endif
-
 void AndroidSalInstance::GetWorkArea( Rectangle& rRect )
 {
     rRect = Rectangle( Point( 0, 0 ),
                        Size( 1280, 750 ) );
-
-#if 0
-    rRect = Rectangle( Point( 0, 0 ),
-                       Size( ANativeWindow_getWidth( mpApp->window ),
-                             ANativeWindow_getHeight( mpApp->window ) ) );
-#endif
 }
 
-#if 0
-
-void AndroidSalInstance::onAppCmd (struct android_app* app, int32_t cmd)
-{
-        LOGI("app cmd for app %p: %s", app, app_cmd_name(cmd));
-        ANativeWindow *pWindow = mpApp->window;
-        switch (cmd) {
-        case APP_CMD_INIT_WINDOW:
-        {
-            ARect aRect = { 0, 0, 0, 0 };
-            aRect.right = ANativeWindow_getWidth(pWindow);
-            aRect.bottom = ANativeWindow_getHeight(pWindow);
-            int nRet = ANativeWindow_setBuffersGeometry(
-                                pWindow, ANativeWindow_getWidth(pWindow),
-                                ANativeWindow_getHeight(pWindow),
-                                WINDOW_FORMAT_RGBA_8888);
-            LOGI("we have an app window ! %p %dx%x (%d) set %d",
-                     pWindow, aRect.right, aRect.bottom,
-                     ANativeWindow_getFormat(pWindow), nRet);
-            maRedrawRegion = Region( Rectangle( 0, 0, ANativeWindow_getWidth(pWindow),
-                                                ANativeWindow_getHeight(pWindow) ) );
-            mbQueueReDraw = true;
-            break;
-        }
-        case APP_CMD_WINDOW_RESIZED:
-        {
-            ARect aRect = { 0, 0, 0, 0 };
-            aRect.right = ANativeWindow_getWidth(pWindow);
-            aRect.bottom = ANativeWindow_getHeight(pWindow);
-            LOGI("app window resized to ! %p %dx%x (%d)",
-                 pWindow, aRect.right, aRect.bottom,
-                 ANativeWindow_getFormat(pWindow));
-            break;
-        }
-
-        case APP_CMD_WINDOW_REDRAW_NEEDED:
-        {
-            LOGI("redraw needed");
-            maRedrawRegion = Region( Rectangle( 0, 0, ANativeWindow_getWidth(pWindow),
-                                                ANativeWindow_getHeight(pWindow) ) );
-            mbQueueReDraw = true;
-            break;
-        }
-
-        case APP_CMD_CONTENT_RECT_CHANGED:
-        {
-            ARect aRect = mpApp->contentRect;
-            LOGI("content rect changed [ k/b popped up etc. ] %d,%d->%d,%d",
-                 aRect.left, aRect.top, aRect.right, aRect.bottom);
-            break;
-        }
-        default:
-            LOGI("unhandled app cmd %d", cmd);
-            break;
-        }
-}
-
-#endif
-
 /*
  * Try too hard to get a frame, in the absence of anything better to do
  */
@@ -438,123 +193,6 @@ SalFrame *AndroidSalInstance::getFocusFrame() const
     return pFocus;
 }
 
-#if 0
-
-int32_t AndroidSalInstance::onInputEvent (struct android_app* app, AInputEvent* event)
-{
-    bool bHandled = false;
-    LOGI("input event for app %p, event %p type %d source %d device id %d",
-         app, event,
-         AInputEvent_getType(event),
-         AInputEvent_getSource(event),
-         AInputEvent_getDeviceId(event));
-
-    switch (AInputEvent_getType(event))
-    {
-    case AINPUT_EVENT_TYPE_KEY:
-    {
-        int32_t nAction = AKeyEvent_getAction(event);
-        LOGI("key event keycode %d '%s' %s flags (0x%x) 0x%x",
-             AKeyEvent_getKeyCode(event),
-             nAction == AKEY_EVENT_ACTION_DOWN ? "down" :
-             nAction == AKEY_EVENT_ACTION_UP ? "up" : "multiple",
-             KeyMetaStateToString(AKeyEvent_getMetaState(event)).getStr(),
-             AKeyEvent_getMetaState (event),
-             AKeyEvent_getFlags (event));
-
-        // FIXME: the whole SALEVENT_KEYMODCHANGE stuff is going to be interesting
-        // can we really emit that ? no input method madness required though.
-        sal_uInt16 nEvent;
-        SalKeyEvent aEvent;
-        int64_t nNsTime = AKeyEvent_getEventTime(event);
-
-        // FIXME: really we need a Java wrapper app as Mozilla has that does
-        // key event translation for us, and provides -much- cleaner events.
-        nEvent = (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_UP ?
-                  SALEVENT_KEYUP : SALEVENT_KEYINPUT);
-        sal_uInt16 nCode = KeyToCode(event);
-        sal_uInt16 nMetaState = KeyMetaStateToCode(event);
-        if (nCode >= KEY_0 && nCode <= KEY_9)
-            aEvent.mnCharCode = '0' + nCode - KEY_0;
-        else if (nCode >= KEY_A && nCode <= KEY_Z)
-            aEvent.mnCharCode = (nMetaState & KEY_SHIFT ? 'A' : 'a') + nCode - KEY_A;
-        else if (nCode == KEY_SPACE)
-            aEvent.mnCharCode = ' ';
-        else if (nCode == KEY_COMMA)
-            aEvent.mnCharCode = ',';
-        else if (nCode == KEY_POINT)
-            aEvent.mnCharCode = '.';
-        else
-            aEvent.mnCharCode = 0;
-        aEvent.mnTime = nNsTime / (1000 * 1000);
-        aEvent.mnCode = nMetaState | nCode;
-        aEvent.mnRepeat = AKeyEvent_getRepeatCount(event);
-
-        SalFrame *pFocus = getFocusFrame();
-        if (pFocus)
-            bHandled = pFocus->CallCallback( nEvent, &aEvent );
-        else
-            LOGI("no focused frame to emit event on");
-
-        LOGI("bHandled == %s", bHandled? "true": "false" );
-        break;
-    }
-    case AINPUT_EVENT_TYPE_MOTION:
-    {
-        size_t nPoints = AMotionEvent_getPointerCount(event);
-        LOGI("motion event %d %g,%g %d points: %s",
-             AMotionEvent_getAction(event),
-             AMotionEvent_getXOffset(event),
-             AMotionEvent_getYOffset(event),
-             (int)nPoints,
-             MotionEdgeFlagsToString(AMotionEvent_getEdgeFlags(event)).getStr());
-        for (size_t i = 0; i < nPoints; i++)
-            LOGI("\t%d: %g,%g - pressure %g",
-                 (int)i,
-                 AMotionEvent_getX(event, i),
-                 AMotionEvent_getY(event, i),
-                 AMotionEvent_getPressure(event, i));
-
-        SalMouseEvent aMouseEvent;
-        sal_uInt16 nEvent = 0;
-
-        // FIXME: all this filing the nEvent and aMouseEvent has to be cleaned up
-        nEvent = AMotionEvent_getAction(event)? SALEVENT_MOUSEBUTTONUP: SALEVENT_MOUSEBUTTONDOWN;
-
-        if (nPoints > 0)
-        {
-            aMouseEvent.mnX = AMotionEvent_getX(event, 0);
-            aMouseEvent.mnY = AMotionEvent_getY(event, 0);
-        } else {
-            aMouseEvent.mnX = AMotionEvent_getXOffset(event);
-            aMouseEvent.mnY = AMotionEvent_getYOffset(event);
-        }
-
-        int64_t nNsTime = AMotionEvent_getEventTime(event);
-        aMouseEvent.mnTime = nNsTime / (1000 * 1000);
-        aMouseEvent.mnCode = 0; // FIXME
-        aMouseEvent.mnButton = MOUSE_LEFT; // FIXME
-
-        SalFrame *pFocus = getFocusFrame();
-        if (pFocus)
-            bHandled = pFocus->CallCallback( nEvent, &aMouseEvent );
-        else
-            LOGI("no focused frame to emit event on");
-
-        LOGI("bHandled == %s", bHandled? "true": "false" );
-
-        break;
-    }
-    default:
-        LOGI("unknown input event type %p %d",
-             event, AInputEvent_getType(event));
-        break;
-    }
-    return bHandled ? 1 : 0;
-}
-
-#endif
-
 AndroidSalInstance *AndroidSalInstance::getInstance()
 {
     if (!ImplGetSVData())
@@ -565,22 +203,6 @@ AndroidSalInstance *AndroidSalInstance::getInstance()
     return static_cast<AndroidSalInstance *>(pData->m_pInstance);
 }
 
-#if 0
-
-extern "C" {
-    void onAppCmd_cb (struct android_app *app, int32_t cmd)
-    {
-        AndroidSalInstance::getInstance()->onAppCmd(app, cmd);
-    }
-
-    int32_t onInputEvent_cb (struct android_app *app, AInputEvent *event)
-    {
-        return AndroidSalInstance::getInstance()->onInputEvent(app, event);
-    }
-}
-
-#endif
-
 AndroidSalInstance::AndroidSalInstance( SalYieldMutex *pMutex )
     : SvpSalInstance( pMutex )
 {
@@ -611,65 +233,6 @@ void AndroidSalInstance::Wakeup()
     LOGI("busted - no global looper");
 }
 
-#if 0
-
-void AndroidSalInstance::DoReleaseYield (int nTimeoutMS)
-{
-    if (!bHitIdle)
-        LOGI("hit idle !" );
-    bHitIdle = true;
-
-#if 1
-    // Presumably this should never be called at all except in
-    // NativeActivity-based apps with a GUI, where the message pump is
-    // run here in vcl, but we don't have any NativeActivitry-based
-    // apps any more.
-
-    (void) nTimeoutMS;
-
-    {
-        static bool beenhere = false;
-        if (!beenhere)
-        {
-            LOGI("**** Huh, %s called in non-NativeActivity app", __FUNCTION__);
-            beenhere = true;
-        }
-        return;
-    }
-#else
-    // release yield mutex
-    sal_uLong nAcquireCount = ReleaseYieldMutex();
-
-    LOGI("DoReleaseYield #3 %d thread: %d ms",
-         nTimeoutMS, (int)pthread_self());
-
-    struct android_poll_source *pSource = NULL;
-    int outFd = 0, outEvents = 0;
-
-    if (mbQueueReDraw)
-        nTimeoutMS = 0;
-
-    int nRet;
-    nRet = ALooper_pollAll (nTimeoutMS, &outFd, &outEvents, (void**)&pSource);
-    LOGI("ret #6 %d %d %d %p", nRet, outFd, outEvents, pSource);
-
-    // acquire yield mutex again
-    AcquireYieldMutex(nAcquireCount);
-
-    if (nRet >= 0)
-    {
-        // Process this event.
-        if (pSource != NULL)
-            pSource->process(mpApp, pSource);
-    }
-
-    if (mbQueueReDraw && mpApp && mpApp->window)
-        AndroidSalInstance::getInstance()->RedrawWindows (mpApp->window);
-#endif
-}
-
-#endif
-
 bool AndroidSalInstance::AnyInput( sal_uInt16 nType )
 {
     if( (nType & VCL_INPUT_TIMER) != 0 )
@@ -871,13 +434,6 @@ Java_org_libreoffice_experimental_desktop_Desktop_renderVCL(JNIEnv *env,
         return;
     }
 
-#if 0
-    if (info.format != ANDROID_BITMAP_FORMAT_RGB_565) {
-        LOGI("Bitmap format is not RGB_565 !");
-        return;
-    }
-#endif
-
     if ((ret = AndroidBitmap_lockPixels(env, bitmap, &pixels)) < 0) {
         LOGI("AndroidBitmap_lockPixels() failed ! error=%d", ret);
     }