[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/apply                     |    1 
 patches/dev300/sw-auto-scrollbars-2.diff |   32 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

New commits:
commit 53d636cc711d475e2fc2ecc42be34b9353080e1f
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Mar 25 16:59:12 2010 +0100

    fix possible crash in new auto scrollbars code
    
    * patches/dev300/apply:
    * patches/dev300/sw-auto-scrollbars-2.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0fc9e1c..a67a09f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3707,6 +3707,7 @@ vcl-netbook-export-small-screen-mode.diff, rodo
 framework-netbook-use-small-screen-mode.diff, rodo
 sw-auto-scrollbars.diff, rodo
 sw-auto-scrollbars-1.diff, rodo
+sw-auto-scrollbars-2.diff, rodo
 
 [ MacOSXOnly ]
 SectionOwner => thorsten
diff --git a/patches/dev300/sw-auto-scrollbars-2.diff b/patches/dev300/sw-auto-scrollbars-2.diff
new file mode 100644
index 0000000..b46bef2
--- /dev/null
+++ b/patches/dev300/sw-auto-scrollbars-2.diff
@@ -0,0 +1,32 @@
+diff -rup sw/source/ui/uiview-orig/view.cxx sw/source/ui/uiview/view.cxx
+--- sw/source/ui/uiview-orig/view.cxx	2010-03-25 16:38:12.000000000 +0100
++++ sw/source/ui/uiview/view.cxx	2010-03-25 16:49:08.000000000 +0100
+@@ -1133,6 +1133,8 @@ SwView::SwView( SfxViewFrame *_pFrame, S
+       	    ShowHScrollbar( FALSE );
+     if( !pVScrollbar->IsVisible( TRUE ) )
+       	    ShowVScrollbar( FALSE );
++
++    GetViewFrame()->GetWindow().AddChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
+ }
+ 
+ /*--------------------------------------------------------------------
+@@ -1142,6 +1144,7 @@ SwView::SwView( SfxViewFrame *_pFrame, S
+ 
+ SwView::~SwView()
+ {
++    GetViewFrame()->GetWindow().RemoveChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
+     delete mpPostItMgr;
+     // --> OD 2009-03-10 #i100035#
+     mpPostItMgr = 0;
+diff -rup sw/source/ui/uiview-orig/viewmdi.cxx sw/source/ui/uiview/viewmdi.cxx
+--- sw/source/ui/uiview-orig/viewmdi.cxx	2010-03-25 16:38:12.000000000 +0100
++++ sw/source/ui/uiview/viewmdi.cxx	2010-03-25 16:39:31.000000000 +0100
+@@ -363,8 +363,6 @@ int SwView::_CreateScrollbar( BOOL bHori
+ 
+     (*ppScrollbar)->SetAuto( TRUE );
+ 
+-    pMDI->AddChildEventListener( LINK( this, SwView, WindowChildEventListener ));
+-
+     if(GetWindow())
+         InvalidateBorder();
+