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 /avmedia | |
| 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 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcplayer.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 24722f03dfe2..a9de0a6f7560 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -923,7 +923,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co sal_IntPtr pIntPtr = 0; rArguments[ 2 ] >>= pIntPtr; SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr ); - const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : nullptr; + const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemChildSystemData() : nullptr; OSL_ASSERT(pEnvData); if (pEnvData) { diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 6e1b3b101d73..5a8762aa17ac 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -184,7 +184,7 @@ namespace SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr ); - const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : nullptr; + const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemChildSystemData() : nullptr; if (pEnvData == nullptr) return -1; |