ooo-build r13683 - trunk/patches/dev300

[tml svn gnome org]

Author: tml
Date: Tue Aug 26 19:06:58 2008
New Revision: 13683
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13683&view=rev

Log:
Update for ooo300-m3.

Modified:
   trunk/patches/dev300/i92372.diff

Modified: trunk/patches/dev300/i92372.diff
==============================================================================
--- trunk/patches/dev300/i92372.diff	(original)
+++ trunk/patches/dev300/i92372.diff	Tue Aug 26 19:06:58 2008
@@ -9,13 +9,15 @@
  
  namespace com {
  namespace sun {
-@@ -376,11 +376,11 @@ public:
+@@ -376,13 +376,13 @@ public:
                          mbSuppressAccessibilityEvents:1,
                          mbMenuFloatingWindow:1,
                          mbDrawSelectionBackground:1,
 -                        mbIsInTaskPaneList:1,
                          mbToolbarFloatingWindow:1,
-                         mbCallHandlersDuringInputDisabled:1;
+                         mbCallHandlersDuringInputDisabled:1,
+                         mbDisableAccessibleLabelForRelation:1,
+                         mbDisableAccessibleLabeledByRelation:1;
  
      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 +	TaskPaneList       *mpTaskPaneList;
@@ -43,13 +45,15 @@
      SAL_DLLPRIVATE void        ImplMoveControlValue( ControlType, const ImplControlValue&, const Point& ) const;
 --- ../../../ooh680-m17/vcl/source/window/window.cxx	2008-01-23 19:15:07.000000000 +0200
 +++ vcl/source/window/window.cxx	2008-08-06 14:53:24.948625000 +0300
-@@ -770,9 +770,9 @@ void Window::ImplInitWindowData( WindowT
+@@ -770,11 +770,11 @@ void Window::ImplInitWindowData( WindowT
      mpWindowImpl->mbCreatedWithToolkit = FALSE;
      mpWindowImpl->mbSuppressAccessibilityEvents = FALSE; // TRUE: do not send any accessibility events
      mpWindowImpl->mbDrawSelectionBackground = FALSE;    // TRUE: draws transparent window background to indicate (toolbox) selection
 -    mpWindowImpl->mbIsInTaskPaneList = FALSE;           // TRUE: window was added to the taskpanelist in the topmost system window
      mpWindowImpl->mnNativeBackground  = 0;              // initialize later, depends on type
      mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled
+     mpWindowImpl->mbDisableAccessibleLabelForRelation = FALSE; // TRUE: do not set LabelFor relation on accessible objects
+     mpWindowImpl->mbDisableAccessibleLabeledByRelation = FALSE; // TRUE: do not set LabeledBy relation on accessible objects
 +    mpWindowImpl->mpTaskPaneList      = NULL;           // non-NULL:  taskpanelist the window has been added to 
  
      mbEnableRTL         = TRUE;         // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active