Remove unnecessary SystemChildData -> SystemEnvData define

Change-Id: Ifd6763617b9aef45c7301085033b6bbaf9d52e02

include/vcl/sysdata.hxx

@@ -83,8 +83,6 @@ struct SystemEnvData
 #endif
 };
 
-#define SystemChildData SystemEnvData
-
 // --------------------
 // - SystemParentData -
 // --------------------

vcl/headless/svpdummies.cxx

@@ -26,8 +26,8 @@
 SvpSalObject::SvpSalObject()
 {
     // fast and easy cross-platform wiping of the data
-    memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) );
-    m_aSystemChildData.nSize = sizeof( SystemChildData );
+    memset( (void *)&m_aSystemChildData, 0, sizeof( SystemEnvData ) );
+    m_aSystemChildData.nSize = sizeof( SystemEnvData );
 }
 
 SvpSalObject::~SvpSalObject()

vcl/headless/svpframe.cxx

@@ -80,8 +80,8 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     m_nMaxHeight( 0 )
 {
     // fast and easy cross-platform wiping of the data
-    memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) );
-    m_aSystemChildData.nSize        = sizeof( SystemChildData );
+    memset( (void *)&m_aSystemChildData, 0, sizeof( SystemEnvData ) );
+    m_aSystemChildData.nSize        = sizeof( SystemEnvData );
 #ifdef IOS
     // Nothing
 #elif defined ANDROID

vcl/inc/headless/svpdummies.hxx

@@ -30,7 +30,7 @@ class SalGraphics;
 class SvpSalObject : public SalObject
 {
 public:
-    SystemChildData m_aSystemChildData;
+    SystemEnvData m_aSystemChildData;
 
     SvpSalObject();
     virtual ~SvpSalObject();

vcl/inc/unx/gtk/gtkobject.hxx

@@ -27,7 +27,7 @@
 
 class GtkSalObject : public SalObject
 {
-    SystemChildData     m_aSystemData;
+    SystemEnvData     m_aSystemData;
     GtkWidget*          m_pSocket;
 #if GTK_CHECK_VERSION(3,0,0)
     cairo_region_t*     m_pRegion;

vcl/inc/unx/salframe.h

@@ -120,7 +120,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
 
     OUString   m_sWMClass;
 
-    SystemChildData maSystemChildData;
+    SystemEnvData maSystemChildData;
 
     SalI18N_InputContext *mpInputContext;
     Bool            mbInputFocus;

vcl/inc/unx/salobj.h

@@ -60,7 +60,7 @@ private:
 class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
 {
 public:
-    SystemChildData maSystemChildData;
+    SystemEnvData maSystemChildData;
     SalFrame*       mpParent;
     XLIB_Window     maPrimary;
     XLIB_Window     maSecondary;

vcl/inc/win/salobj.h

@@ -32,7 +32,7 @@ public:
     HWND                    mhWnd;                  // Window handle
     HWND                    mhWndChild;             // Child Window handle
     HWND                    mhLastFocusWnd;         // Child-Window, welches als letztes den Focus hatte
-    SystemChildData         maSysData;              // SystemEnvData
+    SystemEnvData         maSysData;              // SystemEnvData
     RGNDATA*                mpClipRgnData;          // ClipRegion-Data
     RGNDATA*                mpStdClipRgnData;       // Cache Standard-ClipRegion-Data
     RECT*                   mpNextClipRect;         // Naechstes ClipRegion-Rect

vcl/unx/generic/window/salframe.cxx

@@ -857,10 +857,10 @@ void X11SalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
     }
 }
 
-const SystemChildData* X11SalFrame::GetSystemData() const
+const SystemEnvData* X11SalFrame::GetSystemData() const
 {
     X11SalFrame *pFrame = const_cast<X11SalFrame*>(this);
-    pFrame->maSystemChildData.nSize         = sizeof( SystemChildData );
+    pFrame->maSystemChildData.nSize         = sizeof( SystemEnvData );
     pFrame->maSystemChildData.pDisplay      = GetXDisplay();
     pFrame->maSystemChildData.aWindow       = pFrame->GetWindow();
     pFrame->maSystemChildData.pSalFrame     = pFrame;

vcl/unx/generic/window/salobj.cxx

@@ -51,7 +51,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
 {
     int error_base, event_base;
     X11SalObject*       pObject  = new X11SalObject();
-    SystemChildData*    pObjData = const_cast<SystemChildData*>(pObject->GetSystemData());
+    SystemEnvData*    pObjData = const_cast<SystemEnvData*>(pObject->GetSystemData());
 
     if ( ! XShapeQueryExtension( (Display*)pObjData->pDisplay,
                                   &event_base, &error_base ) )
@@ -236,7 +236,7 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 
 X11SalObject::X11SalObject()
 {
-    maSystemChildData.nSize     = sizeof( SystemChildData );
+    maSystemChildData.nSize     = sizeof( SystemEnvData );
     maSystemChildData.pDisplay  = GetGenericData()->GetSalDisplay()->GetDisplay();
     maSystemChildData.aWindow       = None;
     maSystemChildData.pSalFrame = 0;
@@ -412,7 +412,7 @@ void X11SalObject::GrabFocus()
 
 // -----------------------------------------------------------------------
 
-const SystemChildData* X11SalObject::GetSystemData() const
+const SystemEnvData* X11SalObject::GetSystemData() const
 {
     return &maSystemChildData;
 }

vcl/unx/gtk/window/gtkobject.cxx

@@ -52,7 +52,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow )
 
         // system data
         SalDisplay* pDisp = GetGenericData()->GetSalDisplay();
-        m_aSystemData.nSize         = sizeof( SystemChildData );
+        m_aSystemData.nSize         = sizeof( SystemEnvData );
         m_aSystemData.pDisplay      = pDisp->GetDisplay();
         m_aSystemData.aWindow       = GDK_WINDOW_XWINDOW(widget_get_window(m_pSocket));
         m_aSystemData.pSalFrame     = NULL;

vcl/unx/gtk/window/gtksalframe.cxx

@@ -997,7 +997,7 @@ void GtkSalFrame::InitCommon()
     gtk_widget_realize( m_pWindow );
 
     //system data
-    m_aSystemData.nSize         = sizeof( SystemChildData );
+    m_aSystemData.nSize         = sizeof( SystemEnvData );
 #if !GTK_CHECK_VERSION(3,0,0)
     GtkSalDisplay* pDisp = GetGtkSalData()->GetGtkDisplay();
     m_aSystemData.pDisplay      = pDisp->GetDisplay();