diff options
Diffstat (limited to 'vcl/aqua/source/a11y')
30 files changed, 120 insertions, 120 deletions
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h index 3a7f13f8a545..b3dca45db868 100644 --- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h index c1806054e253..29ed17b65bf3 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx index 9ac9401abd62..7d7f3f273972 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get() { if ( ! theListener.is() ) theListener = new AquaA11yFocusListener(); - + return theListener; } @@ -72,20 +72,20 @@ id AquaA11yFocusListener::getFocusedUIElement() // intentionally do nothing .. } } - + return m_focusedObject; } //------------------------------------------------------------------------------ -void SAL_CALL +void SAL_CALL AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAccessible) { if ( nil != m_focusedObject ) { [ m_focusedObject release ]; m_focusedObject = nil; } - + try { if( xAccessible.is() ) { Reference< XAccessibleContext > xContext(xAccessible->getAccessibleContext()); @@ -102,17 +102,17 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc //------------------------------------------------------------------------------ -oslInterlockedCount SAL_CALL +oslInterlockedCount SAL_CALL AquaA11yFocusListener::acquire() SAL_THROW(()) -{ - return ReferenceObject::acquire(); +{ + return ReferenceObject::acquire(); } //------------------------------------------------------------------------------ -oslInterlockedCount SAL_CALL +oslInterlockedCount SAL_CALL AquaA11yFocusListener::release() SAL_THROW(()) -{ - return ReferenceObject::release(); +{ + return ReferenceObject::release(); } diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx index 1fdd340c698e..aae6fb37b0cc 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,12 +35,12 @@ // #include <com/sun/star/accessibility/XAccessibleContext.hpp> -class AquaA11yFocusListener : +class AquaA11yFocusListener : public KeyboardFocusListener, public salhelper::ReferenceObject { id m_focusedObject; - + static rtl::Reference< AquaA11yFocusListener > theListener; AquaA11yFocusListener::AquaA11yFocusListener(); @@ -48,15 +48,15 @@ class AquaA11yFocusListener : public: static rtl::Reference< AquaA11yFocusListener > get(); - + id getFocusedUIElement(); // KeyboardFocusListener virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible); - + // rtl::IReference virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(()); - virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()); + virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()); }; #endif // _AQUA11YFOCUSLISTENER_HXX_
\ No newline at end of file diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx index 2a8ebb39bd80..da623f8612c7 100644 --- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ using namespace ::com::sun::star::uno; //------------------------------------------------------------------------------ -static inline Window * +static inline Window * getWindow(const ::VclSimpleEvent *pEvent) { return static_cast< const ::VclWindowEvent *> (pEvent)->GetWindow(); @@ -86,13 +86,13 @@ long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke default: break; }; - + return 0; } //------------------------------------------------------------------------------ -AquaA11yFocusTracker::AquaA11yFocusTracker() : +AquaA11yFocusTracker::AquaA11yFocusTracker() : m_aWindowEventLink(this, (PSTUB) WindowEventHandler), m_xDocumentFocusListener(new DocumentFocusListener(*this)) { @@ -105,9 +105,9 @@ AquaA11yFocusTracker::AquaA11yFocusTracker() : void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAccessible) { if( xAccessible != m_xFocusedObject ) - { + { m_xFocusedObject = xAccessible; - + if( m_aFocusListener.is() ) m_aFocusListener->focusedObjectChanged(xAccessible); } @@ -118,7 +118,7 @@ void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAcc void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox) { Reference< XAccessible > xAccessible( pToolBox->GetAccessible() ); - + if( xAccessible.is() ) { Reference< XAccessibleContext > xContext(xAccessible->getAccessibleContext()); @@ -178,7 +178,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) if ( ! pToolBoxParent || ! pToolBoxParent->HasFocus() ) return; } - + notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow)); } @@ -187,7 +187,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) { ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() ); - + // Notify when leaving sub toolboxes if( pToolBoxParent && pToolBoxParent->HasFocus() ) notify_toolbox_item_focus( pToolBoxParent ); @@ -198,14 +198,14 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) { Reference< XAccessible > xAccessible( pWindow->GetAccessible() ); - + if( xAccessible.is() ) { Reference< XAccessibleSelection > xSelection(xAccessible->getAccessibleContext(), UNO_QUERY); - + if( xSelection.is() ) setFocusedObject( xSelection->getSelectedAccessibleChild(0) ); - } + } } //------------------------------------------------------------------------------ @@ -213,7 +213,7 @@ void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) { Menu * pMenu = pEvent->GetMenu(); - + if( pMenu ) { Reference< XAccessible > xAccessible( pMenu->GetAccessible() ); @@ -230,34 +230,34 @@ void AquaA11yFocusTracker::window_got_focus(Window *pWindow) // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED if( ! pWindow || !pWindow->IsReallyVisible() || pWindow->GetType() == WINDOW_MENUBARWINDOW ) return; - + // ToolBoxes are handled through VCLEVENT_TOOLBOX_HIGHLIGHT if( pWindow->GetType() == WINDOW_TOOLBOX ) return; - + if( pWindow->GetType() == WINDOW_TABCONTROL ) { tabpage_activated( pWindow ); return; } - + Reference< XAccessible > xAccessible(pWindow->GetAccessible()); - + if( ! xAccessible.is() ) return; - + Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext(); - + if( ! xContext.is() ) return; - + Reference< XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet(); - + if( ! xStateSet.is() ) return; - + /* the UNO ToolBox wrapper does not (yet?) support XAccessibleSelection, so we - * need to add listeners to the children instead of re-using the tabpage stuff + * need to add listeners to the children instead of re-using the tabpage stuff */ if( xStateSet->contains(AccessibleStateType::FOCUSED) && (pWindow->GetType() != WINDOW_TREELISTBOX) ) { diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx index 7f680f43b3a6..4eac807f3b0e 100644 --- a/vcl/aqua/source/a11y/aqua11ylistener.cxx +++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "aqua11ylistener.hxx" #include "aqua11yfactory.h" #include "aqua11yfocustracker.hxx" @@ -46,16 +46,16 @@ NSString * getTableNotification( const AccessibleEventObject& aEvent ) { AccessibleTableModelChange aChange; NSString * notification = nil; - + if( (aEvent.NewValue >>= aChange) && ( AccessibleTableModelChangeType::INSERT == aChange.Type || AccessibleTableModelChangeType::DELETE == aChange.Type ) && aChange.FirstRow != aChange.LastRow ) { notification = NSAccessibilityRowCountChangedNotification; } - + return notification; -} +} //------------------------------------------------------------------------------ @@ -66,14 +66,14 @@ AquaA11yEventListener::AquaA11yEventListener(id wrapperObject, sal_Int16 role) : //------------------------------------------------------------------------------ -AquaA11yEventListener::~AquaA11yEventListener() +AquaA11yEventListener::~AquaA11yEventListener() { [ m_wrapperObject release ]; } //------------------------------------------------------------------------------ -void SAL_CALL +void SAL_CALL AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeException ) { [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ]; @@ -81,13 +81,13 @@ AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeExce //------------------------------------------------------------------------------ -void SAL_CALL +void SAL_CALL AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException ) { NSString * notification = nil; id element = m_wrapperObject; Rectangle bounds; - + // TODO: NSAccessibilityValueChanged, NSAccessibilitySelectedRowsChangedNotification switch( aEvent.EventId ) { @@ -98,11 +98,11 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( AquaA11yFocusTracker::get().setFocusedObject( xAccessible ); } break; - + case AccessibleEventId::NAME_CHANGED: notification = NSAccessibilityTitleChangedNotification; break; - + case AccessibleEventId::CHILD: // only needed for tooltips (says Apple) if ( m_role == AccessibleRole::TOOL_TIP ) { @@ -113,11 +113,11 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( } } break; - + case AccessibleEventId::INVALIDATE_ALL_CHILDREN: - // TODO: depricate or remember all children + // TODO: depricate or remember all children break; - + case AccessibleEventId::BOUNDRECT_CHANGED: bounds = [ element accessibleComponent ] -> getBounds(); if ( m_oldBounds.X != 0 && ( bounds.X != m_oldBounds.X || bounds.Y != m_oldBounds.Y ) ) { @@ -128,23 +128,23 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( } m_oldBounds = bounds; break; - + case AccessibleEventId::SELECTION_CHANGED: notification = NSAccessibilitySelectedChildrenChangedNotification; break; - + case AccessibleEventId::TEXT_SELECTION_CHANGED: notification = NSAccessibilitySelectedTextChangedNotification; break; - + case AccessibleEventId::TABLE_MODEL_CHANGED: notification = getTableNotification(aEvent); break; - + case AccessibleEventId::CARET_CHANGED: notification = NSAccessibilitySelectedTextChangedNotification; break; - + case AccessibleEventId::TEXT_CHANGED: notification = NSAccessibilityValueChangedNotification; break; @@ -152,7 +152,7 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( default: break; } - + if( nil != notification ) NSAccessibilityPostNotification(element, notification); } diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h index f847eb3f41c3..e81b8b197bb3 100644 --- a/vcl/aqua/source/a11y/aqua11yrolehelper.h +++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h index a88e6c71c04b..d57b00179767 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h index 7bf3e44a2945..c2d5b32e21ed 100644 --- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h index fcf185ca5478..048231762d41 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h index dfdab349bafe..44f331ee6f28 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h index adf565f4d9bb..7f72497ada68 100644 --- a/vcl/aqua/source/a11y/aqua11yutil.h +++ b/vcl/aqua/source/a11y/aqua11yutil.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h index d3afebf7f828..6f6733f1ad0f 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h index aa35062d15c4..ea8a89dc7882 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h index 95fee9a3ec4b..821d741f47d1 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h index 7ed76d607176..c1c3e715cab4 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h index 7757e067ee22..0736825a93b4 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h index 95df8323467b..ba162effbdc7 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h index 13ceee6f826f..fcab796c294b 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h index 544b709223b3..f4c2fbdc758b 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h index 252af6f5987f..4aff5d836c70 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h index 2c206fd0904b..8b3c03f6024c 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h index 1070c682cd5e..3921b5c31213 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h index 084a72ea7a18..ca67c3975188 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h +++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h index c21e5573d125..d049fd7b8fd1 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h index be72b9e27396..778047e24e69 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h index 724f85994053..d72aaa639189 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h index e7ac0a25acec..d27d733bc63c 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx index 02a7337ce397..95f76dca5e88 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.cxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "documentfocuslistener.hxx" #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_ @@ -38,16 +38,16 @@ #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #endif - + using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - + //------------------------------------------------------------------------------ DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) : - m_aFocusTracker(rTracker) + m_aFocusTracker(rTracker) { } @@ -57,7 +57,7 @@ void SAL_CALL DocumentFocusListener::disposing( const EventObject& aEvent ) throw (RuntimeException) { - // Unref the object here, but do not remove as listener since the object + // Unref the object here, but do not remove as listener since the object // might no longer be in a state that safely allows this. if( aEvent.Source.is() ) m_aRefList.erase(aEvent.Source); @@ -65,18 +65,18 @@ DocumentFocusListener::disposing( const EventObject& aEvent ) //------------------------------------------------------------------------------ -void SAL_CALL -DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) +void SAL_CALL +DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException ) { switch( aEvent.EventId ) { case AccessibleEventId::STATE_CHANGED: - try + try { sal_Int16 nState = AccessibleStateType::INVALID; aEvent.NewValue >>= nState; - + if( AccessibleStateType::FOCUSED == nState ) m_aFocusTracker.setFocusedObject( getAccessible(aEvent) ); } @@ -85,18 +85,18 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) OSL_TRACE("Focused object has invalid index in parent"); } break; - + case AccessibleEventId::CHILD: { Reference< XAccessible > xChild; if( (aEvent.OldValue >>= xChild) && xChild.is() ) detachRecursive(xChild); - + if( (aEvent.NewValue >>= xChild) && xChild.is() ) attachRecursive(xChild); } break; - + case AccessibleEventId::INVALIDATE_ALL_CHILDREN: { Reference< XAccessible > xAccessible( getAccessible(aEvent) ); @@ -117,10 +117,10 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessible > xAccessible(aEvent.Source, UNO_QUERY); - + if( xAccessible.is() ) return xAccessible; - + Reference< XAccessibleContext > xContext(aEvent.Source, UNO_QUERY); if( xContext.is() ) @@ -135,13 +135,13 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& } } } - + return Reference< XAccessible >(); } //------------------------------------------------------------------------------ -void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible) +void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible) throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext(); @@ -153,8 +153,8 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc //------------------------------------------------------------------------------ void DocumentFocusListener::attachRecursive( - const Reference< XAccessible >& xAccessible, - const Reference< XAccessibleContext >& xContext + const Reference< XAccessible >& xAccessible, + const Reference< XAccessibleContext >& xContext ) throw (IndexOutOfBoundsException, RuntimeException) { if( xContext.is() ) @@ -169,13 +169,13 @@ void DocumentFocusListener::attachRecursive( //------------------------------------------------------------------------------ void DocumentFocusListener::attachRecursive( - const Reference< XAccessible >& xAccessible, + const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext, - const Reference< XAccessibleStateSet >& xStateSet + const Reference< XAccessibleStateSet >& xStateSet ) throw (IndexOutOfBoundsException,RuntimeException) { if( xStateSet->contains(AccessibleStateType::FOCUSED ) ) - m_aFocusTracker.setFocusedObject( xAccessible ); + m_aFocusTracker.setFocusedObject( xAccessible ); Reference< XAccessibleEventBroadcaster > xBroadcaster = Reference< XAccessibleEventBroadcaster >(xContext, UNO_QUERY); @@ -191,7 +191,7 @@ void DocumentFocusListener::attachRecursive( for( n = 0; n < nmax; n++ ) { Reference< XAccessible > xChild( xContext->getAccessibleChild( n ) ); - + if( xChild.is() ) attachRecursive(xChild); } @@ -201,7 +201,7 @@ void DocumentFocusListener::attachRecursive( //------------------------------------------------------------------------------ -void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible) +void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible) throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext(); @@ -213,8 +213,8 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc //------------------------------------------------------------------------------ void DocumentFocusListener::detachRecursive( - const Reference< XAccessible >& xAccessible, - const Reference< XAccessibleContext >& xContext + const Reference< XAccessible >& xAccessible, + const Reference< XAccessibleContext >& xContext ) throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet(); @@ -226,9 +226,9 @@ void DocumentFocusListener::detachRecursive( //------------------------------------------------------------------------------ void DocumentFocusListener::detachRecursive( - const Reference< XAccessible >&, + const Reference< XAccessible >&, const Reference< XAccessibleContext >& xContext, - const Reference< XAccessibleStateSet >& xStateSet + const Reference< XAccessibleStateSet >& xStateSet ) throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessibleEventBroadcaster > xBroadcaster = @@ -237,17 +237,17 @@ void DocumentFocusListener::detachRecursive( if( xBroadcaster.is() && 0 < m_aRefList.erase(xBroadcaster) ) { xBroadcaster->removeEventListener(static_cast< XAccessibleEventListener *>(this)); - + if( ! xStateSet->contains(AccessibleStateType::MANAGES_DESCENDANTS ) ) { sal_Int32 n, nmax = xContext->getAccessibleChildCount(); for( n = 0; n < nmax; n++ ) { Reference< XAccessible > xChild( xContext->getAccessibleChild( n ) ); - + if( xChild.is() ) detachRecursive(xChild); } } - } + } } diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx index 863bc59d173f..cf32314fcec0 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.hxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ // - DocumentFocusListener - // ------------------------- -class DocumentFocusListener : +class DocumentFocusListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener > { @@ -85,16 +85,16 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) + virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); private: std::set< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > m_aRefList; - + AquaA11yFocusTracker& m_aFocusTracker; }; |