[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                       |    4 +
 patches/dev300/layout-accessibility-dispose-only-once.diff |   39 +------------
 2 files changed, 6 insertions(+), 37 deletions(-)

New commits:
commit d3d4f5684b0749c778994455f53bfef5e91217c1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 13:06:38 2009 +0300

    layoutdialogs2-development.diff seems to be upstream
    
    * patches/dev300/apply: Bypass layoutdialogs2-development.diff as it
      seems to be upstream. Leave it in git and commented out with a FIXME
      comment for now, though, so janneke can have a closer look.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 43e3ba0..968837f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2341,7 +2341,9 @@ layout-disable-experimental.diff
 layout-accessibility-dispose-only-once.diff, n#500267, janneke
 
 [ LayoutDialogs ]
-layoutdialogs2-development.diff
+# FIXME: 2009-08-13: Seems to be upstream? --tml
+# layoutdialogs2-development.diff
+
 buildfix-toolkit-workben-layout.diff
 
 # Fix heavy parallel build of the zips containing the xmls
commit bd8589dcfd81e9eb2714803d836b8073468445f1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 13:03:28 2009 +0300

    Adapt layout-accessibility-dispose-only-once.diff for dev300-m54
    
    * patches/dev300/layout-accessibility-dispose-only-once.diff: Adapt
      for dev300-m54. The diff to toolkit/source/awt/vclxwindow.cxx is
      already upstream.

diff --git a/patches/dev300/layout-accessibility-dispose-only-once.diff b/patches/dev300/layout-accessibility-dispose-only-once.diff
index 079a18f..bf8dc54 100644
--- a/patches/dev300/layout-accessibility-dispose-only-once.diff
+++ b/patches/dev300/layout-accessibility-dispose-only-once.diff
@@ -1,40 +1,9 @@
-From b4df589af5db5b00a308b9e12acbaa19092844a9 Mon Sep 17 00:00:00 2001
-From: Jan Nieuwenhuizen <janneke at gnu.org>
-Date: Tue, 5 May 2009 12:43:01 +0200
-Subject: [PATCH] Layout with accessibility: dispose only once.  Fixes n#500267.
-
-   * Modified     toolkit/source/awt/vclxwindow.cxx
-   * Modified     toolkit/source/layout/vcl/wfield.cxx
-   * Modified     toolkit/source/layout/vcl/wrapper.cxx
----
- toolkit/source/awt/vclxwindow.cxx     |    4 ----
- toolkit/source/layout/vcl/wfield.cxx  |    4 ++++
- toolkit/source/layout/vcl/wrapper.cxx |   13 ++++++-------
- 3 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git toolkit/source/awt/vclxwindow.cxx toolkit/source/awt/vclxwindow.cxx
-index 35a08a3..90c1337 100644
---- toolkit/source/awt/vclxwindow.cxx
-+++ toolkit/source/awt/vclxwindow.cxx
-@@ -402,10 +402,6 @@ void VCLXWindowImpl::disposing()
- 	aEvent.Source = mrAntiImpl;
- 
- 	maEventListeners.disposeAndClear( aEvent );
--#if 0 // ENABLE_LAYOUT
--        /* FIXME: see layout::~ComboBox () */
--        if (!dynamic_cast<VCLXComboBox*> (this))
--#endif /* 0 ENABLE_LAYOUT */
- 	maFocusListeners.disposeAndClear( aEvent );
- 	maWindowListeners.disposeAndClear( aEvent );
- 	maKeyListeners.disposeAndClear( aEvent );
-diff --git toolkit/source/layout/vcl/wfield.cxx toolkit/source/layout/vcl/wfield.cxx
-index a792d47..d9d21a6 100644
 --- toolkit/source/layout/vcl/wfield.cxx
 +++ toolkit/source/layout/vcl/wfield.cxx
 @@ -420,6 +420,8 @@ public:
- ComboBox::~ComboBox ()
- {
+ #ifndef __SUNPRO_CC
      OSL_TRACE ("%s: deleting ComboBox for window: %p", __FUNCTION__, GetWindow ());
+ #endif
 +    SetClickHdl (Link ());
 +    SetSelectHdl (Link ());
  }
@@ -48,7 +17,7 @@ index a792d47..d9d21a6 100644
 +    SetSelectHdl (Link ());
  }
  
- sal_uInt16 ListBox::InsertEntry(const OUString& rStr, sal_uInt16 nPos)
+ sal_uInt16 ListBox::InsertEntry (String const& rStr, sal_uInt16 nPos)
 diff --git toolkit/source/layout/vcl/wrapper.cxx toolkit/source/layout/vcl/wrapper.cxx
 index 31a1fcb..f9c0a4c 100644
 --- toolkit/source/layout/vcl/wrapper.cxx
@@ -97,6 +66,3 @@ index 31a1fcb..f9c0a4c 100644
  }
  
  void SAL_CALL ControlImpl::focusGained (awt::FocusEvent const&)
--- 
-1.6.0.4
-