undo anything not wizard related in the previous merge-commit

6 files changed, 27 insertions, 18 deletions

diff --git a/bean/com/sun/star/comp/beans/HasConnectionException.java b/bean/com/sun/star/comp/beans/HasConnectionException.java
index fcebebf9334f..7c70042e4fad 100644
--- a/bean/com/sun/star/comp/beans/HasConnectionException.java
+++ b/bean/com/sun/star/comp/beans/HasConnectionException.java
@@ -27,7 +27,7 @@
 
 package com.sun.star.comp.beans;
 
-/** This expception is thrown when a method is called which
+/** This exception is thrown when a method is called which
     is only defined for not already having an established
     connection.
 
diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
index 944c9ff5a38f..2d8591f336dd 100644
--- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
@@ -52,7 +52,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index 336b3eb15463..5b3611057016 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -44,7 +44,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
index f7f86d8973b3..eba60760be54 100644
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
@@ -36,14 +36,6 @@
 
 #include "jawt.h"
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include "jawt_md.h"
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
 #if defined assert
 #undef assert
 #endif
@@ -54,7 +46,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 7adb1b7d7317..65078c849b4d 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -34,12 +34,33 @@
 #pragma warning(pop)
 #endif
 
+#include <windows.h>
+#define JAWT_GetAWT hidden_JAWT_GetAWT
 #include "jawt.h"
+#undef JAWT_GetAWT
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
-#include "jawt_md.h"
+/* When cross-compiling to Windows we don't have any Windows JDK
+ * available. Copying this short snippet from win32/jawt_md.h can
+ * surely not be against its license. The intent is to enable
+ * interoperation with real Oracle Java after all. We leave out the
+ * informative comments that might have "artistic merit" and be more
+ * copyrightable. Use this also for native Windows compilation for
+ * simplicity.
+ */
+typedef struct jawt_Win32DrawingSurfaceInfo {
+    union {
+        HWND hwnd;
+        HBITMAP hbitmap;
+        void* pbits;
+    };
+    HDC hdc;
+    HPALETTE hpalette;
+} JAWT_Win32DrawingSurfaceInfo;
+
+extern __declspec(dllimport) unsigned char __stdcall JAWT_GetAWT(JNIEnv *, JAWT *);
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
@@ -47,7 +68,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
diff --git a/bean/prj/d.lst b/bean/prj/d.lst
index b0478b3d4cd4..f3154b68b17c 100644
--- a/bean/prj/d.lst
+++ b/bean/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\class\officebean.jar %_DEST%\bin%_EXT%\officebean.jar
+..\%__SRC%\class\officebean.jar %_DEST%\bin\officebean.jar
 
-..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll
-..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so
-..\%__SRC%\lib\*officebean.dylib %_DEST%\lib%_EXT%\*officebean.dylib
+..\%__SRC%\bin\officebean.dll %_DEST%\bin\officebean.dll
+..\%__SRC%\lib\libofficebean.so %_DEST%\lib\libofficebean.so
+..\%__SRC%\lib\*officebean.dylib %_DEST%\lib\*officebean.dylib