Simplify BrowseBoxAccessibleElement
Change-Id: Ic8322090d38d58475c4c946e1f850950bce7421a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178027 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
This commit is contained in:
parent
259480c5e1
commit
ffa47ff780
2 changed files with 5 additions and 17 deletions
|
@ -309,12 +309,10 @@ private:
|
|||
// a version of AccessibleBrowseBoxBase which implements not only the XAccessibleContext,
|
||||
// but also the XAccessible
|
||||
|
||||
typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible
|
||||
> BrowseBoxAccessibleElement_Base;
|
||||
typedef cppu::ImplInheritanceHelper<AccessibleBrowseBoxBase, css::accessibility::XAccessible>
|
||||
BrowseBoxAccessibleElement_Base;
|
||||
|
||||
class BrowseBoxAccessibleElement
|
||||
:public AccessibleBrowseBoxBase
|
||||
,public BrowseBoxAccessibleElement_Base
|
||||
class BrowseBoxAccessibleElement : public BrowseBoxAccessibleElement_Base
|
||||
{
|
||||
protected:
|
||||
/** Constructor sets specified name and description. If the constant of a
|
||||
|
@ -355,10 +353,6 @@ public:
|
|||
// noncopyable
|
||||
BrowseBoxAccessibleElement(const BrowseBoxAccessibleElement&) = delete;
|
||||
const BrowseBoxAccessibleElement& operator=(const BrowseBoxAccessibleElement&) = delete;
|
||||
// XInterface
|
||||
DECLARE_XINTERFACE( )
|
||||
// XTypeProvider
|
||||
DECLARE_XTYPEPROVIDER( )
|
||||
|
||||
protected:
|
||||
virtual ~BrowseBoxAccessibleElement() override;
|
||||
|
|
|
@ -515,12 +515,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( )
|
|||
}
|
||||
|
||||
|
||||
// XInterface
|
||||
IMPLEMENT_FORWARD_XINTERFACE2( BrowseBoxAccessibleElement, AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base )
|
||||
|
||||
// XTypeProvider
|
||||
IMPLEMENT_FORWARD_XTYPEPROVIDER2( BrowseBoxAccessibleElement, AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base )
|
||||
|
||||
// css::accessibility::XAccessible
|
||||
|
||||
Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext()
|
||||
|
@ -533,7 +527,7 @@ Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessible
|
|||
|
||||
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
|
||||
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType )
|
||||
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
|
||||
: BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, _xFocusWindow, eObjType)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -541,7 +535,7 @@ BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Referenc
|
|||
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
|
||||
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType,
|
||||
const OUString& rName, const OUString& rDescription )
|
||||
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription )
|
||||
: BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue