diff options
5 files changed, 10 insertions, 10 deletions
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx index 237a72d1b2dc..7777e920b72a 100644 --- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx @@ -41,7 +41,7 @@ namespace accessibility virtual OUString GetEntry( sal_Int32 nPos ) const = 0; virtual Rectangle GetDropDownPosSizePixel( ) const = 0; virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0; - virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) = 0; + virtual Rectangle GetWindowExtentsRelative() = 0; virtual bool IsEnabled() const = 0; virtual bool IsEntryVisible( sal_Int32 nPos ) const = 0; virtual sal_uInt16 GetDisplayLineCount() const = 0; diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx index eafbbbb9bf79..1dec33d21134 100644 --- a/accessibility/inc/accessibility/helper/listboxhelper.hxx +++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx @@ -76,9 +76,9 @@ public: return aRect; } - virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) override + virtual Rectangle GetWindowExtentsRelative() override { - return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow ); + return m_aComboListBox.GetWindowExtentsRelative( nullptr ); } virtual bool IsEnabled() const override diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index 105a76e55e84..a5cda263d93f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -75,7 +75,7 @@ protected: virtual css::lang::Locale implGetLocale() override; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; - OUString GetText( bool _bAsName ); + OUString GetText(); public: VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos ); diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 2ce3c9110d2f..26cd9d842906 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -377,7 +377,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (Runti { Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ); aPoint = aRect.TopLeft(); - aPoint += m_pListBoxHelper->GetWindowExtentsRelative( nullptr ).TopLeft(); + aPoint += m_pListBoxHelper->GetWindowExtentsRelative().TopLeft(); } return AWTPoint( aPoint ); } diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 8a2ec252eee0..fc4c7ed15fbb 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -74,7 +74,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In OSL_ENSURE( m_pToolBox, "invalid toolbox" ); m_nItemId = m_pToolBox->GetItemId( (sal_uInt16)m_nIndexInParent ); - m_sOldName = GetText( true ); + m_sOldName = GetText(); m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId ); m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) == TRISTATE_INDET ); ToolBoxItemType eType = m_pToolBox->GetItemType( (sal_uInt16)m_nIndexInParent ); @@ -121,11 +121,11 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem() m_pExternalLock = nullptr; } -OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) +OUString VCLXAccessibleToolBoxItem::GetText() { OUString sRet; // no text for separators and spaces - if ( m_pToolBox && m_nItemId > 0 && ( _bAsName || m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) ) + if ( m_pToolBox && m_nItemId > 0 ) { sRet = m_pToolBox->GetItemText( m_nItemId ); if (sRet.isEmpty()) @@ -249,7 +249,7 @@ awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds( ) throw (RuntimeExcept OUString VCLXAccessibleToolBoxItem::implGetText() { - return GetText (true); + return GetText(); } Locale VCLXAccessibleToolBoxItem::implGetLocale() @@ -383,7 +383,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (Runtim OExternalLockGuard aGuard( this ); // entry text == accessible name - return GetText( true ); + return GetText(); } Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) |