diff options
Diffstat (limited to 'accessibility/inc')
49 files changed, 245 insertions, 452 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 82211f1aec32..b7e912df6e92 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -21,7 +21,6 @@ #pragma once #include <extended/AccessibleBrowseBoxBase.hxx> -#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <vcl/accessibletableprovider.hxx> #include <mutex> @@ -143,7 +142,7 @@ protected: virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; // internal helper methods @@ -192,9 +191,7 @@ private: The instance holds its XAccessibleContext with a hard reference, while the context holds this instance weak. */ -class AccessibleBrowseBoxAccess final : - public cppu::WeakImplHelper<css::accessibility::XAccessible>, - public ::vcl::IAccessibleBrowseBox +class AccessibleBrowseBoxAccess final : public ::vcl::IAccessibleBrowseBox { private: std::mutex m_aMutex; @@ -221,11 +218,6 @@ private: SAL_CALL getAccessibleContext() override; // IAccessibleBrowseBox - virtual css::uno::Reference< css::accessibility::XAccessible > - getMyself() override - { - return this; - } void dispose() override; virtual bool isAlive() const override { diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index d8bcd169ac2e..d4ea1aabc07f 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -26,7 +26,7 @@ #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <vcl/svapp.hxx> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -48,7 +48,7 @@ namespace vcl { namespace accessibility { -typedef ::cppu::WeakAggComponentImplHelper5< +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleEventBroadcaster, @@ -241,7 +241,7 @@ protected: /** Derived classes return the bounding box in screen coordinates. @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() = 0; /** Creates a bitset of states of the current object. This method calls FillStateSet at the BrowseBox which @@ -268,10 +268,7 @@ protected: @return The bounding box (VCL rect.) in screen coordinates. @throws css::lang::DisposedException */ - tools::Rectangle getBoundingBoxOnScreen(); - - ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } - void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } + AbsoluteScreenPixelRectangle getBoundingBoxOnScreen(); public: /** @return The osl::Mutex member provided by the class BaseMutex. */ @@ -294,6 +291,9 @@ protected: css::uno::Reference< css::awt::XWindow > m_xFocusWindow; private: + ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } + void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } + /** Localized name. */ OUString maName; /** Localized description text. */ diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx index c8f2e8b835c4..d353b8c6018b 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -163,7 +163,7 @@ private: virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; /** @attention This method requires locked mutex's and a living object. @return The count of used rows. */ diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index a3062a12ea89..530e9f37f1e2 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -61,7 +61,7 @@ namespace accessibility private: virtual tools::Rectangle implGetBoundingBox() override; - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; }; } diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx index 3f8d3a274c5b..8892ff384e9e 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx @@ -109,7 +109,7 @@ protected: virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; // internal helper methods diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index c58880b9a0f4..a1f7815ce167 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -21,7 +21,6 @@ #include <extended/AccessibleGridControlBase.hxx> #include <extended/AccessibleGridControlTable.hxx> -#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/ref.hxx> #include <vcl/accessibletable.hxx> @@ -111,7 +110,7 @@ private: virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; // internal helper methods ------------------------------------------------ @@ -160,9 +159,7 @@ private: the context holds this instance weak.</p> */ -class AccessibleGridControlAccess final : - public ::cppu::WeakImplHelper< css::accessibility::XAccessible > - ,public ::vcl::table::IAccessibleTableControl +class AccessibleGridControlAccess final : public ::vcl::table::IAccessibleTableControl { private: css::uno::Reference< css::accessibility::XAccessible > m_xParent; @@ -186,11 +183,6 @@ private: SAL_CALL getAccessibleContext() override; // IAccessibleTable - virtual css::uno::Reference< css::accessibility::XAccessible > - getMyself() override - { - return this; - } void DisposeAccessImpl() override; virtual bool isAlive() const override { diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index ca706c977fcd..186edc83797c 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -24,7 +24,7 @@ #include <rtl/ustring.hxx> #include <rtl/ref.hxx> #include <tools/gen.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -41,7 +41,7 @@ namespace vcl { class Window; } namespace accessibility { -typedef ::cppu::WeakAggComponentImplHelper4< +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleEventBroadcaster, @@ -204,7 +204,7 @@ protected: ///** Derived classes return the bounding box in screen coordinates. // @attention This method requires locked mutex's and a living object. // @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() = 0; /** Creates a bitset of states of the current object. This method calls FillStateSet at the GridControl which @@ -229,7 +229,7 @@ protected: // coordinates. // @return The bounding box (VCL rect.) in screen coordinates. */ /// @throws css::lang::DisposedException - tools::Rectangle getBoundingBoxOnScreen(); + AbsoluteScreenPixelRectangle getBoundingBoxOnScreen(); ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index 680b1ceced6a..7e1c3e7ab26b 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -33,8 +33,8 @@ class AccessibleGridControlHeader final : public AccessibleGridControlTableBase public: /** @param rxParent accessible parent control @param rTable accessible table - @param eObjType One of the two allowed types TCTYPE_ROWHEADERBAR or - TCTYPE_COLUMNHEADERBAR. */ + @param eObjType One of the two allowed types AccessibleTableControlObjType::ROWHEADERBAR or + AccessibleTableControlObjType::COLUMNHEADERBAR. */ AccessibleGridControlHeader( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, @@ -125,7 +125,7 @@ private: virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; // internal helper methods @@ -139,12 +139,12 @@ private: inline bool AccessibleGridControlHeader::isRowBar() const { - return getType() == ::vcl::table::TCTYPE_ROWHEADERBAR; + return getType() == ::vcl::table::AccessibleTableControlObjType::ROWHEADERBAR; } inline bool AccessibleGridControlHeader::isColumnBar() const { - return getType() == ::vcl::table::TCTYPE_COLUMNHEADERBAR; + return getType() == ::vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR; } diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index d530a06736de..6e78029a84fd 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -71,7 +71,7 @@ namespace accessibility private: virtual tools::Rectangle implGetBoundingBox() override; - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; }; } diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index deb6fbf6e06b..ef029ec4a71e 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -153,7 +153,7 @@ private: virtual tools::Rectangle implGetBoundingBox() override; ///** @attention This method requires locked mutex's and a living object. // @return The bounding box (VCL rect.) in screen coordinates. */ - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; //// internal helper methods diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index e8cf6bfe9b92..39de903ec855 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx @@ -139,10 +139,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The row index of the specified cell index. */ - sal_Int32 implGetRow( sal_Int64 nChildIndex ) const; + sal_Int32 implGetRow( sal_Int64 nChildIndex ); /** @attention This method requires locked mutex's and a living object. @return The column index of the specified cell index. */ - sal_Int32 implGetColumn( sal_Int64 nChildIndex ) const; + sal_Int32 implGetColumn( sal_Int64 nChildIndex ); /** Fills a sequence with sorted indexes of completely selected rows. @attention This method requires locked mutex's and a living object. diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index cbb06ebd1477..f9f8c4f7f16e 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -74,7 +74,7 @@ namespace accessibility virtual css::lang::Locale implGetLocale() override; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override final; virtual tools::Rectangle implGetBoundingBox() override; - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; public: AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx index ba4654654a1f..4db205c1d77c 100644 --- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx @@ -44,7 +44,7 @@ namespace accessibility protected: // AccessibleBrowseBoxBase overridables virtual tools::Rectangle implGetBoundingBox() override; - virtual tools::Rectangle implGetBoundingBoxOnScreen() override; + virtual AbsoluteScreenPixelRectangle implGetBoundingBoxOnScreen() override; // XAccessibleComponent virtual void SAL_CALL grabFocus() override; diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx index cd27fcb7da3f..5ead84ee3466 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx @@ -20,7 +20,7 @@ #pragma once #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclevent.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> @@ -30,13 +30,13 @@ class SvtIconChoiceCtrl; namespace accessibility { - typedef ::cppu::ImplHelper2< css::accessibility::XAccessible - , css::accessibility::XAccessibleSelection> AccessibleIconChoiceCtrl_BASE; - /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry */ - class AccessibleIconChoiceCtrl final : public AccessibleIconChoiceCtrl_BASE - ,public VCLXAccessibleComponent + class AccessibleIconChoiceCtrl final : + public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessible, + css::accessibility::XAccessibleSelection> { css::uno::Reference< css::accessibility::XAccessible > m_xParent; @@ -60,12 +60,6 @@ namespace accessibility AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl, const css::uno::Reference< css::accessibility::XAccessible >& _xParent ); - // XTypeProvider - DECLARE_XTYPEPROVIDER() - - // XInterface - DECLARE_XINTERFACE() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index 67724ae710b8..b2430481e58c 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/compbase8.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/accessibletexthelper.hxx> #include <tools/gen.hxx> @@ -42,7 +42,7 @@ namespace accessibility { - typedef ::cppu::WeakAggComponentImplHelper8< css::accessibility::XAccessible + typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible , css::accessibility::XAccessibleContext , css::accessibility::XAccessibleComponent , css::accessibility::XAccessibleEventBroadcaster @@ -66,7 +66,7 @@ namespace accessibility css::uno::Reference< css::accessibility::XAccessible > m_xParent; tools::Rectangle GetBoundingBox_Impl() const; - tools::Rectangle GetBoundingBoxOnScreen_Impl() const; + AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen_Impl() const; bool IsAlive_Impl() const; bool IsShowing_Impl() const; @@ -75,7 +75,7 @@ namespace accessibility tools::Rectangle GetBoundingBox(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - tools::Rectangle GetBoundingBoxOnScreen(); + AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen(); /// @throws css::lang::DisposedException void EnsureIsAlive() const; diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index 339e32f3b0b7..55112facacbc 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -20,7 +20,7 @@ #pragma once #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclevent.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> @@ -38,10 +38,10 @@ namespace accessibility /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry */ class AccessibleListBox : - public cppu::ImplHelper2< + public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, css::accessibility::XAccessible, - css::accessibility::XAccessibleSelection>, - public VCLXAccessibleComponent + css::accessibility::XAccessibleSelection> { css::uno::Reference< css::accessibility::XAccessible > m_xParent; @@ -52,7 +52,6 @@ namespace accessibility protected: // VCLXAccessibleComponent virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual void ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; private: @@ -76,12 +75,6 @@ namespace accessibility rtl::Reference<AccessibleListBoxEntry> implGetAccessible(SvTreeListEntry & rEntry); - // XTypeProvider - DECLARE_XTYPEPROVIDER() - - // XInterface - DECLARE_XINTERFACE() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; @@ -112,7 +105,7 @@ namespace accessibility typedef std::unordered_map<SvTreeListEntry*, rtl::Reference<AccessibleListBoxEntry>> MAP_ENTRY; MAP_ENTRY m_mapEntry; - css::uno::Reference< css::accessibility::XAccessible > m_xFocusedChild; + rtl::Reference<AccessibleListBoxEntry> m_xFocusedEntry; accessibility::AccessibleListBoxEntry* GetCurEventEntry( const VclWindowEvent& rVclWindowEvent ); diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 6ae837f4de4b..050dc948d9c4 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -29,11 +29,12 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/compbase9.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/accessibletexthelper.hxx> #include <vcl/toolkit/treelistentry.hxx> #include <tools/gen.hxx> +#include <unotools/weakref.hxx> // forward --------------------------------------------------------------- @@ -53,7 +54,7 @@ namespace accessibility class AccessibleListBox; // class AccessibleListBoxEntry ------------------------------------------ - typedef ::cppu::WeakAggComponentImplHelper9< css::accessibility::XAccessible + typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible , css::accessibility::XAccessibleContext , css::accessibility::XAccessibleComponent , css::accessibility::XAccessibleEventBroadcaster @@ -80,8 +81,7 @@ namespace accessibility /// client id in the AccessibleEventNotifier queue sal_uInt32 m_nClientId; - css::uno::WeakReference<css::accessibility::XAccessible> m_wListBox; - AccessibleListBox & m_rListBox; + unotools::WeakReference<AccessibleListBox> m_wListBox; tools::Rectangle GetBoundingBox_Impl() const; tools::Rectangle GetBoundingBoxOnScreen_Impl() const; @@ -94,6 +94,8 @@ namespace accessibility /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException tools::Rectangle GetBoundingBoxOnScreen(); + /// @throws css::lang::IndexOutOfBoundsException + void CheckActionIndex(sal_Int32 nIndex); /// @throws css::lang::DisposedException void EnsureIsAlive() const; diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx index f2795b59106e..b921fdb16719 100644 --- a/accessibility/inc/extended/accessibletabbar.hxx +++ b/accessibility/inc/extended/accessibletabbar.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <extended/accessibletabbarbase.hxx> #include <vector> @@ -33,12 +33,10 @@ namespace accessibility - typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > AccessibleTabBar_BASE; - - class AccessibleTabBar final : public AccessibleTabBarBase, - public AccessibleTabBar_BASE + class AccessibleTabBar final : public cppu::ImplInheritanceHelper< + AccessibleTabBarBase, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; @@ -56,12 +54,6 @@ namespace accessibility public: AccessibleTabBar( TabBar* pTabBar ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx index 75f105ae72f3..052650c19de0 100644 --- a/accessibility/inc/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/extended/accessibletabbarpage.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <extended/accessibletabbarbase.hxx> @@ -31,12 +31,10 @@ namespace accessibility - typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > AccessibleTabBarPage_BASE; - - class AccessibleTabBarPage final : public AccessibleTabBarBase, - public AccessibleTabBarPage_BASE + class AccessibleTabBarPage final : public cppu::ImplInheritanceHelper< + AccessibleTabBarBase, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { friend class AccessibleTabBarPageList; @@ -56,8 +54,6 @@ namespace accessibility void SetSelected( bool bSelected ); void SetPageText( const OUString& sPageText ); - sal_uInt16 GetPageId() const { return m_nPageId; } - void FillAccessibleStateSet( sal_Int64& rStateSet ); // OCommonAccessibleComponent @@ -70,12 +66,6 @@ namespace accessibility AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId, const css::uno::Reference< css::accessibility::XAccessible >& rxParent ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx index 2c7bc2fced93..b3045aa77c6f 100644 --- a/accessibility/inc/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx @@ -22,28 +22,22 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <extended/accessibletabbarbase.hxx> +#include <extended/accessibletabbarpage.hxx> #include <vector> - namespace accessibility { - - - - - typedef ::cppu::ImplHelper3< - css::accessibility::XAccessible, - css::accessibility::XAccessibleSelection, - css::lang::XServiceInfo > AccessibleTabBarPageList_BASE; - - class AccessibleTabBarPageList final : public AccessibleTabBarBase, - public AccessibleTabBarPageList_BASE + class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper< + AccessibleTabBarBase, + css::accessibility::XAccessible, + css::accessibility::XAccessibleSelection, + css::lang::XServiceInfo> { private: - typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< rtl::Reference< AccessibleTabBarPage > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; sal_Int32 m_nIndexInParent; @@ -68,12 +62,6 @@ namespace accessibility public: AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; @@ -113,6 +101,9 @@ namespace accessibility virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) override; + + private: + rtl::Reference< AccessibleTabBarPage > getAccessibleChildImpl( sal_Int64 i ); }; diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx index 3a403ab09af0..b38c1c5ef59d 100644 --- a/accessibility/inc/extended/accessibletablistbox.hxx +++ b/accessibility/inc/extended/accessibletablistbox.hxx @@ -80,6 +80,11 @@ public: return AccessibleBrowseBox::getHeaderBar( AccessibleBrowseBoxObjType::ColumnHeaderBar ); } + css::uno::Reference<css::accessibility::XAccessible> getTable() override + { + return implGetTable(); + } + private: /** dtor() */ virtual ~AccessibleTabListBox() override; diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 47bb7be81a0c..52d5f2175761 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -36,9 +36,10 @@ #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <toolkit/awt/vclxwindow.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase7.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/accessibletexthelper.hxx> #include <rtl/ref.hxx> +#include <unotools/weakref.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <queue> @@ -91,31 +92,31 @@ private: VclPtr<vcl::Window> m_pNotifier; }; +class Paragraph; + class ParagraphInfo { public: ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {} - css::uno::WeakReference< css::accessibility::XAccessible > const & + unotools::WeakReference< Paragraph > const & getParagraph() const { return m_xParagraph; } ::sal_Int32 getHeight() const { return m_nHeight; } - void setParagraph( - css::uno::Reference< css::accessibility::XAccessible > const & - rParagraph) { m_xParagraph = rParagraph; } + void setParagraph( rtl::Reference< Paragraph > const & rParagraph) + { m_xParagraph = rParagraph.get(); } void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; } private: - css::uno::WeakReference< css::accessibility::XAccessible > - m_xParagraph; + unotools::WeakReference< Paragraph > m_xParagraph; ::sal_Int32 m_nHeight; }; typedef std::vector< ParagraphInfo > Paragraphs; -typedef ::cppu::WeakAggComponentImplHelper7< +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index eed2a757c1e4..43d30aadab74 100644 --- a/accessibility/inc/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -28,6 +28,7 @@ namespace com::sun::star::datatransfer::clipboard { class XClipboard; } +class AbsoluteScreenPixelRectangle; class Point; namespace tools { class Rectangle; } namespace vcl { class Window; } @@ -41,7 +42,7 @@ namespace accessibility virtual OUString GetEntry( sal_Int32 nPos ) const = 0; virtual tools::Rectangle GetDropDownPosSizePixel( ) const = 0; virtual tools::Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0; - virtual tools::Rectangle GetWindowExtentsRelative() = 0; + virtual AbsoluteScreenPixelRectangle GetWindowExtentsAbsolute() = 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/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx index dfadf37aa015..4f1c5dde1e49 100644 --- a/accessibility/inc/helper/listboxhelper.hxx +++ b/accessibility/inc/helper/listboxhelper.hxx @@ -49,7 +49,7 @@ public: virtual tools::Rectangle GetDropDownPosSizePixel() const override { - tools::Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr); + AbsoluteScreenPixelRectangle aTemp = m_aComboListBox.GetWindowExtentsAbsolute(); tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel(); aRet.Move(aTemp.Left(), aTemp.Top()); return aRet; @@ -74,9 +74,9 @@ public: return aRect; } - virtual tools::Rectangle GetWindowExtentsRelative() override + virtual AbsoluteScreenPixelRectangle GetWindowExtentsAbsolute() override { - return m_aComboListBox.GetWindowExtentsRelative( nullptr ); + return m_aComboListBox.GetWindowExtentsAbsolute(); } virtual bool IsEnabled() const override diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 806c944ac6dd..c9589365ab4b 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2022-06-27 18:57:49 using: + Generated on 2023-07-19 09:19:19 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -24,10 +24,7 @@ #if PCH_LEVEL >= 1 #include <algorithm> #include <array> -#include <assert.h> -#include <atomic> #include <cassert> -#include <chrono> #include <cmath> #include <cstddef> #include <cstdlib> @@ -47,12 +44,12 @@ #include <numeric> #include <optional> #include <ostream> +#include <span> #include <stddef.h> #include <string.h> #include <string> #include <string_view> #include <type_traits> -#include <unordered_map> #include <utility> #include <vector> #endif // PCH_LEVEL >= 1 @@ -64,8 +61,6 @@ #include <osl/interlck.h> #include <osl/mutex.h> #include <osl/mutex.hxx> -#include <osl/thread.h> -#include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> #include <rtl/math.h> @@ -104,22 +99,22 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/ctrl.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> #include <vcl/dockwin.hxx> -#include <comphelper/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> #include <vcl/metaactiontypes.hxx> +#include <vcl/mnemonic.hxx> #include <vcl/outdev.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/region.hxx> @@ -138,7 +133,6 @@ #include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> -#include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> @@ -165,6 +159,8 @@ #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -173,14 +169,17 @@ #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/common.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> @@ -202,6 +201,7 @@ #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/KeyModifier.hpp> @@ -261,26 +261,20 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <comphelper/accessiblekeybindinghelper.hxx> #include <comphelper/accessibletexthelper.hxx> -#include <comphelper/accimplaccess.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/errcode.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> -#include <comphelper/solarmutex.hxx> #include <comphelper/uno3.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase2.hxx> -#include <cppuhelper/compbase4.hxx> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> @@ -302,7 +296,6 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/safeint.hxx> -#include <o3tl/span.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index 4bb176b8fcc1..337ee0a80d00 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/Point.hpp> #include <comphelper/accessiblecomponenthelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <tools/link.hxx> #include <vcl/vclptr.hxx> @@ -33,22 +33,21 @@ class Menu; class VclSimpleEvent; class VclMenuEvent; +class OAccessibleMenuItemComponent; -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE; - -class OAccessibleMenuBaseComponent : public comphelper::OAccessibleExtendedComponentHelper, - public OAccessibleMenuBaseComponent_BASE +class OAccessibleMenuBaseComponent : public cppu::ImplInheritanceHelper< + comphelper::OAccessibleExtendedComponentHelper, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { friend class OAccessibleMenuItemComponent; friend class VCLXAccessibleMenuItem; friend class VCLXAccessibleMenu; protected: - typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< rtl::Reference< OAccessibleMenuItemComponent > > AccessibleChildren; - AccessibleChildren m_aAccessibleChildren; + AccessibleChildren m_aAccessibleChildren1; VclPtr<Menu> m_pMenu; bool m_bEnabled; @@ -75,6 +74,7 @@ protected: void UpdateSelected( sal_Int32 i, bool bSelected ); void UpdateChecked( sal_Int32 i, bool bChecked ); void UpdateAccessibleName( sal_Int32 i ); + void UpdateItemRole(sal_Int32 i); void UpdateItemText( sal_Int32 i ); sal_Int64 GetChildCount() const; @@ -112,12 +112,6 @@ public: void SetStates(); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx index 1e3feb81cb29..90c89922654a 100644 --- a/accessibility/inc/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/standard/accessiblemenucomponent.hxx @@ -21,15 +21,13 @@ #include <standard/accessiblemenubasecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper1< - css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE; - -class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent, - public OAccessibleMenuComponent_BASE +class OAccessibleMenuComponent : public cppu::ImplInheritanceHelper< + OAccessibleMenuBaseComponent, + css::accessibility::XAccessibleSelection> { protected: virtual bool IsEnabled() override; @@ -40,15 +38,9 @@ protected: // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds( ) override; - using OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent; - public: - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + OAccessibleMenuComponent( Menu* pMenu ): ImplInheritanceHelper(pMenu) {} // XAccessibleContext virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override; diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx b/accessibility/inc/standard/svtaccessiblenumericfield.hxx index fb3b30e594fb..29225a5c6072 100644 --- a/accessibility/inc/standard/svtaccessiblenumericfield.hxx +++ b/accessibility/inc/standard/svtaccessiblenumericfield.hxx @@ -19,24 +19,20 @@ #pragma once -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> +#include <vcl/vclevent.hxx> + #include <standard/vclxaccessibleedit.hxx> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -typedef ::cppu::ImplHelper1<css::accessibility::XAccessibleValue> SVTXAccessibleNumericField_BASE; - -class SVTXAccessibleNumericField final : public VCLXAccessibleEdit, - public SVTXAccessibleNumericField_BASE +class SVTXAccessibleNumericField final + : public cppu::ImplInheritanceHelper<VCLXAccessibleEdit, css::accessibility::XAccessibleValue> { public: SVTXAccessibleNumericField(VCLXWindow* pVCLXindow); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + virtual void ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) override; // XAccessibleContext virtual sal_Int16 SAL_CALL getAccessibleRole() override; diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 9abebf6f3b19..3825be0d4f22 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -24,23 +24,20 @@ #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <cppuhelper/implbase3.hxx> - - -typedef ::cppu::ImplHelper3< - css::accessibility::XAccessible, - css::accessibility::XAccessibleValue, - css::accessibility::XAccessibleAction - > VCLXAccessibleBox_BASE; +#include <cppuhelper/implbase.hxx> +class VCLXAccessibleList; /** Base class for list- and combo boxes. This class manages the box' children. The classed derived from this one have only to implement the IsValid method and return the correct implementation name. */ class VCLXAccessibleBox - : public VCLXAccessibleComponent, - public VCLXAccessibleBox_BASE + : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessible, + css::accessibility::XAccessibleValue, + css::accessibility::XAccessibleAction> { public: enum BoxType {COMBOBOX, LISTBOX}; @@ -51,12 +48,6 @@ public: */ VCLXAccessibleBox (VCLXWindow* pVCLXindow, BoxType aType, bool bIsDropDownBox); - // XTypeProvider - DECLARE_XTYPEPROVIDER() - - // XInterface - DECLARE_XINTERFACE() - // XAccessible @@ -112,7 +103,7 @@ public: virtual css::uno::Any SAL_CALL getMinimumIncrement( ) override; protected: - virtual ~VCLXAccessibleBox() override = default; + virtual ~VCLXAccessibleBox() override; /** Returns true when the object is valid. */ @@ -139,8 +130,7 @@ private: m_xText; /// The child that contains the items of this box. - css::uno::Reference< css::accessibility::XAccessible> - m_xList; + rtl::Reference<VCLXAccessibleList> m_xList; /** This flag specifies whether an object has a text field as child regardless of whether that child being currently instantiated or diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx index 282e7ed7e817..460c90c67c41 100644 --- a/accessibility/inc/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx @@ -24,17 +24,15 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue > VCLXAccessibleButton_BASE; - -class VCLXAccessibleButton final : public VCLXAccessibleTextComponent, - public VCLXAccessibleButton_BASE +class VCLXAccessibleButton final : public cppu::ImplInheritanceHelper< + VCLXAccessibleTextComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleButton() override = default; @@ -42,13 +40,7 @@ class VCLXAccessibleButton final : public VCLXAccessibleTextComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: - using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleButton( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx index 81e36cd42403..dc7b0d3c353e 100644 --- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx @@ -24,17 +24,15 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue > VCLXAccessibleCheckBox_BASE; - -class VCLXAccessibleCheckBox final : public VCLXAccessibleTextComponent, - public VCLXAccessibleCheckBox_BASE +class VCLXAccessibleCheckBox final : public cppu::ImplInheritanceHelper< + VCLXAccessibleTextComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { private: bool m_bChecked; @@ -56,12 +54,6 @@ private: public: VCLXAccessibleCheckBox( VCLXWindow* pVCLXindow ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index 267f71e19632..b3b6a239b9d7 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -24,17 +24,15 @@ #include <com/sun/star/accessibility/XAccessibleEditableText.hpp> #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleEditableText > VCLXAccessibleEdit_BASE; - -class VCLXAccessibleEdit : public VCLXAccessibleTextComponent, - public VCLXAccessibleEdit_BASE +class VCLXAccessibleEdit : public cppu::ImplInheritanceHelper< + VCLXAccessibleTextComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleEditableText> { friend class VCLXAccessibleBox; @@ -55,12 +53,6 @@ protected: public: VCLXAccessibleEdit( VCLXWindow* pVCLXindow ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; @@ -104,6 +96,9 @@ public: virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) override; virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) override; virtual sal_Bool SAL_CALL setText( const OUString& sText ) override; + +private: + bool isEditable(); }; diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx index e78950bded6f..563e86ff5252 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessiblecomponenthelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> @@ -34,12 +34,10 @@ class VclWindowEvent; // class VCLXAccessibleHeaderBarItem // ---------------------------------------------------- -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE; - -class VCLXAccessibleHeaderBarItem final : public comphelper::OAccessibleExtendedComponentHelper, - public VCLXAccessibleHeaderBarItem_BASE +class VCLXAccessibleHeaderBarItem final : public cppu::ImplInheritanceHelper< + comphelper::OAccessibleExtendedComponentHelper, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { private: VclPtr<HeaderBar> m_pHeadBar; @@ -54,12 +52,6 @@ public: VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); virtual ~VCLXAccessibleHeaderBarItem() override; - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 74f6d5755d17..7bfb83c7e386 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -22,16 +22,10 @@ #include <memory> #include <vector> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::accessibility::XAccessibleSelection - > VCLXAccessibleList_BASE; - -typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > > - ListItems; +class VCLXAccessibleListItem; namespace accessibility { @@ -45,8 +39,10 @@ namespace accessibility classes for selection. */ class VCLXAccessibleList final - : public VCLXAccessibleComponent, - public VCLXAccessibleList_BASE + : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessible, + css::accessibility::XAccessibleSelection> { public: enum BoxType {COMBOBOX, LISTBOX}; @@ -76,12 +72,6 @@ public: */ void UpdateSelection (std::u16string_view sTextOfSelectedItem); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() override; @@ -126,7 +116,7 @@ public: private: BoxType m_aBoxType; std::unique_ptr<::accessibility::IComboListBoxHelper> m_pListBoxHelper; - ListItems m_aAccessibleChildren; + std::vector<rtl::Reference<VCLXAccessibleListItem>> m_aAccessibleChildren; sal_Int32 m_nVisibleLineCount; /// Index in parent. This is settable from the outside. sal_Int32 m_nIndexInParent; @@ -146,6 +136,8 @@ private: */ virtual void SAL_CALL disposing() override; + void disposeChildren(); + /** This method adds the states AccessibleStateType::FOCUSABLE and possibly AccessibleStateType::MULTI_SELECTABLE to the state set @@ -156,8 +148,7 @@ private: /** Create the specified child and insert it into the list of children. Sets the child's states. */ - css::uno::Reference< css::accessibility::XAccessible > - CreateChild (sal_Int32 i); + rtl::Reference<VCLXAccessibleListItem> CreateChild (sal_Int32 i); /** Call this method when the item list has been changed, i.e. items have been deleted or inserted. diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 046f1df125a3..83142b50ed6f 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -26,8 +26,7 @@ #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/compbase6.hxx> -#include <cppuhelper/basemutex.hxx> +#include <comphelper/compbase.hxx> #include <comphelper/accessibletexthelper.hxx> #include <standard/vclxaccessiblelist.hxx> @@ -42,7 +41,7 @@ namespace com::sun::star::awt { // class VCLXAccessibleListItem ------------------------------------------ -typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible +typedef ::comphelper::WeakComponentImplHelper< css::accessibility::XAccessible , css::accessibility::XAccessibleContext , css::accessibility::XAccessibleComponent , css::accessibility::XAccessibleEventBroadcaster @@ -51,7 +50,7 @@ typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry */ -class VCLXAccessibleListItem final : public ::cppu::BaseMutex, +class VCLXAccessibleListItem final : public ::comphelper::OCommonAccessibleText, public VCLXAccessibleListItem_BASE { @@ -69,7 +68,7 @@ private: virtual ~VCLXAccessibleListItem() override = default; /** this function is called upon disposing the component */ - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>& rGuard) override; // OCommonAccessibleText virtual OUString implGetText() override; diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index e866a53a3d8a..ce7b3f0580de 100644 --- a/accessibility/inc/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -22,29 +22,22 @@ #include <standard/vclxaccessiblemenuitem.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper1 < - css::accessibility::XAccessibleSelection > VCLXAccessibleMenu_BASE; - -class VCLXAccessibleMenu final : public VCLXAccessibleMenuItem, - public VCLXAccessibleMenu_BASE +class VCLXAccessibleMenu final : + public cppu::ImplInheritanceHelper< + VCLXAccessibleMenuItem, css::accessibility::XAccessibleSelection> { virtual bool IsFocused() override; virtual bool IsPopupMenuOpen() override; sal_Int64 implGetSelectedAccessibleChildCount(); public: - using VCLXAccessibleMenuItem::VCLXAccessibleMenuItem; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr ): + ImplInheritanceHelper(pParent, nItemPos, pMenu) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index e67be7f09e53..aa6a0afc814a 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -25,24 +25,23 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/accessibletexthelper.hxx> -typedef ::cppu::ImplHelper3< - css::accessibility::XAccessibleText, - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue > VCLXAccessibleMenuItem_BASE; - -class VCLXAccessibleMenuItem : public OAccessibleMenuItemComponent, - public ::comphelper::OCommonAccessibleText, - public VCLXAccessibleMenuItem_BASE +class VCLXAccessibleMenuItem : public cppu::ImplInheritanceHelper< + OAccessibleMenuItemComponent, + css::accessibility::XAccessibleText, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue>, + public ::comphelper::OCommonAccessibleText { protected: virtual bool IsFocused() override; virtual bool IsSelected() override; + bool IsCheckable(); virtual bool IsChecked() override; virtual bool IsHighlighted() override; @@ -57,12 +56,6 @@ protected: public: VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx index 4bffbf267c62..4e93579fa9c1 100644 --- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx @@ -24,17 +24,15 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue > VCLXAccessibleRadioButton_BASE; - -class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent, - public VCLXAccessibleRadioButton_BASE +class VCLXAccessibleRadioButton final : public cppu::ImplInheritanceHelper< + VCLXAccessibleTextComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleRadioButton() override = default; @@ -43,13 +41,7 @@ class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: - using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleRadioButton( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index 4476ed7c89a1..ffaa7f689a78 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -24,17 +24,15 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue > VCLXAccessibleScrollBar_BASE; - -class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent, - public VCLXAccessibleScrollBar_BASE +class VCLXAccessibleScrollBar final : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleScrollBar() override = default; @@ -42,13 +40,7 @@ class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: - using VCLXAccessibleComponent::VCLXAccessibleComponent; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleScrollBar( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index 16bff48e3856..17f77af4fbb6 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -26,12 +26,12 @@ #include <vector> - +class VCLXAccessibleStatusBarItem; class VCLXAccessibleStatusBar final : public VCLXAccessibleComponent { private: - typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< rtl::Reference< VCLXAccessibleStatusBarItem > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VclPtr<StatusBar> m_pStatusBar; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 0e82ed4b3ab7..9556f961d140 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -23,21 +23,15 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessibletexthelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/status.hxx> #include <vcl/vclptr.hxx> - - -typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE; - -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE; - -class VCLXAccessibleStatusBarItem final : public AccessibleTextHelper_BASE, - public VCLXAccessibleStatusBarItem_BASE +class VCLXAccessibleStatusBarItem final : public cppu::ImplInheritanceHelper< + comphelper::OAccessibleTextHelper, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { friend class VCLXAccessibleStatusBar; @@ -54,7 +48,6 @@ private: OUString GetItemName(); void SetItemText( const OUString& sItemText ); OUString GetItemText(); - sal_uInt16 GetItemId() const { return m_nItemId; } void FillAccessibleStateSet( sal_Int64& rStateSet ); @@ -72,12 +65,6 @@ private: public: VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index 233e7277cb27..32565c6d80ad 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -21,22 +21,21 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> +#include <cppuhelper/implbase.hxx> #include <vcl/tabctrl.hxx> #include <vcl/vclptr.hxx> #include <vector> +class VCLXAccessibleTabPage; - -typedef ::cppu::ImplHelper1 < - css::accessibility::XAccessibleSelection > VCLXAccessibleTabControl_BASE; - -class VCLXAccessibleTabControl final : public VCLXAccessibleComponent, - public VCLXAccessibleTabControl_BASE +class VCLXAccessibleTabControl final : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessibleSelection> { private: - typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< rtl::Reference< VCLXAccessibleTabPage > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VclPtr<TabControl> m_pTabControl; @@ -63,12 +62,6 @@ private: public: VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 0548ef344634..efdc75e2c677 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -23,22 +23,17 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessibletexthelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> class TabControl; - -typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE; - -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > VCLXAccessibleTabPage_BASE; - -class VCLXAccessibleTabPage final : public AccessibleTextHelper_BASE, - public VCLXAccessibleTabPage_BASE +class VCLXAccessibleTabPage final : public cppu::ImplInheritanceHelper< + comphelper::OAccessibleTextHelper, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { friend class VCLXAccessibleTabControl; @@ -80,12 +75,6 @@ public: VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId ); virtual ~VCLXAccessibleTabPage() override; - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx index 205af38d5660..3585dd778574 100644 --- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx @@ -22,19 +22,21 @@ #include <com/sun/star/accessibility/AccessibleScrollType.hpp> #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <comphelper/accessibletexthelper.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper1 < - css::accessibility::XAccessibleText > VCLXAccessibleTextComponent_BASE; - -class VCLXAccessibleTextComponent : public VCLXAccessibleComponent, - public ::comphelper::OCommonAccessibleText, - public VCLXAccessibleTextComponent_BASE +class VCLXAccessibleTextComponent : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessibleText>, + public ::comphelper::OCommonAccessibleText { OUString m_sText; + // accessible name the object had when SetText was called last time + OUString m_sOldName; + protected: void SetText( const OUString& sText ); @@ -51,12 +53,6 @@ protected: public: VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() override; virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx index f99b6c0296f6..b730bd107ea2 100644 --- a/accessibility/inc/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx @@ -21,10 +21,7 @@ #include <standard/vclxaccessibletextcomponent.hxx> -#include <cppuhelper/implbase1.hxx> - -typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BASE; - +#include <cppuhelper/implbase.hxx> /** This class represents non editable text fields. The object passed to the constructor is expected to be a list (a ListBox to be @@ -33,19 +30,12 @@ typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BA exported text changes. */ class VCLXAccessibleTextField final : - public VCLXAccessibleTextComponent, - public VCLXAccessible_BASE + public cppu::ImplInheritanceHelper<VCLXAccessibleTextComponent, css::accessibility::XAccessible> { public: VCLXAccessibleTextField (VCLXWindow* pVCLXindow, const css::uno::Reference< css::accessibility::XAccessible >& _xParent); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XAccessible css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() override; diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index 0b2908d1dc32..4918e511ba2a 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -22,18 +22,15 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <vcl/toolbox.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> +#include <cppuhelper/implbase.hxx> - - -typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleSelection > VCLXAccessibleToolBox_BASE; - -typedef std::map< sal_Int32, css::uno::Reference< css::accessibility::XAccessible > > ToolBoxItemsMap; - class VCLXAccessibleToolBoxItem; class ToolBox; -class VCLXAccessibleToolBox final : public VCLXAccessibleComponent, public VCLXAccessibleToolBox_BASE +typedef std::map< sal_Int32, rtl::Reference< VCLXAccessibleToolBoxItem > > ToolBoxItemsMap; + +class VCLXAccessibleToolBox final : public cppu::ImplInheritanceHelper<VCLXAccessibleComponent, css::accessibility::XAccessibleSelection> { private: ToolBoxItemsMap m_aAccessibleChildren; @@ -68,12 +65,6 @@ private: public: VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow ); - // XInterface - DECLARE_XINTERFACE( ) - - // XTypeProvider - DECLARE_XTYPEPROVIDER( ) - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index 39982db1b7e8..6fbfc1e55138 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -24,20 +24,18 @@ #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/accessibletexthelper.hxx> #include <vcl/toolbox.hxx> #include <vcl/vclptr.hxx> -typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE; -typedef ::cppu::ImplHelper4 < css::accessibility::XAccessible, - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue, - css::lang::XServiceInfo > VCLXAccessibleToolBoxItem_BASE; - -class VCLXAccessibleToolBoxItem final : public AccessibleTextHelper_BASE, - public VCLXAccessibleToolBoxItem_BASE +class VCLXAccessibleToolBoxItem final : public cppu::ImplInheritanceHelper< + comphelper::OAccessibleTextHelper, + css::accessibility::XAccessible, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue, + css::lang::XServiceInfo> { private: OUString m_sOldName; @@ -50,13 +48,14 @@ private: bool m_bIndeterminate; css::uno::Reference< css::accessibility::XAccessible > m_xChild; - OUString GetText() const; public: sal_Int32 getIndexInParent() const { return m_nIndexInParent; } void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; } private: + OUString implGetAccessibleName(); + virtual ~VCLXAccessibleToolBoxItem() override; virtual void SAL_CALL disposing() override; @@ -86,8 +85,7 @@ public: void ToggleEnableState(); // XInterface - DECLARE_XINTERFACE( ) - DECLARE_XTYPEPROVIDER( ) + css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/strings.hrc b/accessibility/inc/strings.hrc index c9949dd4357d..7e51ade2d46d 100644 --- a/accessibility/inc/strings.hrc +++ b/accessibility/inc/strings.hrc @@ -19,7 +19,7 @@ #pragma once -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#define NC_(Context, String) TranslateId(Context, u8##String) #define RID_STR_ACC_NAME_BROWSEBUTTON NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse") #define STR_SVT_ACC_ACTION_EXPAND NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" ) diff --git a/accessibility/inc/strings.hxx b/accessibility/inc/strings.hxx index 85dcf7eb9279..6fd402a9ba06 100644 --- a/accessibility/inc/strings.hxx +++ b/accessibility/inc/strings.hxx @@ -11,13 +11,13 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_CLICK = u"press"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_TOGGLEPOPUP = u"togglePopup"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_SELECT = u"select"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_INCLINE = u"incrementLine"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_DECLINE = u"decrementLine"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_INCBLOCK = u"incrementBlock"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_DECBLOCK = u"decrementBlock"; +inline constexpr OUString RID_STR_ACC_ACTION_CLICK = u"press"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_TOGGLEPOPUP = u"togglePopup"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_SELECT = u"select"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_INCLINE = u"incrementLine"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_DECLINE = u"decrementLine"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_INCBLOCK = u"incrementBlock"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_DECBLOCK = u"decrementBlock"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |