undo anything not wizard related in the previous merge-commit

1 files changed, 12 insertions, 6 deletions

diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index d7f63a39cd91..d278ae2a7f09 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -330,14 +330,20 @@ public:
     StatementUnoSlot(SCmdStream *pIn);
 };
 
+union munge
+{
+    comm_UINT32 nLNr1;
+    Window *pWindow;
+};
+
 class StatementCommand : public StatementList   // Befehl ausf�hren (wintree, resetaplication ...)
 {
     friend class ImplRemoteControl;
 protected:
     sal_uInt16 nMethodId;
     sal_uInt16 nParams;
-    comm_USHORT nNr1,nNr2,nNr3,nNr4;
-    comm_ULONG nLNr1;
+    comm_UINT16 nNr1,nNr2,nNr3,nNr4;
+    munge nLNr1_and_Pointer;
     String aString1,aString2;
     sal_Bool bBool1,bBool2;
 
@@ -372,8 +378,8 @@ protected:
     rtl::OString aUId;
     sal_uInt16 nMethodId;
     sal_uInt16 nParams;
-    comm_USHORT nNr1,nNr2,nNr3,nNr4;
-    comm_ULONG nLNr1;
+    comm_UINT16 nNr1,nNr2,nNr3,nNr4;
+    comm_UINT32 nLNr1;
     String aString1,aString2;
     sal_Bool bBool1,bBool2;
     sal_Bool ControlOK( Window *pControl, const sal_Char* aBezeichnung );
@@ -396,8 +402,8 @@ class StatementFlow : public StatementList      // Kommunikation mit Sequence
     sal_uInt16 nArt;
 
     sal_uInt16 nParams;
-    comm_USHORT nSNr1;
-    comm_ULONG nLNr1;
+    comm_UINT16 nSNr1;
+    comm_UINT32 nLNr1;
     String aString1;
     sal_Bool bBool1;