diff options
Diffstat (limited to 'vcl/source/window/window2.cxx')
-rw-r--r-- | vcl/source/window/window2.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index b4c69e49d0ff..8282396af932 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -286,6 +286,7 @@ void Window::EndTracking( TrackingEventFlags nFlags ) ReleaseMouse(); // call EndTracking if required + if (mpWindowImpl && mpWindowImpl->mpFrameData) { Point aMousePos( mpWindowImpl->mpFrameData->mnLastMouseX, mpWindowImpl->mpFrameData->mnLastMouseY ); if( ImplIsAntiparallel() ) @@ -311,7 +312,7 @@ void Window::EndTracking( TrackingEventFlags nFlags ) bool Window::IsTracking() const { - return (ImplGetSVData()->mpWinData->mpTrackWin == this); + return mpWindowImpl && (ImplGetSVData()->mpWinData->mpTrackWin == this); } void Window::StartAutoScroll( StartAutoScrollFlags nFlags ) @@ -892,6 +893,11 @@ vcl::Window* Window::ImplGetFirstOverlapWindow() const vcl::Window* Window::ImplGetFirstOverlapWindow() const { + if (!mpWindowImpl) + { + return nullptr; + } + if ( mpWindowImpl->mbOverlapWin ) return this; else @@ -1192,7 +1198,7 @@ GetFocusFlags Window::GetGetFocusFlags() const bool Window::IsCompoundControl() const { - return mpWindowImpl->mbCompoundControl; + return mpWindowImpl ? mpWindowImpl->mbCompoundControl : false; } bool Window::IsWait() const |