diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 18:26:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 18:29:31 +0100 |
| commit | 3042fa532a9b26203491b36f94d709c3b73e46ff (patch) | |
| tree | 11b75a3e6f3d71e930b71a456eac57439386edd3 /vcl/unx/generic/dtrans | |
| parent | 967331ef6a2765b7021bf835ce85f783257a936c (diff) | |
Move SalGenericData::GetSalDisplay() out of generic/gendata.hxx
...as it needs SalDisplay to be a complete type, but unx/saldisp.hxx depends on
X11 headers and can thus e.g. not be included in generic/gendata.hxx on Android.
Change-Id: Iec5f51408eef0d6eb7e2d04105a7408372b06079
Diffstat (limited to 'vcl/unx/generic/dtrans')
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 08c138d477ae..d2f648a4bfa4 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -3230,10 +3230,10 @@ void SelectionManager::startDrag( comphelper::SolarMutex& rSolarMutex( Application::GetSolarMutex() ); if( rSolarMutex.tryToAcquire() ) { - pCaptureFrame = GetGenericData()->GetSalDisplay()->GetCaptureFrame(); + pCaptureFrame = vcl_sal::getSalDisplay(GetGenericData())->GetCaptureFrame(); if( pCaptureFrame ) { - GetGenericData()->GetSalDisplay()->CaptureMouse( NULL ); + vcl_sal::getSalDisplay(GetGenericData())->CaptureMouse( NULL ); nPointerGrabSuccess = XGrabPointer( m_pDisplay, it->second.m_aRootWindow, True, DRAG_EVENT_MASK, @@ -3270,7 +3270,7 @@ void SelectionManager::startDrag( { comphelper::SolarMutex& rSolarMutex( Application::GetSolarMutex() ); if( rSolarMutex.tryToAcquire() ) - GetGenericData()->GetSalDisplay()->CaptureMouse( pCaptureFrame ); + vcl_sal::getSalDisplay(GetGenericData())->CaptureMouse( pCaptureFrame ); #if OSL_DEBUG_LEVEL > 0 else OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" ); @@ -3359,7 +3359,7 @@ void SelectionManager::startDrag( { comphelper::SolarMutex& rSolarMutex( Application::GetSolarMutex() ); if( rSolarMutex.tryToAcquire() ) - GetGenericData()->GetSalDisplay()->CaptureMouse( pCaptureFrame ); + vcl_sal::getSalDisplay(GetGenericData())->CaptureMouse( pCaptureFrame ); #if OSL_DEBUG_LEVEL > 0 else OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" ); |