diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 13:51:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 14:45:54 +0000 |
| commit | aea9c5ecdc17dbc15497afa4b6202f8af8a1a6d5 (patch) | |
| tree | 53c218ac59c81bee4cbda9e3d5a3ed28fca48304 /vcl/unx/generic | |
| parent | 2383d557e5751387451cefa33516736228429137 (diff) | |
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>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 2 |
2 files changed, 6 insertions, 6 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 |