diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2022-07-03 20:29:28 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-07-08 10:10:11 +0200 |
commit | 8d8e6c84e512c1a8b33aac75965b84481d1a1d13 (patch) | |
tree | 9ed209d057081d4283eb44b51c0d9af18f976eab /winaccessibility/inc | |
parent | 911ac42485b690df5cbbff6e3c04b111c1723aca (diff) |
[API CHANGE] Drop css::accessibility::XAccessibleStateSet
which is internal API, unused (as far as I can tell) by external
users.
This state is purely a bitset
(as implemented by utl::AccessibleStateSetHelper)
so we can just return it as a 64-bit value.
This shaves significant time off the performance profiles
of code that loads very complex shapes, because this state
is frequently used, and we no longer need to allocate a return
value on the heap for every call.
Change-Id: Icf1b3bd367c256646ae9015f9127025f59459c2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136786
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'winaccessibility/inc')
-rw-r--r-- | winaccessibility/inc/AccComponentEventListener.hxx | 4 | ||||
-rw-r--r-- | winaccessibility/inc/AccContainerEventListener.hxx | 4 | ||||
-rw-r--r-- | winaccessibility/inc/AccDialogEventListener.hxx | 2 | ||||
-rw-r--r-- | winaccessibility/inc/AccEventListener.hxx | 4 | ||||
-rw-r--r-- | winaccessibility/inc/AccFrameEventListener.hxx | 2 | ||||
-rw-r--r-- | winaccessibility/inc/AccMenuEventListener.hxx | 2 | ||||
-rw-r--r-- | winaccessibility/inc/AccObject.hxx | 6 | ||||
-rw-r--r-- | winaccessibility/inc/AccObjectManagerAgent.hxx | 4 | ||||
-rw-r--r-- | winaccessibility/inc/AccParagraphEventListener.hxx | 2 | ||||
-rw-r--r-- | winaccessibility/inc/AccTextComponentEventListener.hxx | 2 | ||||
-rw-r--r-- | winaccessibility/inc/AccWindowEventListener.hxx | 2 |
11 files changed, 17 insertions, 17 deletions
diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx index 6c2683f8b6e3..72c4d8af12dc 100644 --- a/winaccessibility/inc/AccComponentEventListener.hxx +++ b/winaccessibility/inc/AccComponentEventListener.hxx @@ -55,8 +55,8 @@ public: //for caret changed event virtual void HandleCaretChangedEvent(css::uno::Any oldValue, css::uno::Any newValue); - virtual void SetComponentState(short state, bool enable) override; - virtual void FireStatePropertyChange(short state, bool set) override; + virtual void SetComponentState(sal_Int64 state, bool enable) override; + virtual void FireStatePropertyChange(sal_Int64 state, bool set) override; virtual void FireStateFocusedChange(bool enable) override; void HandleSelectionChangedEventNoArgs(); diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx index c880374fbb3d..889b0e619e86 100644 --- a/winaccessibility/inc/AccContainerEventListener.hxx +++ b/winaccessibility/inc/AccContainerEventListener.hxx @@ -67,8 +67,8 @@ public: css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) override; - virtual void FireStatePropertyChange(short state, bool set) override; + virtual void SetComponentState(sal_Int64 state, bool enable) override; + virtual void FireStatePropertyChange(sal_Int64 state, bool set) override; virtual void FireStateFocusedChange(bool enable) override; virtual bool IsEditable(css::uno::Reference<css::accessibility::XAccessibleContext> const & xContext); diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx index b8394f712318..bbac27b7e81c 100644 --- a/winaccessibility/inc/AccDialogEventListener.hxx +++ b/winaccessibility/inc/AccDialogEventListener.hxx @@ -44,7 +44,7 @@ public: virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) override; + virtual void SetComponentState(sal_Int64 state, bool enable) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx index 4e29e9f5058c..2d2875dfb060 100644 --- a/winaccessibility/inc/AccEventListener.hxx +++ b/winaccessibility/inc/AccEventListener.hxx @@ -58,8 +58,8 @@ public: //for state changed event virtual void HandleStateChangedEvent(css::uno::Any oldValue, css::uno::Any newValue); - virtual void SetComponentState(short state, bool enable); - virtual void FireStatePropertyChange(short state, bool set); + virtual void SetComponentState(sal_Int64 state, bool enable); + virtual void FireStatePropertyChange(sal_Int64 state, bool set); virtual void FireStateFocusedChange(bool enable); //for bound rect changed event diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx index 43f4fe393f4c..3bf70e385516 100644 --- a/winaccessibility/inc/AccFrameEventListener.hxx +++ b/winaccessibility/inc/AccFrameEventListener.hxx @@ -44,7 +44,7 @@ public: virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) override; + virtual void SetComponentState(sal_Int64 state, bool enable) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx index c0efc33fced8..a029b0065c4b 100644 --- a/winaccessibility/inc/AccMenuEventListener.hxx +++ b/winaccessibility/inc/AccMenuEventListener.hxx @@ -47,7 +47,7 @@ public: virtual void HandleSelectionChangedEventNoArgs(); //for state changed event - virtual void FireStatePropertyChange(short state, bool set) override; + virtual void FireStatePropertyChange(sal_Int64 state, bool set) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx index a255f36268fa..5a538b315dcd 100644 --- a/winaccessibility/inc/AccObject.hxx +++ b/winaccessibility/inc/AccObject.hxx @@ -74,7 +74,7 @@ private: void UpdateActionDesc(); void UpdateRole(); - DWORD GetMSAAStateFromUNO(short xState);//translate state from UNO to MSAA value + DWORD GetMSAAStateFromUNO(sal_Int64 xState);//translate state from UNO to MSAA value css::accessibility::XAccessibleSelection* GetXAccessibleSelection(); void GetExpandedState(sal_Bool* isExpandable, sal_Bool* isExpanded); OUString GetMAccessibleValueFromAny(css::uno::Any pAny); @@ -109,8 +109,8 @@ public: void NotifyDestroy(); - void DecreaseState(short xState );//call COM interface DecreaseState method - void IncreaseState( short xState );//call COM interface IncreaseState method + void DecreaseState( sal_Int64 xState );//call COM interface DecreaseState method + void IncreaseState( sal_Int64 xState );//call COM interface IncreaseState method void SetName( css::uno::Any newName); void SetValue( css::uno::Any pAny ); diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx index d91f33ef1818..e8848c398c25 100644 --- a/winaccessibility/inc/AccObjectManagerAgent.hxx +++ b/winaccessibility/inc/AccObjectManagerAgent.hxx @@ -63,8 +63,8 @@ public: HWND hWnd = nullptr); void DeleteChildrenAccObj( css::accessibility::XAccessible* pXAcc ); - void DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState ); - void IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState ); + void DecreaseState( css::accessibility::XAccessible* pXAcc, sal_Int64 pState ); + void IncreaseState( css::accessibility::XAccessible* pXAcc, sal_Int64 pState ); void UpdateState( css::accessibility::XAccessible* pXAcc ); static void UpdateLocation( css::accessibility::XAccessible* pXAcc, diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx index 7204839e34a5..1563270a24dc 100644 --- a/winaccessibility/inc/AccParagraphEventListener.hxx +++ b/winaccessibility/inc/AccParagraphEventListener.hxx @@ -43,7 +43,7 @@ public: //for caret changed event virtual void HandleCaretChangedEvent(css::uno::Any oldValue, css::uno::Any newValue); - virtual void SetComponentState(short state, bool enable) override; + virtual void SetComponentState(sal_Int64 state, bool enable) override; //add TEXT_SELECTION_CHANGED event void HandleTextSelectionChangedEvent(); diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx index f1e49097ed03..e174472e5e42 100644 --- a/winaccessibility/inc/AccTextComponentEventListener.hxx +++ b/winaccessibility/inc/AccTextComponentEventListener.hxx @@ -37,7 +37,7 @@ public: AccObjectManagerAgent* Agent); virtual ~AccTextComponentEventListener() override; - virtual void SetComponentState(short state, bool enable) override; + virtual void SetComponentState(sal_Int64 state, bool enable) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx index a4995e343d4c..8143ca79033e 100644 --- a/winaccessibility/inc/AccWindowEventListener.hxx +++ b/winaccessibility/inc/AccWindowEventListener.hxx @@ -44,7 +44,7 @@ public: virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) override; + virtual void SetComponentState(sal_Int64 state, bool enable) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |