From ff5ce47439a32d3fe3b6f5461a8e10441d54a8c9 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 27 May 2016 14:08:53 +0200
Subject: Revert "remove unused RSC_DOCKWINDOW flags"

This reverts commit c8754b38ce205845aad5cde3c5ad4070ce38f7d5.

This causes toolkit.AccessibleDropDownListBox to fail with:
 LOG> ImplementationName Unknown, does not implement XServiceInfo
 Exception while getting Environment Couldn't create a test object
---
 rsc/inc/rscdb.hxx             |  3 ++-
 rsc/source/parser/rscicpx.cxx | 17 ++++++++++++++++-
 rsc/source/parser/rscinit.cxx |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'rsc')

diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index adf801f38573..1fbbb1850881 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -205,7 +205,8 @@ class RscTypCont
     RscTop *    InitClassNumericField( RscTop * pSuper );
     RscTop *    InitClassMetricField( RscTop * pSuper );
 
-    RscTop *    InitClassDockingWindow( RscTop * pSuper );
+    RscTop *    InitClassDockingWindow( RscTop * pSuper,
+                                        RscEnum * pMapUnit );
     RscTop *    InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap,
                                       RscTop * pClassImage,
                                       RscEnum * pTriState );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 30a56b499977..ae3b865b481a 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -897,7 +897,8 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
     return pClassMetricField;
 }
 
-RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper )
+RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
+                                             RscEnum * pMapUnit )
 {
     Atom        nId;
     RscTop *    pClassDockWindow;
@@ -908,6 +909,20 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper )
     pClassDockWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
     aNmTb.Put( nId, CLASSNAME, pClassDockWindow );
 
+    // initialize variables
+    nId = aNmTb.Put( "_FloatingPosMapMode", VARNAME );
+    pClassDockWindow->SetVariable( nId, pMapUnit, nullptr, 0,
+                                   RSC_DOCKINGWINDOW_XYMAPMODE  );
+    nId = aNmTb.Put( "_FloatingPosX", VARNAME );
+    pClassDockWindow->SetVariable( nId, &aShort, nullptr, 0,
+                                   RSC_DOCKINGWINDOW_X );
+    nId = aNmTb.Put( "_FloatingPosY", VARNAME );
+    pClassDockWindow->SetVariable( nId, &aShort, nullptr, 0,
+                                   RSC_DOCKINGWINDOW_Y );
+    nId = aNmTb.Put( "FloatingMode", VARNAME );
+    pClassDockWindow->SetVariable( nId, &aBool, nullptr, 0,
+                                   RSC_DOCKINGWINDOW_FLOATING );
+
     INS_WINBIT(pClassDockWindow,Moveable)
     INS_WINBIT(pClassDockWindow,Sizeable)
     INS_WINBIT(pClassDockWindow,EnableResizing)
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 10b5f31c61a9..0cec6cb720c0 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -409,7 +409,7 @@ void RscTypCont::Init()
     }
 }
 {
-    RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow );
+    RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
     pRoot->Insert( pClassDockingWindow );
 
     RscTop* pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap,
-- 
cgit