Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 333 insertions, 0 deletions

diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
new file mode 100644
index 000000000..9e534e226
--- /dev/null
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -0,0 +1,142 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Intrinsic.h>
+
+// to deal with gcc specific attribute "externally_visible" used in
+// /usr/lib/jvm/java-11-openjdk-armhf/include/linux/jni_md.h:35
+// via /usr/lib/jvm/java-11-openjdk-armhf/include/jni.h
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-attributes"
+#endif
+#include <jni.h>
+
+#include <jawt_md.h>
+#include <jawt.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
+#include <sal/types.h>
+
+#define SYSTEM_XWINDOW 6
+
+
+/* type must be something like java/lang/RuntimeException
+ */
+static void ThrowException(JNIEnv * env, char const * type, char const * msg) {
+    jclass c;
+    (*env)->ExceptionClear(env);
+    c = (*env)->FindClass(env, type);
+    if (c == NULL) {
+        (*env)->ExceptionClear(env);
+        (*env)->FatalError(
+            env, "JNI FindClass failed");
+    }
+    if ((*env)->ThrowNew(env, c, msg) != 0) {
+        (*env)->ExceptionClear(env);
+        (*env)->FatalError(env, "JNI ThrowNew failed");
+    }
+}
+
+/*****************************************************************************/
+/*
+ * Class:     com_sun_star_comp_beans_LocalOfficeWindow
+ * Method:    getNativeWindowSystemType
+ * Signature: ()I
+ */
+SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType
+  (JNIEnv * env, jobject obj_this)
+{
+    (void) env; /* avoid warning about unused parameter */
+    (void) obj_this; /* avoid warning about unused parameter */
+    return SYSTEM_XWINDOW;
+}
+
+
+/*****************************************************************************/
+/*
+ * Class:     com_sun_star_beans_LocalOfficeWindow
+ * Method:    getNativeWindow
+ * Signature: ()J
+ */
+SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
+  (JNIEnv * env, jobject obj_this)
+{
+    jboolean result;
+    jint lock;
+
+    JAWT awt;
+    JAWT_DrawingSurface* ds;
+    JAWT_DrawingSurfaceInfo* dsi;
+    JAWT_X11DrawingSurfaceInfo* dsi_x11;
+
+    Drawable drawable;
+
+    /* Get the AWT */
+    awt.version = JAWT_VERSION_1_3;
+    result = JAWT_GetAWT(env, &awt);
+    if (!result)
+        ThrowException(env, "java/lang/RuntimeException", "JAWT_GetAWT failed");
+
+    /* Get the drawing surface */
+    ds = awt.GetDrawingSurface(env, obj_this);
+    if (ds == NULL)
+        return 0;
+
+    /* Lock the drawing surface */
+    lock = ds->Lock(ds);
+    if ( (lock & JAWT_LOCK_ERROR) != 0)
+        ThrowException(env, "java/lang/RuntimeException",
+                       "Could not get AWT drawing surface.");
+
+    /* Get the drawing surface info */
+    dsi = ds->GetDrawingSurfaceInfo(ds);
+
+    /* Get the platform-specific drawing info */
+    dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
+
+    drawable = dsi_x11->drawable;
+
+    /* Free the drawing surface info */
+    ds->FreeDrawingSurfaceInfo(dsi);
+    /* Unlock the drawing surface */
+    ds->Unlock(ds);
+    /* Free the drawing surface */
+    awt.FreeDrawingSurface(ds);
+
+    return (jlong)drawable;
+}
+
+
+
+
+
+
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
new file mode 100644
index 000000000..7f2916025
--- /dev/null
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -0,0 +1,187 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
+#if defined _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4201) /* nonstandard extension used: nameless struct/union */
+#endif
+#include <jawt_md.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+#define SYSTEM_WIN32   1
+
+#define OLD_PROC_KEY L"oldwindowproc"
+
+static LRESULT APIENTRY OpenOfficeWndProc( HWND , UINT , WPARAM , LPARAM );
+
+/* type must be something like java/lang/RuntimeException
+ */
+static void ThrowException(JNIEnv * env, char const * type, char const * msg) {
+    jclass c;
+    (*env)->ExceptionClear(env);
+    c = (*env)->FindClass(env, type);
+    if (c == NULL) {
+        (*env)->ExceptionClear(env);
+        (*env)->FatalError(
+            env, "JNI FindClass failed");
+    }
+    if ((*env)->ThrowNew(env, c, msg) != 0) {
+        (*env)->ExceptionClear(env);
+        (*env)->FatalError(env, "JNI ThrowNew failed");
+    }
+}
+
+
+/*****************************************************************************/
+/*
+ * Class:     com_sun_star_comp_beans_LocalOfficeWindow
+ * Method:    getNativeWindowSystemType
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType
+  (JNIEnv * env, jobject obj_this)
+{
+    (void) env; // unused
+    (void) obj_this; // unused
+    return SYSTEM_WIN32;
+}
+
+
+/*****************************************************************************/
+/*
+ * Class:     com_sun_star_comp_beans_LocalOfficeWindow
+ * Method:    getNativeWindow
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
+  (JNIEnv * env, jobject obj_this)
+{
+    jboolean result;
+    jint lock;
+
+    JAWT awt;
+    JAWT_DrawingSurface* ds;
+    JAWT_DrawingSurfaceInfo* dsi;
+    JAWT_Win32DrawingSurfaceInfo* dsi_win;
+    HWND hWnd;
+    LONG_PTR hFuncPtr;
+
+    /* Get the AWT */
+    awt.version = JAWT_VERSION_1_3;
+    result = JAWT_GetAWT(env, &awt);
+    if (result == JNI_FALSE)
+        ThrowException(env, "java/lang/RuntimeException", "JAWT_GetAWT failed");
+
+                                /* Get the drawing surface */
+    if ((ds = awt.GetDrawingSurface(env, obj_this)) == NULL)
+        return 0;
+
+    /* Lock the drawing surface */
+    lock = ds->Lock(ds);
+    if ( (lock & JAWT_LOCK_ERROR) != 0)
+        ThrowException(env, "java/lang/RuntimeException",
+                       "Could not get AWT drawing surface.");
+
+    /* Get the drawing surface info */
+    dsi = ds->GetDrawingSurfaceInfo(ds);
+
+    /* Get the platform-specific drawing info */
+    dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
+
+    hWnd = dsi_win->hwnd;
+
+    /* Free the drawing surface info */
+    ds->FreeDrawingSurfaceInfo(dsi);
+    /* Unlock the drawing surface */
+    ds->Unlock(ds);
+    /* Free the drawing surface */
+    awt.FreeDrawingSurface(ds);
+
+    /* Register own window procedure
+       Do it one times only! Otherwise
+       multiple instances will be registered
+       and calls on such construct produce
+       a stack overflow.
+     */
+    if (GetPropW( hWnd, OLD_PROC_KEY )==NULL)
+    {
+        hFuncPtr = SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (LONG_PTR)OpenOfficeWndProc );
+        SetPropW( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr );
+    }
+
+    return (jlong)hWnd;
+}
+
+
+static LRESULT APIENTRY OpenOfficeWndProc(
+    HWND hWnd,
+    UINT uMsg,
+    WPARAM wParam,
+    LPARAM lParam)
+{
+    switch(uMsg)
+    {
+        case WM_PARENTNOTIFY: {
+            if (wParam == WM_CREATE) {
+                RECT rect;
+                HWND hChild = (HWND) lParam;
+
+                GetClientRect(hWnd, &rect);
+
+                SetWindowPos(hChild,
+                             NULL,
+                             rect.left,
+                             rect.top,
+                             rect.right - rect.left,
+                             rect.bottom - rect.top,
+                             SWP_NOZORDER);
+            }
+            break;
+        }
+        case WM_SIZE: {
+            WORD newHeight = HIWORD(lParam);
+            WORD newWidth = LOWORD(lParam);
+            HWND hChild = GetWindow(hWnd, GW_CHILD);
+
+            if (hChild != NULL) {
+                SetWindowPos(hChild, NULL, 0, 0, newWidth, newHeight, SWP_NOZORDER);
+            }
+            break;
+        }
+    }
+
+#if defined _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4152) /* function/data pointer conversion: */
+#endif
+    return CallWindowProcW(GetPropW(hWnd, OLD_PROC_KEY),
+                          hWnd, uMsg, wParam, lParam);
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bean/native/win32/officebean.dxp b/bean/native/win32/officebean.dxp
new file mode 100644
index 000000000..9a01b090f
--- /dev/null
+++ b/bean/native/win32/officebean.dxp
@@ -0,0 +1,4 @@
+Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType
+Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
+Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType
+Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
\ No newline at end of file