Attachment 58205 Details for Bug 46728 – Possible fix

[patch] Possible fix

0001-Fixes-crash-in-Window-GetCursor.patch (text/plain), 1.94 KB, created by Szabolcs Dézsi on 2012-03-08 10:49:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Szabolcs Dézsi

Created: 2012-03-08 10:49:19 UTC

Size: 1.94 KB

patch

obsolete

>From b887ce90a1f654a4472425fcefc73af8a52395ee Mon Sep 17 00:00:00 2001
>From: Szabolcs Dezsi <dezsiszabi@hotmail.com>
>Date: Thu, 8 Mar 2012 19:32:51 +0100
>Subject: [PATCH] Fixes crash in Window::GetCursor()
>
>---
> svx/source/sdr/overlay/overlaymanagerbuffered.cxx |    5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
>
>diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
>index 1a0016f..eb117f7 100644
>--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
>+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
>@@ -233,11 +233,11 @@ namespace sdr
>                 // prepare cursor handling
>                 const bool bTargetIsWindow(OUTDEV_WINDOW == rmOutputDevice.GetOutDevType());
>                 bool bCursorWasEnabled(false);
>+                Window& rWindow = static_cast< Window& >(rmOutputDevice);
> 
>                 // #i80730# switch off VCL cursor during overlay refresh
>                 if(bTargetIsWindow)
>                 {
>-                    Window& rWindow = static_cast< Window& >(rmOutputDevice);
>                     Cursor* pCursor = rWindow.GetCursor();
> 
>                     if(pCursor && pCursor->IsVisible())
>@@ -354,8 +354,6 @@ namespace sdr
>                 // To get the update, the windows in question are updated manulally here.
>                 if(bTargetIsWindow)
>                 {
>-                    Window& rWindow = static_cast< Window& >(rmOutputDevice);
>-
>                     if(rWindow.IsChildTransparentModeEnabled() && rWindow.GetChildCount())
>                     {
>                         const Rectangle aRegionRectanglePixel(
>@@ -383,7 +381,6 @@ namespace sdr
>                 // #i80730# restore visibility of VCL cursor
>                 if(bCursorWasEnabled)
>                 {
>-                    Window& rWindow = static_cast< Window& >(rmOutputDevice);
>                     Cursor* pCursor = rWindow.GetCursor();
> 
>                     if(pCursor)
>-- 
>1.7.7
>

Actions: View | Splinter Review

Attachments on bug 46728: 58205 | 58243

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.