[API CHANGE] a11y: Drop XAccessibleExtendedComponent::getFont
This method from the unpublished XAccessibleExtendedComponent interface is not used by any of the a11y platform bridges, and I don't know of any platform a11y API that would need it. In order to report character/font attributes, there is the XAccessibleText interface and its XAccessiText::getCharacterAttributes method instead, which actually gets used by the platform a11y bridges. Therefore, drop this method to simplify code, and also decouple the accessibility module a bit further from the toolkit module without having to reorganize code further. (VCLXFont from the toolkit module currently gets used in various implementations.) Change-Id: I06ea3cc5998a13927b3f869877b28f03ac07c89b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177809 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
parent
7431507d24
commit
a2c1a337f0
73 changed files with 1 additions and 360 deletions
|
@ -79,7 +79,6 @@ namespace accessibility
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
};
|
||||
|
|
|
@ -93,7 +93,6 @@ namespace accessibility
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
};
|
||||
|
|
|
@ -89,7 +89,6 @@ namespace accessibility
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
|
||||
|
|
|
@ -60,7 +60,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
|
||||
|
|
|
@ -78,7 +78,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
};
|
||||
|
|
|
@ -79,7 +79,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground() override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
};
|
||||
|
|
|
@ -92,7 +92,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
|
||||
|
|
|
@ -102,7 +102,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
|
||||
|
|
|
@ -127,7 +127,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
|
||||
|
|
|
@ -427,31 +427,6 @@ namespace accessibility
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > AccessibleTabBar::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
if ( m_pTabBar )
|
||||
{
|
||||
Reference< awt::XDevice > xDev( m_pTabBar->GetComponentInterface(), UNO_QUERY );
|
||||
if ( xDev.is() )
|
||||
{
|
||||
vcl::Font aFont;
|
||||
if ( m_pTabBar->IsControlFont() )
|
||||
aFont = m_pTabBar->GetControlFont();
|
||||
else
|
||||
aFont = m_pTabBar->GetFont();
|
||||
rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev, aFont);
|
||||
xFont = pVCLXFont;
|
||||
}
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString AccessibleTabBar::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -371,24 +371,6 @@ namespace accessibility
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > AccessibleTabBarPage::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
Reference< XAccessible > xParent = getAccessibleParent();
|
||||
if ( xParent.is() )
|
||||
{
|
||||
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
|
||||
if ( xParentComp.is() )
|
||||
xFont = xParentComp->getFont();
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString AccessibleTabBarPage::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -548,24 +548,6 @@ namespace accessibility
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > AccessibleTabBarPageList::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
Reference< XAccessible > xParent = getAccessibleParent();
|
||||
if ( xParent.is() )
|
||||
{
|
||||
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
|
||||
if ( xParentComp.is() )
|
||||
xFont = xParentComp->getFont();
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString AccessibleTabBarPageList::getTitledBorderText( )
|
||||
{
|
||||
return OUString();
|
||||
|
|
|
@ -277,33 +277,6 @@ sal_Int32 OAccessibleMenuComponent::getBackground( )
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > OAccessibleMenuComponent::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
|
||||
if ( m_pMenu )
|
||||
{
|
||||
vcl::Window* pWindow = m_pMenu->GetWindow();
|
||||
if ( pWindow )
|
||||
{
|
||||
Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
|
||||
if ( xDev.is() )
|
||||
{
|
||||
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
|
||||
rtl::Reference<VCLXFont> pVCLXFont
|
||||
= new VCLXFont(*xDev, rStyleSettings.GetMenuFont());
|
||||
xFont = pVCLXFont;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString OAccessibleMenuComponent::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -417,24 +417,6 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground( )
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
Reference< XAccessible > xParent = getAccessibleParent();
|
||||
if ( xParent.is() )
|
||||
{
|
||||
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
|
||||
if ( xParentComp.is() )
|
||||
xFont = xParentComp->getFont();
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString OAccessibleMenuItemComponent::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -227,13 +227,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground()
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont()
|
||||
{
|
||||
return Reference< awt::XFont >();
|
||||
}
|
||||
|
||||
|
||||
OUString VCLXAccessibleHeaderBarItem::getTitledBorderText()
|
||||
{
|
||||
return OUString();
|
||||
|
|
|
@ -378,24 +378,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground( )
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
Reference< XAccessible > xParent = getAccessibleParent();
|
||||
if ( xParent.is() )
|
||||
{
|
||||
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
|
||||
if ( xParentComp.is() )
|
||||
xFont = xParentComp->getFont();
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString VCLXAccessibleStatusBarItem::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -469,24 +469,6 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( )
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > VCLXAccessibleTabPage::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
Reference< XAccessible > xParent = getAccessibleParent();
|
||||
if ( xParent.is() )
|
||||
{
|
||||
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
|
||||
if ( xParentComp.is() )
|
||||
xFont = xParentComp->getFont();
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString VCLXAccessibleTabPage::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -594,10 +594,6 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( )
|
|||
}
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( )
|
||||
{
|
||||
return uno::Reference< awt::XFont >();
|
||||
}
|
||||
|
||||
OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( )
|
||||
{
|
||||
|
|
|
@ -480,32 +480,6 @@ sal_Int32 AccessibleDialogControlShape::getBackground( )
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > AccessibleDialogControlShape::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
vcl::Window* pWindow = GetWindow();
|
||||
if ( pWindow )
|
||||
{
|
||||
Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
|
||||
if ( xDev.is() )
|
||||
{
|
||||
vcl::Font aFont;
|
||||
if ( pWindow->IsControlFont() )
|
||||
aFont = pWindow->GetControlFont();
|
||||
else
|
||||
aFont = pWindow->GetFont();
|
||||
rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev, aFont);
|
||||
xFont = pVCLXFont;
|
||||
}
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString AccessibleDialogControlShape::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -750,31 +750,6 @@ sal_Int32 AccessibleDialogWindow::getBackground( )
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
Reference< awt::XFont > AccessibleDialogWindow::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
if ( m_pDialogWindow )
|
||||
{
|
||||
Reference< awt::XDevice > xDev( m_pDialogWindow->GetComponentInterface(), UNO_QUERY );
|
||||
if ( xDev.is() )
|
||||
{
|
||||
vcl::Font aFont;
|
||||
if ( m_pDialogWindow->IsControlFont() )
|
||||
aFont = m_pDialogWindow->GetControlFont();
|
||||
else
|
||||
aFont = m_pDialogWindow->GetFont();
|
||||
rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev, aFont);
|
||||
xFont = pVCLXFont;
|
||||
}
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
|
||||
OUString AccessibleDialogWindow::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -110,7 +110,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
};
|
||||
|
|
|
@ -124,7 +124,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
|
||||
|
|
|
@ -138,25 +138,6 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription()
|
|||
}
|
||||
|
||||
// ________ AccessibleChartElement::XAccessibleExtendedComponent ________
|
||||
Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
|
||||
{
|
||||
CheckDisposeState();
|
||||
|
||||
Reference< awt::XFont > xFont;
|
||||
Reference< awt::XDevice > xDevice( Reference< awt::XWindow >( GetInfo().m_xWindow ), uno::UNO_QUERY );
|
||||
|
||||
if( xDevice.is())
|
||||
{
|
||||
Reference< beans::XMultiPropertySet > xObjProp(
|
||||
ObjectIdentifier::getObjectPropertySet(
|
||||
GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ), uno::UNO_QUERY );
|
||||
awt::FontDescriptor aDescr(
|
||||
CharacterProperties::createFontDescriptorFromPropertySet( xObjProp ));
|
||||
xFont = xDevice->getFont( aDescr );
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
OUString SAL_CALL AccessibleChartElement::getTitledBorderText()
|
||||
{
|
||||
|
|
|
@ -70,7 +70,6 @@ public:
|
|||
virtual OUString SAL_CALL getAccessibleDescription() override;
|
||||
|
||||
// ________ XAccessibleExtendedComponent ________
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
|
||||
virtual OUString SAL_CALL getTitledBorderText() override;
|
||||
virtual OUString SAL_CALL getToolTipText() override;
|
||||
|
||||
|
|
|
@ -215,15 +215,6 @@ sal_Int32 AccessibleChartShape::getBackground()
|
|||
}
|
||||
|
||||
// ________ XAccessibleExtendedComponent ________
|
||||
Reference< awt::XFont > AccessibleChartShape::getFont()
|
||||
{
|
||||
Reference< awt::XFont > xFont;
|
||||
if ( m_pAccShape.is() )
|
||||
{
|
||||
xFont.set( m_pAccShape->getFont() );
|
||||
}
|
||||
return xFont;
|
||||
}
|
||||
|
||||
OUString AccessibleChartShape::getTitledBorderText()
|
||||
{
|
||||
|
|
|
@ -69,7 +69,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground() override;
|
||||
|
||||
// ________ XAccessibleExtendedComponent ________
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
|
||||
virtual OUString SAL_CALL getTitledBorderText() override;
|
||||
virtual OUString SAL_CALL getToolTipText() override;
|
||||
|
||||
|
|
|
@ -114,12 +114,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground()
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
css::uno::Reference< css::awt::XFont > SAL_CALL
|
||||
AccessibleComponentBase::getFont()
|
||||
{
|
||||
return uno::Reference<awt::XFont>();
|
||||
}
|
||||
|
||||
|
||||
OUString SAL_CALL AccessibleComponentBase::getTitledBorderText()
|
||||
{
|
||||
|
|
|
@ -92,7 +92,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground() override;
|
||||
|
||||
//===== XAccessibleExtendedComponent ====================================
|
||||
virtual css::uno::Reference<css::awt::XFont> SAL_CALL getFont() override;
|
||||
virtual OUString SAL_CALL getTitledBorderText() override;
|
||||
virtual OUString SAL_CALL getToolTipText() override;
|
||||
|
||||
|
|
|
@ -100,7 +100,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground( ) override;
|
||||
|
||||
// css::accessibility::XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
|
||||
virtual OUString SAL_CALL getTitledBorderText( ) override;
|
||||
virtual OUString SAL_CALL getToolTipText( ) override;
|
||||
|
||||
|
|
|
@ -37,14 +37,6 @@ module com { module sun { module star { module accessibility {
|
|||
*/
|
||||
interface XAccessibleExtendedComponent : XAccessibleComponent
|
||||
{
|
||||
/** Returns the font of this object.
|
||||
|
||||
@return
|
||||
The returned reference to a font object is empty if a font is not
|
||||
supported by this object.
|
||||
*/
|
||||
::com::sun::star::awt::XFont getFont ();
|
||||
|
||||
/** Returns the titled border text.
|
||||
|
||||
<p>This method stems from the Java interface
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
|
||||
"AccessibleShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
|
||||
"AccessibleShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
|
||||
"AccessibleShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleButton";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleEdit";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleEdit";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleEdit";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleEdit";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleList";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleListBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleMenu";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
|
||||
|
|
|
|
@ -1,4 +1,3 @@
|
|||
"AccessibleWindow";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
|
||||
"AccessibleWindow";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
|
||||
"AccessibleWindow";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
|
||||
"AccessibleWindow";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
|
||||
|
|
|
|
@ -29,7 +29,6 @@ import com.sun.star.awt.XFont;
|
|||
* <ul>
|
||||
* <li><code> getForeground()</code></li>
|
||||
* <li><code> getBackground()</code></li>
|
||||
* <li><code> getFont()</code></li>
|
||||
* <li><code> isEnabled()</code></li>
|
||||
* <li><code> getTitledBorderText()</code></li>
|
||||
* <li><code> getToolTipText()</code></li>
|
||||
|
@ -60,15 +59,6 @@ public class _XAccessibleExtendedComponent extends MultiMethodTest {
|
|||
tRes.tested("getBackground()", true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Just calls the method.
|
||||
*/
|
||||
public void _getFont() {
|
||||
XFont font = oObj.getFont();
|
||||
log.println("getFont(): " + font);
|
||||
tRes.tested("getFont()", true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls the method and checks returned value.
|
||||
* Has OK status if returned value isn't null.
|
||||
|
|
|
@ -385,14 +385,6 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground()
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
|
||||
css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont()
|
||||
{
|
||||
//todo
|
||||
return AccessibleComponentBase::getFont();
|
||||
}
|
||||
|
||||
|
||||
OUString SAL_CALL AccessibleCell::getTitledBorderText()
|
||||
{
|
||||
return AccessibleComponentBase::getTitledBorderText();
|
||||
|
|
|
@ -84,7 +84,6 @@ public:
|
|||
virtual sal_Int32 SAL_CALL getBackground() override;
|
||||
|
||||
// XAccessibleExtendedComponent
|
||||
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
|
||||
virtual OUString SAL_CALL getTitledBorderText() override;
|
||||
virtual OUString SAL_CALL getToolTipText() override;
|
||||
|
||||
|
|
|
@ -305,7 +305,6 @@ public class AccessibleStatusBarItem {
|
|||
System.out.println("*** Now testing XAccessibleExtendedComponent ***");
|
||||
_XAccessibleExtendedComponent _xAccExtComp =
|
||||
new _XAccessibleExtendedComponent(object);
|
||||
assertTrue("failed: "+accName+" - XAccessibleExtendedComponent::getFont", _xAccExtComp._getFont());
|
||||
assertTrue("failed: "+accName+" - XAccessibleExtendedComponent::getTitledBorderText", _xAccExtComp._getTitledBorderText());
|
||||
assertTrue("failed: "+accName+" - XAccessibleExtendedComponent::getToolTipText", _xAccExtComp._getToolTipText());
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ import com.sun.star.uno.UnoRuntime;
|
|||
* <ul>
|
||||
* <li><code> getForeground()</code></li>
|
||||
* <li><code> getBackground()</code></li>
|
||||
* <li><code> getFont()</code></li>
|
||||
* <li><code> isEnabled()</code></li>
|
||||
* <li><code> getTitledBorderText()</code></li>
|
||||
* <li><code> getToolTipText()</code></li>
|
||||
|
@ -44,15 +43,6 @@ public class _XAccessibleExtendedComponent {
|
|||
oObj = UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, object);
|
||||
}
|
||||
|
||||
/**
|
||||
* Just calls the method.
|
||||
*/
|
||||
public boolean _getFont() {
|
||||
XFont font = oObj.getFont();
|
||||
System.out.println("getFont(): " + font);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls the method and checks returned value.
|
||||
* Has OK status if returned value isn't null.
|
||||
|
|
|
@ -23,15 +23,6 @@
|
|||
|
||||
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
|
||||
|
||||
/**
|
||||
* @brief Just calls the method.
|
||||
*/
|
||||
void XAccessibleExtendedComponentTester::testGetFont()
|
||||
{
|
||||
auto font = mxExtendedComponent->getFont();
|
||||
std::cout << "font: " << font << std::endl;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Just calls the method.
|
||||
*/
|
||||
|
|
|
@ -35,13 +35,11 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
void testGetFont();
|
||||
void testGetTitledBorderText();
|
||||
void testGetToolTipText();
|
||||
|
||||
void testAll()
|
||||
{
|
||||
testGetFont();
|
||||
testGetTitledBorderText();
|
||||
testGetToolTipText();
|
||||
}
|
||||
|
|
|
@ -804,30 +804,6 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground( )
|
|||
|
||||
// XAccessibleExtendedComponent
|
||||
|
||||
uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
||||
uno::Reference< awt::XFont > xFont;
|
||||
VclPtr<vcl::Window> pWindow = GetWindow();
|
||||
if ( pWindow )
|
||||
{
|
||||
uno::Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), uno::UNO_QUERY );
|
||||
if ( xDev.is() )
|
||||
{
|
||||
vcl::Font aFont;
|
||||
if ( pWindow->IsControlFont() )
|
||||
aFont = pWindow->GetControlFont();
|
||||
else
|
||||
aFont = pWindow->GetFont();
|
||||
rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev, aFont);
|
||||
xFont = pVCLXFont;
|
||||
}
|
||||
}
|
||||
|
||||
return xFont;
|
||||
}
|
||||
|
||||
OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText( )
|
||||
{
|
||||
OExternalLockGuard aGuard( this );
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "a11ytextattributeswrapper.h"
|
||||
|
||||
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
|
||||
#include <com/sun/star/awt/FontSlant.hpp>
|
||||
#include <com/sun/star/awt/FontUnderline.hpp>
|
||||
#include <com/sun/star/awt/FontWeight.hpp>
|
||||
#include <com/sun/star/awt/FontStrikeout.hpp>
|
||||
|
|
Loading…
Reference in a new issue