CWS-TOOLING: integrate CWS swa11y32_2nd

2009-08-13 13:04:09 +0200 mav  r274936 : #i104204# remove support for Ctrl-Tab
2009-08-13 09:59:22 +0200 od  r274924 : #i93269# method <atk_wrapper_focus_idle_handler(..)>
	 - emit also object:state-changed:focus, if cursor is inside <XAccessibleText> object
2009-08-11 12:15:11 +0200 tl  r274851 : CWS-TOOLING: rebase CWS swa11y32_2nd to trunk@274622 (milestone: DEV300:m54)
2009-07-14 17:35:03 +0200 tl  r273982 : 2009-07-10 10:46:39 +0200 tl  r273879 : CWS-TOOLING: rebase CWS swa11y32 to trunk@273468 (milestone: DEV300:m51)
2009-07-01 14:00:25 +0200 mav  r273577 : #i102879# the text of the button should not change
2009-07-01 13:16:19 +0200 od  r273574 : #159496# method <GetHelpAnchor_Impl(..)>
	 - do not release the solar mutex
2009-06-29 15:29:10 +0200 od  r273476 : #i95042# method <CreateXWindow(..)>
	 - return instance <VCLXComboBox> for <Window> instance of type <MetricBox>.
	   note: <MetricBox> is inherited from <ComboBox>
2009-06-23 15:49:32 +0200 mav  r273283 : #i101967# fix tab-control implementation
2009-06-22 13:56:22 +0200 od  r273229 : #i100938# method <text_wrapper_get_run_attributes(..)>
	  - always provide start_offset and end_offset
	  - do _not_ increment the end_offset provide by <accessibility::TextSegment> instance
2009-06-02 12:09:03 +0200 mav  r272492 : #i101959# Let the additional dialog window add its childred to the parents tab-hierarchy
2009-06-02 09:55:39 +0200 mav  r272484 : #i102015# allow to have indirect child windows in tab-hierarchy
2009-06-02 09:49:42 +0200 mav  r272482 : #i102015# Let the windows containing the extension dialog controls add controls to the tab hierarchy
2009-05-27 15:45:33 +0200 od  r272354 : #i101012# method <SvxIconChoiceCtrl_Impl::EntrySelected(..)>
	  - emit vcl event LISTBOX_SELECT only in case that the given entry is selected.
2009-05-27 09:54:36 +0200 od  r272333 : #i92103# map UNO-API accessible events list box entry expanded/collapsed
	 to corresponding atk events.
2009-05-27 09:52:15 +0200 od  r272331 : #i92103# process list box entry expanded/collapsed events
2009-05-27 09:49:19 +0200 od  r272330 : #i92103# emit vcl event list box entry expanded/collapsed
2009-05-26 10:42:05 +0200 od  r272283 : #i93269# correct fix: check success of <queryInterface> call
2009-05-04 15:52:04 +0200 od  r271469 : #i92103# new vcl event ids VCLEVENT_LISTBOX_ENTRY_EXPANDED and VCLEVENT_LISTBOX_ENTRY_COLLAPSED
2009-05-04 15:10:20 +0200 od  r271460 : #i92103# refine definition of new constants
2009-05-04 14:36:44 +0200 od  r271454 : #i92103# new constants for indicating that a list box entry is
	 expanded respectively collapsed.
2009-04-30 16:09:40 +0200 od  r271421 : #i93269# method <atk_wrapper_focus_idle_handler(..)>
	 - emit text_caret_moved event for <XAccessibleText> object,
	   if cursor is inside the <XAccessibleText> object.
2009-04-22 14:00:10 +0200 tl  r271105 : warning-free code
2009-04-22 09:17:30 +0200 tl  r271073 : CWS-TOOLING: rebase CWS swa11y32 to trunk@270723 (milestone: DEV300:m46)
2009-04-20 12:53:03 +0200 cd  r270974 : #i83639# Check extendedhelp state to provide correct tool tip text
2009-04-03 13:07:13 +0200 tl  r270471 : #i63983# changed accessible object names to empty strings
2009-04-01 15:52:09 +0200 tl  r270336 : #i90991# accessible names and description for paragraphs should be empty
2009-04-01 15:12:42 +0200 tl  r270333 : #i90991# accessible names and description for paragraphs should be empty
2009-04-01 15:10:34 +0200 tl  r270331 : warning-free code
2009-04-01 12:54:44 +0200 tl  r270319 : #i89176# Implementation of XAccessibleMultiLineText in EditEngine
2009-04-01 12:52:56 +0200 tl  r270318 : #i89176# Implementation of XAccessibleMultiLineText in EditEngine
2009-03-27 18:31:01 +0100 tbe  r270166 : #i92143# text getRangeExtents reports incorrect 'x' values for spreadsheet cells
2009-03-13 13:43:54 +0100 tl  r269476 : #i94322# ImpEditView::ShowCursor and nPara == USHRT_MAX problem fixed
2009-03-12 10:27:30 +0100 tl  r269366 : warning-free code; unresolved external dbg_out when compiling with debug=t
2009-03-11 12:40:31 +0100 tl  r269312 : warning-free code Solaris x86
2009-03-10 15:49:01 +0100 tl  r269279 : #i86443# handle GetColumnCount() == 0
2009-03-10 10:48:32 +0100 cl  r269254 : #i91742# name cells for accessibility
2009-03-09 17:06:33 +0100 cl  r269203 : #i91742# call init on accessible cells

2 files changed, 14 insertions, 3 deletions

diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index a294edf2bc..8628744fbc 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/awt/XContainerWindowProvider.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
+#include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -90,7 +91,7 @@ FwkTabPage::FwkTabPage(
                const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl,
                const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider ) :
 
-    TabPage( pParent, WB_DIALOGCONTROL ),
+    TabPage( pParent, WB_DIALOGCONTROL | WB_TABSTOP | WB_CHILDDLGCTRL ),
 
     m_sPageURL          ( rPageURL ),
     m_xEventHdl         ( rEventHdl ),
@@ -122,6 +123,18 @@ void FwkTabPage::CreateDialog()
             m_xWinProvider->createContainerWindow(
                 m_sPageURL, rtl::OUString(), xParent, xHandler ), uno::UNO_QUERY );
     
+        uno::Reference< awt::XControl > xPageControl( m_xPage, uno::UNO_QUERY );
+        if ( xPageControl.is() )
+        {
+            uno::Reference< awt::XWindowPeer > xWinPeer( xPageControl->getPeer() );
+            if ( xWinPeer.is() )
+            {
+                Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer );
+                if ( pWindow )
+                    pWindow->SetStyle( pWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL );
+            }
+        }
+
         CallMethod( INITIALIZE_METHOD );
     }
     catch ( lang::IllegalArgumentException& )
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 7757a0e30b..d8a1682499 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -246,7 +246,6 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta
                            < m_aDropdownMenuList.size() ) )
                     {
                         m_aCurrentSelection = m_aDropdownMenuList[nPos];
-                        m_pToolbar->SetItemText( m_nID, m_aCurrentSelection );
 
                         // send notification
                         uno::Sequence< beans::NamedValue > aInfo( 1 );
@@ -353,7 +352,6 @@ IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu )
     if ( nItemId > 0 && nItemId <= m_aDropdownMenuList.size() )
     {
         m_aCurrentSelection = m_aDropdownMenuList[nItemId-1];
-        m_pToolbar->SetItemText( m_nID, m_aCurrentSelection );
 
         execute( 0 );
     }