diff options
Diffstat (limited to 'accessibility/source')
4 files changed, 23 insertions, 17 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 0ef5168141a5..63f7ff87ac10 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -19,8 +19,8 @@ #include <extended/accessiblelistbox.hxx> #include <extended/accessiblelistboxentry.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentry.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 8e11b4587e10..4a74477badb6 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -18,9 +18,9 @@ */ #include <extended/accessiblelistboxentry.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svtools/stringtransfer.hxx> -#include <svtools/svlbitm.hxx> +#include <vcl/svlbitm.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index 781412078835..edff82759c6e 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.cxx @@ -18,7 +18,7 @@ */ #include <extended/listboxaccessible.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/svapp.hxx> namespace accessibility diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 3c4dbd064b25..9ce18c4924f3 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -55,6 +55,7 @@ #include <extended/accessibleeditbrowseboxcell.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> +#include <vcl/treelistbox.hxx> #include <extended/AccessibleGridControl.hxx> #include <svtools/accessibletable.hxx> #include <vcl/popupmenuwindow.hxx> @@ -145,12 +146,6 @@ public: ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > - createAccessibleTreeListBox( - SvTreeListBox& _rListBox, - const css::uno::Reference< css::accessibility::XAccessible >& _xParent - ) const override; - - virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxHeaderBar( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable, @@ -314,6 +309,23 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleTabControl( _pXWindow )); } + else if ( nType == WindowType::TREELISTBOX ) + { + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); + DBG_ASSERT(pParent, "SvTreeListBox::CreateAccessible - accessible parent not found"); + if (pParent) + { + css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible(); + DBG_ASSERT(xAccParent.is(), "SvTreeListBox::CreateAccessible - accessible parent not found"); + if (xAccParent.is()) + { + xContext = static_cast<XAccessibleContext*>(new AccessibleListBox(*static_cast<SvTreeListBox*>(pWindow.get()), xAccParent)); + return xContext; + } + } + xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleComponent( _pXWindow )); + } + else if ( nType == WindowType::TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL ) { xContext = new VCLXAccessibleTabPageWindow( _pXWindow ); @@ -393,12 +405,6 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowCon return new Document( pVclXWindow, rEngine, rView ); } -Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox( - SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const -{ - return new AccessibleListBox( _rListBox, _xParent ); -} - Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable, AccessibleBrowseBoxObjType _eObjType ) const |