diff options
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/inc/toolkit/awt/vclxwindows.hxx | 4 | ||||
-rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 12 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 4 |
4 files changed, 0 insertions, 22 deletions
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index dfbeabbeb023..0cbd7e422855 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -876,10 +876,8 @@ public: class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField, public VCLXFormattedSpinField { -//IAccessibility2 Impplementaton 2009----- protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); -//-----IAccessibility2 Impplementaton 2009 public: VCLXDateField(); ~VCLXDateField(); @@ -926,10 +924,8 @@ public: class VCLXTimeField : public ::com::sun::star::awt::XTimeField, public VCLXFormattedSpinField { -//IAccessibility2 Impplementaton 2009----- protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); -//-----IAccessibility2 Impplementaton 2009 public: VCLXTimeField(); ~VCLXTimeField(); diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 77e708fa28af..c4b3f7b7dded 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -37,10 +37,8 @@ #include <toolkit/awt/vclxfont.hxx> #include <vcl/dialog.hxx> #include <vcl/window.hxx> -//IAccessibility2 Implementation 2009----- //Solution:Need methods in Edit. #include <vcl/edit.hxx> -//-----IAccessibility2 Implementation 2009 #include <tools/debug.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> @@ -445,9 +443,7 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation Window* pWindow = GetWindow(); if ( pWindow ) { -//IAccessibility2 Implementation 2009----- Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); -//-----IAccessibility2 Implementation 2009 if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -462,7 +458,6 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation aSequence[0] = pLabelFor->GetAccessible(); rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) ); } -//IAccessibility2 Implementation 2009----- Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != pWindow ) { @@ -475,7 +470,6 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation { rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aFlowToSequence ) ); } -//-----IAccessibility2 Implementation 2009 } } @@ -524,19 +518,16 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel if ( pWindow->GetStyle() & WB_SIZEABLE ) rStateSet.AddState( accessibility::AccessibleStateType::RESIZABLE ); -//IAccessibility2 Implementation 2009----- // 6. frame doesn't have MOVABLE state // 10. for password text, where is the sensitive state? if( ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||getAccessibleRole() == accessibility::AccessibleRole::DIALOG )&& pWindow->GetStyle() & WB_MOVEABLE ) rStateSet.AddState( accessibility::AccessibleStateType::MOVEABLE ); -//-----IAccessibility2 Implementation 2009 if( pWindow->IsDialog() ) { Dialog *pDlg = static_cast< Dialog* >( pWindow ); if( pDlg->IsInExecute() ) rStateSet.AddState( accessibility::AccessibleStateType::MODAL ); } -//IAccessibility2 Implementation 2009----- //Solution:If a combobox or list's edit child isn't read-only,EDITABLE state // should be set. if( pWindow && pWindow->GetType() == WINDOW_COMBOBOX ) @@ -567,7 +558,6 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel } pChild = pChild->GetWindow( WINDOW_NEXT ); } -//-----IAccessibility2 Implementation 2009 } else { @@ -903,11 +893,9 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground( ) throw (uno::Runtim else aFont = pWindow->GetFont(); nColor = aFont.GetColor().GetColor(); -//IAccessibility2 Implementation 2009----- // COL_AUTO is not very meaningful for AT if ( nColor == (sal_Int32)COL_AUTO) nColor = pWindow->GetTextColor().GetColor(); -//-----IAccessibility2 Implementation 2009 } } diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 7a49ed2bdf32..0a2b0db836ed 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -632,11 +632,9 @@ void SAL_CALL VCLXToolkit::disposing() ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createWindow( const ::com::sun::star::awt::WindowDescriptor& rDescriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { -//IAccessibility2 Implementation 2009----- #ifdef WNT CEnableAccessInterface e; #endif -//-----IAccessibility2 Implementation 2009 return ImplCreateWindow( rDescriptor, WinBits(0) ); } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 0078fb5aa9b4..26a132b58adc 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -4505,7 +4505,6 @@ VCLXDateField::~VCLXDateField() { } -//IAccessibility2 Implementation 2009----- //change the window type here to match the role ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext() { @@ -4516,7 +4515,6 @@ VCLXDateField::~VCLXDateField() } return getAccessibleFactory().createAccessibleContext( this ); } -//-----IAccessibility2 Implementation 2009 // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXDateField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) @@ -4859,7 +4857,6 @@ VCLXTimeField::VCLXTimeField() VCLXTimeField::~VCLXTimeField() { } -//IAccessibility2 Implementation 2009----- //change the window type here to match the role ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext() { @@ -4870,7 +4867,6 @@ VCLXTimeField::~VCLXTimeField() } return getAccessibleFactory().createAccessibleContext( this ); } -//-----IAccessibility2 Implementation 2009 // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXTimeField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) |