rename to two GetSystemData methods to find all call-sites

anyplace calling GetSystemChildSystemData on a SystemChildWindow is definitely
right

anyplace calling GetWindowSystemData on a Window *might* have intended to call
GetSystemChildSystemData on a Window casted back to an underlying
SystemChildWindow.

Change-Id: I7dcf3a50d0b7ed29bc08cfdb15cc0dcb86be8fa7
Reviewed-on: https://gerrit.libreoffice.org/25158
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 6ed22df78795..90c8d8966b36 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -157,7 +157,7 @@ void XIMStatusWindow::layout()
 
     if (m_bAnchoredAtRight && IsVisible())
     {
-        SalFrame* pFrame = static_cast<SalFrame*>(GetSystemData()->pSalFrame);
+        SalFrame* pFrame = static_cast<SalFrame*>(GetWindowSystemData()->pSalFrame);
         long nDelta = pFrame->maGeometry.nWidth - m_aWindowSize.Width();
         pFrame->SetPosSize( pFrame->maGeometry.nX + nDelta,
                             pFrame->maGeometry.nY,
@@ -249,7 +249,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent )
         }
         if( IsVisible() )
         {
-            const SystemEnvData* pEnvData = GetSystemData();
+            const SystemEnvData* pEnvData = GetWindowSystemData();
             SalFrame* pStatusFrame = static_cast<SalFrame*>(pEnvData->pSalFrame);
             Point aPoint = updatePosition();
             pStatusFrame->SetPosSize( aPoint.X(), aPoint.Y(), m_aWindowSize.Width(), m_aWindowSize.Height(), SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y | SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
@@ -260,7 +260,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent )
 IMPL_LINK_NOARG_TYPED(XIMStatusWindow, DelayedShowHdl, void*, void)
 {
     m_nDelayedEvent = nullptr;
-    const SystemEnvData* pData = GetSystemData();
+    const SystemEnvData* pData = GetWindowSystemData();
     SalFrame* pStatusFrame = static_cast<SalFrame*>(pData->pSalFrame);
     if( m_bDelayedShow )
     {
@@ -348,7 +348,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) :
 
     if( pParent )
     {
-        const SystemEnvData* pEnvData = GetSystemData();
+        const SystemEnvData* pEnvData = GetWindowSystemData();
 
         const SalFrameGeometry& rGeom( pParent->GetUnmirroredGeometry() );
         int nDistance = rGeom.nTopDecoration;
@@ -593,7 +593,7 @@ SalFrame* I18NStatus::getStatusFrame() const
     SalFrame* pRet = nullptr;
     if( m_pStatusWindow )
     {
-        const SystemEnvData* pData = m_pStatusWindow->GetSystemData();
+        const SystemEnvData* pData = m_pStatusWindow->GetWindowSystemData();
         pRet = static_cast<SalFrame*>(pData->pSalFrame);
     }
     return pRet;
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 73ad87afe6b0..912838c4e60d 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -881,7 +881,7 @@ namespace
     guint get_xid_for_dbus()
     {
         const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow();
-        const SystemEnvData* pEnvData = pTopWindow ? pTopWindow->GetSystemData() : nullptr;
+        const SystemEnvData* pEnvData = pTopWindow ? pTopWindow->GetWindowSystemData() : nullptr;
         return pEnvData ? pEnvData->aWindow : 0;
     }
 #endif
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 8dce0e0d0610..b57ba0a45609 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -819,7 +819,7 @@ void UnxFilePicker::initFilePicker()
         vcl::Window *pParentWin = Application::GetDefDialogParent();
         if ( pParentWin )
         {
-            const SystemEnvData* pSysData = pParentWin->GetSystemData();
+            const SystemEnvData* pSysData = pParentWin->GetWindowSystemData();
             if ( pSysData )
             {
                 snprintf( pWinId, nIdLen, "%ld", pSysData->aWindow ); // unx only
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 229aa020bb98..68728a4affd2 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -243,7 +243,7 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
     vcl::Window *pParentWin = Application::GetDefDialogParent();
     if ( pParentWin )
     {
-        const SystemEnvData* pSysData = pParentWin->GetSystemData();
+        const SystemEnvData* pSysData = pParentWin->GetWindowSystemData();
         if ( pSysData )
         {
             KWindowSystem::setMainWindow( _dialog, pSysData->aWindow); // unx only