solenv/clang-format/excludelist | 29 ----
winaccessibility/inc/AccComponentEventListener.hxx | 17 +-
winaccessibility/inc/AccDialogEventListener.hxx | 9 -
winaccessibility/inc/AccEventListener.hxx | 15 +-
winaccessibility/inc/AccFrameEventListener.hxx | 10 -
winaccessibility/inc/AccListEventListener.hxx | 12 -
winaccessibility/inc/AccMenuEventListener.hxx | 9 -
winaccessibility/inc/AccParagraphEventListener.hxx | 9 -
winaccessibility/inc/AccTableEventListener.hxx | 10 -
winaccessibility/inc/AccTextComponentEventListener.hxx | 7 -
winaccessibility/inc/AccTopWindowListener.hxx | 27 ++-
winaccessibility/inc/AccTreeEventListener.hxx | 9 -
winaccessibility/inc/AccWindowEventListener.hxx | 10 -
winaccessibility/inc/ResIDGenerator.hxx | 12 -
winaccessibility/inc/accHelper.hxx | 12 -
winaccessibility/inc/unomsaaevent.hxx | 60
++++----
winaccessibility/source/UAccCOM/AccActionBase.h | 22 +--
winaccessibility/source/UAccCOM/AccComponent.cxx | 13 -
winaccessibility/source/UAccCOM/AccComponentBase.cxx | 42
++----
winaccessibility/source/UAccCOM/AccComponentBase.h | 16 --
winaccessibility/source/UAccCOM/AccImage.cxx | 22 +--
winaccessibility/source/UAccCOM/AccTextBase.h | 44
+++---
winaccessibility/source/UAccCOM/AccValue.cxx | 60
++++----
winaccessibility/source/UAccCOM/AccessibleKeyStroke.h | 11 -
winaccessibility/source/UAccCOM/UAccCOM.cxx | 22 +--
winaccessibility/source/UAccCOM/UNOXWrapper.cxx | 8 -
winaccessibility/source/UAccCOM/UNOXWrapper.h | 10 -
winaccessibility/source/service/AccEventListener.cxx | 69
++++------
winaccessibility/source/service/AccObjectContainerEventListener.cxx | 11 -
winaccessibility/source/service/ResIDGenerator.cxx | 4
30 files changed, 267 insertions(+), 344 deletions(-)
New commits:
commit 65717f77c43ca7cbf91e4c158d643a02a181e439
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 13:27:36 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Nov 18 12:29:18 2020 +0100
tdf#123936 Formatting files in module winaccessibility with clang-format
Change-Id: I9d5b9697cb241b306d0614fb563feb5594c19887
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105729
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 3bebbdf749d8..d120c0cf86db 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -16953,42 +16953,22 @@ vcl/workben/ww6fuzzer.cxx
vcl/workben/ww8fuzzer.cxx
vcl/workben/xbmfuzzer.cxx
vcl/workben/xpmfuzzer.cxx
-winaccessibility/inc/AccComponentEventListener.hxx
winaccessibility/inc/AccContainerEventListener.hxx
winaccessibility/inc/AccDescendantManagerEventListener.hxx
-winaccessibility/inc/AccDialogEventListener.hxx
-winaccessibility/inc/AccEventListener.hxx
-winaccessibility/inc/AccFrameEventListener.hxx
-winaccessibility/inc/AccListEventListener.hxx
-winaccessibility/inc/AccMenuEventListener.hxx
winaccessibility/inc/AccObject.hxx
winaccessibility/inc/AccObjectContainerEventListener.hxx
winaccessibility/inc/AccObjectManagerAgent.hxx
winaccessibility/inc/AccObjectWinManager.hxx
-winaccessibility/inc/AccParagraphEventListener.hxx
-winaccessibility/inc/AccTableEventListener.hxx
-winaccessibility/inc/AccTextComponentEventListener.hxx
-winaccessibility/inc/AccTopWindowListener.hxx
-winaccessibility/inc/AccTreeEventListener.hxx
-winaccessibility/inc/AccWindowEventListener.hxx
-winaccessibility/inc/ResIDGenerator.hxx
-winaccessibility/inc/accHelper.hxx
-winaccessibility/inc/unomsaaevent.hxx
winaccessibility/source/UAccCOM/AccAction.cxx
winaccessibility/source/UAccCOM/AccAction.h
winaccessibility/source/UAccCOM/AccActionBase.cxx
-winaccessibility/source/UAccCOM/AccActionBase.h
-winaccessibility/source/UAccCOM/AccComponent.cxx
winaccessibility/source/UAccCOM/AccComponent.h
-winaccessibility/source/UAccCOM/AccComponentBase.cxx
-winaccessibility/source/UAccCOM/AccComponentBase.h
winaccessibility/source/UAccCOM/AccEditableText.cxx
winaccessibility/source/UAccCOM/AccEditableText.h
winaccessibility/source/UAccCOM/AccHyperLink.cxx
winaccessibility/source/UAccCOM/AccHyperLink.h
winaccessibility/source/UAccCOM/AccHypertext.cxx
winaccessibility/source/UAccCOM/AccHypertext.h
-winaccessibility/source/UAccCOM/AccImage.cxx
winaccessibility/source/UAccCOM/AccImage.h
winaccessibility/source/UAccCOM/AccRelation.cxx
winaccessibility/source/UAccCOM/AccRelation.h
@@ -16997,30 +16977,22 @@ winaccessibility/source/UAccCOM/AccTable.h
winaccessibility/source/UAccCOM/AccText.cxx
winaccessibility/source/UAccCOM/AccText.h
winaccessibility/source/UAccCOM/AccTextBase.cxx
-winaccessibility/source/UAccCOM/AccTextBase.h
-winaccessibility/source/UAccCOM/AccValue.cxx
winaccessibility/source/UAccCOM/AccValue.h
-winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
winaccessibility/source/UAccCOM/EnumVariant.cxx
winaccessibility/source/UAccCOM/EnumVariant.h
winaccessibility/source/UAccCOM/MAccessible.cxx
winaccessibility/source/UAccCOM/MAccessible.h
winaccessibility/source/UAccCOM/Resource.h
-winaccessibility/source/UAccCOM/UAccCOM.cxx
-winaccessibility/source/UAccCOM/UNOXWrapper.cxx
-winaccessibility/source/UAccCOM/UNOXWrapper.h
winaccessibility/source/UAccCOM/acccommon.h
winaccessibility/source/UAccCOM/stdafx.h
winaccessibility/source/service/AccComponentEventListener.cxx
winaccessibility/source/service/AccContainerEventListener.cxx
winaccessibility/source/service/AccDescendantManagerEventListener.cxx
winaccessibility/source/service/AccDialogEventListener.cxx
-winaccessibility/source/service/AccEventListener.cxx
winaccessibility/source/service/AccFrameEventListener.cxx
winaccessibility/source/service/AccListEventListener.cxx
winaccessibility/source/service/AccMenuEventListener.cxx
winaccessibility/source/service/AccObject.cxx
-winaccessibility/source/service/AccObjectContainerEventListener.cxx
winaccessibility/source/service/AccObjectManagerAgent.cxx
winaccessibility/source/service/AccObjectWinManager.cxx
winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -17029,7 +17001,6 @@
winaccessibility/source/service/AccTextComponentEventListener.cxx
winaccessibility/source/service/AccTopWindowListener.cxx
winaccessibility/source/service/AccTreeEventListener.cxx
winaccessibility/source/service/AccWindowEventListener.cxx
-winaccessibility/source/service/ResIDGenerator.cxx
winaccessibility/source/service/msaaservice_impl.cxx
writerfilter/inc/dmapper/resourcemodel.hxx
writerfilter/inc/ooxml/OOXMLDocument.hxx
diff --git a/winaccessibility/inc/AccComponentEventListener.hxx
b/winaccessibility/inc/AccComponentEventListener.hxx
index a7fd6fffdf62..926c5cb74b65 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccComponentEventListener is inherited from AccEventListener. It handles
the events
* generated by component controls. The accessible roles are: CHECK_BOX, ICON,
LABEL,
@@ -33,31 +32,29 @@
* It defines the procedure of specific event handling related with components
and provides
* the detailed support for some related methods.
*/
-class AccComponentEventListener: public AccEventListener
+class AccComponentEventListener : public AccEventListener
{
private:
- static FILE *output, *output2, *output3, *outacc;//used for debugging
+ static FILE *output, *output2, *output3, *outacc; //used for debugging
public:
AccComponentEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccComponentEventListener() override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for value changed event
- virtual void HandleValueChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleValueChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue);
//for action changed event
virtual void HandleActionChangedEvent();
//for text changed event
- virtual void HandleTextChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleTextChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue);
//for caret changed event
- virtual void HandleCaretChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ 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;
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx
b/winaccessibility/inc/AccDialogEventListener.hxx
index af8a6f0ecfc4..18ae07d05d8f 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -31,22 +31,21 @@
* It defines the procedure of specific event handling related with dialogs
and provides
* the detailed support for some related methods.
*/
-class AccDialogEventListener: public AccEventListener
+class AccDialogEventListener : public AccEventListener
{
public:
AccDialogEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccDialogEventListener() override;
//AccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for child changed event
- virtual void HandleChildChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue);
//state changed
virtual void SetComponentState(short state, bool enable) override;
-
};
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCDIALOGEVENTLISTENER_HXX
diff --git a/winaccessibility/inc/AccEventListener.hxx
b/winaccessibility/inc/AccEventListener.hxx
index 9c5515529440..5ca714b39750 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -32,24 +32,24 @@ class AccObjectManagerAgent;
* procedure of all the event handling and provides the basic support for some
simple
* methods.
*/
-class AccEventListener
- : public ::cppu::WeakImplHelper<
- css::accessibility::XAccessibleEventListener>
+class AccEventListener : public
::cppu::WeakImplHelper<css::accessibility::XAccessibleEventListener>
{
protected:
//accessible owner's pointer
css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
//agent pointer for objects' manager
AccObjectManagerAgent* pAgent;
+
public:
- AccEventListener( css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
+ AccEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccEventListener() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source)
override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for name changed event
virtual void HandleNameChangedEvent(css::uno::Any name);
@@ -58,8 +58,7 @@ public:
virtual void HandleDescriptionChangedEvent(css::uno::Any desc);
//for state changed event
- virtual void HandleStateChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ 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 FireStateFocusedChange(bool enable);
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx
b/winaccessibility/inc/AccFrameEventListener.hxx
index 6c8e54fb3488..ce05881e0996 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -25,29 +25,27 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccFrameEventListener is inherited from AccEventListener. It handles the
events
* generated by Dialogs. The accessible roles are: FRAME and ROOT_PANE.
* It defines the procedure of specific event handling related with frames and
provides
* the detailed support for some related methods.
*/
-class AccFrameEventListener: public AccEventListener
+class AccFrameEventListener : public AccEventListener
{
public:
AccFrameEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccFrameEventListener() override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for child changed event
- virtual void HandleChildChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue);
//state changed
virtual void SetComponentState(short state, bool enable) override;
-
};
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCFRAMEEVENTLISTENER_HXX
diff --git a/winaccessibility/inc/AccListEventListener.hxx
b/winaccessibility/inc/AccListEventListener.hxx
index ffa7871def53..a84b9e9d5c72 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -25,28 +25,26 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccListEventListener is inherited from AccDescendantManagerEventListener.
It handles
* the events generated by tree controls. The accessible role is: LIST.
* It defines the procedure of specific event handling related with list
components
* and provides the detailed support for some related methods.
*/
-class AccListEventListener: public AccDescendantManagerEventListener
+class AccListEventListener : public AccDescendantManagerEventListener
{
public:
AccListEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccListEventListener() override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for active descendant changed event
- virtual void HandleActiveDescendantChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleActiveDescendantChangedEvent(css::uno::Any oldValue,
css::uno::Any newValue);
//for value changed event
- virtual void HandleValueChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue) override;
+ virtual void HandleValueChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue) override;
};
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCLISTEVENTLISTENER_HXX
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx
b/winaccessibility/inc/AccMenuEventListener.hxx
index 834b5ca3f993..290568bea2e6 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -25,25 +25,24 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccMenuEventListener is inherited from AccComponentEventListener. It
handles the events
* generated by container controls. The accessible role is: MENU
* It defines the procedure of specific event handling related with menus and
provides
* the detailed support for some related methods.
*/
-class AccMenuEventListener: public AccComponentEventListener
+class AccMenuEventListener : public AccComponentEventListener
{
public:
AccMenuEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccMenuEventListener() override;
//AccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for child changed event
- virtual void HandleChildChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue);
//for selection changed event
virtual void HandleSelectionChangedEventNoArgs();
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx
b/winaccessibility/inc/AccParagraphEventListener.hxx
index 4b11725c5875..60fdd4decd7d 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -25,25 +25,24 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccParagraphEventListener is inherited from AccContainerEventListener. It
handles the events
* generated by container controls. The accessible roles are: PARAGRAPH and
HEADING.
* It defines the procedure of specific event handling related with text
containsers and provides
* the detailed support for some related methods.
*/
-class AccParagraphEventListener: public AccContainerEventListener
+class AccParagraphEventListener : public AccContainerEventListener
{
public:
AccParagraphEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccParagraphEventListener() override;
//AccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for caret changed event
- virtual void HandleCaretChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleCaretChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue);
virtual void SetComponentState(short state, bool enable) override;
diff --git a/winaccessibility/inc/AccTableEventListener.hxx
b/winaccessibility/inc/AccTableEventListener.hxx
index d9bf2926b0f8..b22ce3b2dc25 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -25,28 +25,26 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccTableEventListener is inherited from AccDescendantManagerEventListener.
It handles
* the events generated by tree controls. The accessible role is: TABLE.
* It defines the procedure of specific event handling related with table
components
* and provides the detailed support for some related methods.
*/
-class AccTableEventListener: public AccDescendantManagerEventListener
+class AccTableEventListener : public AccDescendantManagerEventListener
{
public:
AccTableEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccTableEventListener() override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for active descendant changed event
- virtual void HandleActiveDescendantChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleActiveDescendantChangedEvent(css::uno::Any oldValue,
css::uno::Any newValue);
void HandleTableModelChangeEvent(css::uno::Any newValue);
-
};
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCTABLEEVENTLISTENER_HXX
diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx
b/winaccessibility/inc/AccTextComponentEventListener.hxx
index 380714a26baf..0a127c916b52 100644
--- a/winaccessibility/inc/AccTextComponentEventListener.hxx
+++ b/winaccessibility/inc/AccTextComponentEventListener.hxx
@@ -25,21 +25,20 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccTextComponentEventListener is inherited from AccComponentEventListener.
It handles the events
* generated by container controls. The accessible role is: TEXT
* It defines the procedure of specific event handling related with text
components and provides
* the detailed support for some related methods.
*/
-class AccTextComponentEventListener: public AccComponentEventListener
+class AccTextComponentEventListener : public AccComponentEventListener
{
public:
- AccTextComponentEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
+ AccTextComponentEventListener(css::accessibility::XAccessible* pAcc,
+ AccObjectManagerAgent* Agent);
virtual ~AccTextComponentEventListener() override;
virtual void SetComponentState(short state, bool enable) override;
-
};
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCTEXTCOMPONENTEVENTLISTENER_HXX
diff --git a/winaccessibility/inc/AccTopWindowListener.hxx
b/winaccessibility/inc/AccTopWindowListener.hxx
index bd71e08b3081..82a060a815f9 100644
--- a/winaccessibility/inc/AccTopWindowListener.hxx
+++ b/winaccessibility/inc/AccTopWindowListener.hxx
@@ -26,7 +26,7 @@
#include <cppuhelper/implbase.hxx>
-#include "AccObjectManagerAgent.hxx"
+#include "AccObjectManagerAgent.hxx"
/**
* AccEventListener is the general event listener for all top windows. The top
windows defined
@@ -35,30 +35,31 @@
* In this method, all the accessible objects (including COM object and Uno
objects) are created and
* cached into bridge managers, and they are monitored by listeners for later
accessible event handling.
*/
-class AccTopWindowListener
- : public ::cppu::WeakImplHelper<css::awt::XTopWindowListener>
+class AccTopWindowListener : public
::cppu::WeakImplHelper<css::awt::XTopWindowListener>
{
private:
AccObjectManagerAgent accManagerAgent;
+
public:
AccTopWindowListener();
virtual ~AccTopWindowListener() override;
// XTopWindowListener
- virtual void SAL_CALL windowOpened( const css::lang::EventObject& e )
override;
- virtual void SAL_CALL windowClosing( const css::lang::EventObject& e )
override;
- virtual void SAL_CALL windowClosed( const css::lang::EventObject& e )
override;
- virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e )
override;
- virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e )
override;
- virtual void SAL_CALL windowActivated( const css::lang::EventObject& e )
override;
- virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e )
override;
+ virtual void SAL_CALL windowOpened(const css::lang::EventObject& e)
override;
+ virtual void SAL_CALL windowClosing(const css::lang::EventObject& e)
override;
+ virtual void SAL_CALL windowClosed(const css::lang::EventObject& e)
override;
+ virtual void SAL_CALL windowMinimized(const css::lang::EventObject& e)
override;
+ virtual void SAL_CALL windowNormalized(const css::lang::EventObject& e)
override;
+ virtual void SAL_CALL windowActivated(const css::lang::EventObject& e)
override;
+ virtual void SAL_CALL windowDeactivated(const css::lang::EventObject& e)
override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source)
override;
- virtual void AddAllListeners(css::accessibility::XAccessible*
pAccessible,css::accessibility::XAccessible* pParentXAcc,HWND pWND );
+ virtual void AddAllListeners(css::accessibility::XAccessible* pAccessible,
+ css::accessibility::XAccessible* pParentXAcc,
HWND pWND);
//for On-Demand load.
- virtual void HandleWindowOpened( css::accessibility::XAccessible*
pAccessible );
+ virtual void HandleWindowOpened(css::accessibility::XAccessible*
pAccessible);
sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
};
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx
b/winaccessibility/inc/AccTreeEventListener.hxx
index 285b8737d865..ead0f8605860 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -25,25 +25,24 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccTreeEventListener is inherited from AccDescendantManagerEventListener.
It handles
* the events generated by tree controls. The accessible role is: TREE.
* It defines the procedure of specific event handling related with tree
components
* and provides the detailed support for some related methods.
*/
-class AccTreeEventListener: public AccDescendantManagerEventListener
+class AccTreeEventListener : public AccDescendantManagerEventListener
{
public:
AccTreeEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccTreeEventListener() override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for active descendant changed event
- virtual void HandleActiveDescendantChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleActiveDescendantChangedEvent(css::uno::Any oldValue,
css::uno::Any newValue);
};
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCTREEEVENTLISTENER_HXX
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx
b/winaccessibility/inc/AccWindowEventListener.hxx
index aad49d9d731d..a29e865cb482 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -25,29 +25,27 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-
/**
* AccWindowEventListener is inherited from AccEventListener. It handles the
events
* generated by Dialogs. The accessible role is: WINDOW.
* It defines the procedure of specific event handling related with windows
and provides
* the detailed support for some related methods.
*/
-class AccWindowEventListener: public AccEventListener
+class AccWindowEventListener : public AccEventListener
{
public:
AccWindowEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent);
virtual ~AccWindowEventListener() override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
//for child changed event
- virtual void HandleChildChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any
newValue);
//state changed
virtual void SetComponentState(short state, bool enable) override;
-
};
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCWINDOWEVENTLISTENER_HXX
diff --git a/winaccessibility/inc/ResIDGenerator.hxx
b/winaccessibility/inc/ResIDGenerator.hxx
index e5995f65b48d..abd9ec488c83 100644
--- a/winaccessibility/inc/ResIDGenerator.hxx
+++ b/winaccessibility/inc/ResIDGenerator.hxx
@@ -28,21 +28,17 @@
class ResIDGenerator
{
private:
-
long max;
std::deque<long> subList;
public:
-
ResIDGenerator(long maxNum = PRIMARY_RESID)
- : max(maxNum) {}
+ : max(maxNum)
+ {
+ }
~ResIDGenerator();
long GenerateNewResID();
- void SetSub(long number)
- {
- subList.push_back(number);
- };
-
+ void SetSub(long number) { subList.push_back(number); };
};
#endif // INCLUDED_WINACCESSIBILITY_INC_RESIDGENERATOR_HXX
diff --git a/winaccessibility/inc/accHelper.hxx
b/winaccessibility/inc/accHelper.hxx
index 9319e817671e..67323eca1970 100644
--- a/winaccessibility/inc/accHelper.hxx
+++ b/winaccessibility/inc/accHelper.hxx
@@ -24,16 +24,16 @@
enum DIRECTION
{
- FIRST_CHILD=0,
- LAST_CHILD=-1,
- BEFORE_CHILD=1 ,
- AFTER_CHILD=2
+ FIRST_CHILD = 0,
+ LAST_CHILD = -1,
+ BEFORE_CHILD = 1,
+ AFTER_CHILD = 2
};
-#define UNO_MSAA_UNMAPPING 0x00000000
+#define UNO_MSAA_UNMAPPING 0x00000000
struct IMAccessible;
-UACCCOM_DLLPUBLIC IMAccessible * UAccCOMCreateInstance();
+UACCCOM_DLLPUBLIC IMAccessible* UAccCOMCreateInstance();
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCHELPER_HXX
diff --git a/winaccessibility/inc/unomsaaevent.hxx
b/winaccessibility/inc/unomsaaevent.hxx
index 0661bed66838..8f3cb114a933 100644
--- a/winaccessibility/inc/unomsaaevent.hxx
+++ b/winaccessibility/inc/unomsaaevent.hxx
@@ -21,64 +21,64 @@
#define INCLUDED_WINACCESSIBILITY_INC_UNOMSAAEVENT_HXX
//STATE_CHANGED with get FOCUSED -> EVENT_OBJECT_FOCUS
-const short UM_EVENT_STATE_FOCUSED = 0 ;
+const short UM_EVENT_STATE_FOCUSED = 0;
//STATE_CHANGED --> EVENT_OBJECT_STATECHANGE
-const short UM_EVENT_STATE_CHECKED = 1 ;
-const short UM_EVENT_STATE_ARMED = 2 ;
-const short UM_EVENT_STATE_PRESSED = 3 ;
-const short UM_EVENT_STATE_SELECTED = 4 ;
-const short UM_EVENT_STATE_SHOWING = 5 ;
+const short UM_EVENT_STATE_CHECKED = 1;
+const short UM_EVENT_STATE_ARMED = 2;
+const short UM_EVENT_STATE_PRESSED = 3;
+const short UM_EVENT_STATE_SELECTED = 4;
+const short UM_EVENT_STATE_SHOWING = 5;
//if acc role is MENU_BAR, STATE_CHANGED with get FOCUSED ->
EVENT_SYSTEM_MENUSTART
-const short UM_EVENT_MENU_START = 6 ;
+const short UM_EVENT_MENU_START = 6;
//if acc role is MENU_BAR, STATE_CHANGED with lose FOCUSED ->
EVENT_SYSTEM_MENUEND
-const short UM_EVENT_MENU_END = 7 ;
+const short UM_EVENT_MENU_END = 7;
//if acc role is POPUP_MENU, STATE_CHANGED with get FOCUSED ->
EVENT_SYSTEM_MENUPOPUPSTART
-const short UM_EVENT_MENUPOPUPSTART = 8 ;
+const short UM_EVENT_MENUPOPUPSTART = 8;
//if acc role is POPUP_MENU, STATE_CHANGED with lose FOCUSED ->
EVENT_SYSTEM_MENUPOPUPEND
-const short UM_EVENT_MENUPOPUPEND = 9 ;
+const short UM_EVENT_MENUPOPUPEND = 9;
//SELECTION_CHANGED -> EVENT_OBJECT_SELECTION
-const short UM_EVENT_SELECTION_CHANGED = 10 ;
+const short UM_EVENT_SELECTION_CHANGED = 10;
//INVALIDATE_ALL_CHILDREN --> EVENT_OBJECT_SHOW
-const short UM_EVENT_INVALIDATE_ALL_CHILDREN = 11 ;
+const short UM_EVENT_INVALIDATE_ALL_CHILDREN = 11;
//VALUE_CHANGED --> EVENT_OBJECT_VALUECHANGE
-const short UM_EVENT_OBJECT_VALUECHANGE = 12 ;
+const short UM_EVENT_OBJECT_VALUECHANGE = 12;
//NAME_CHANGED --> EVENT_OBJECT_NAMECHANGE
-const short UM_EVENT_OBJECT_NAMECHANGE = 13 ;
+const short UM_EVENT_OBJECT_NAMECHANGE = 13;
//DESCRIPTION_CHANGED --> EVENT_OBJECT_DESCRIPTIONCHANGE
-const short UM_EVENT_OBJECT_DESCRIPTIONCHANGE = 14 ;
+const short UM_EVENT_OBJECT_DESCRIPTIONCHANGE = 14;
//ACTION_CHANGED --> EVENT_OBJECT_DEFACTIONCHANGE
-const short UM_EVENT_OBJECT_DEFACTIONCHANGE = 15 ;
+const short UM_EVENT_OBJECT_DEFACTIONCHANGE = 15;
//CARET_CHANGED --> EVENT_OBJECT_LOCATIONCHANGED
-const short UM_EVENT_OBJECT_CARETCHANGE = 16 ;
+const short UM_EVENT_OBJECT_CARETCHANGE = 16;
//TEXT_CHANGED --> EVENT_OBJECT_VALUECHANGE
-const short UM_EVENT_OBJECT_TEXTCHANGE = 17 ;
+const short UM_EVENT_OBJECT_TEXTCHANGE = 17;
//ACTIVE_DESCENDANT_CHANGED --> EVENT_OBJECT_FOCUS
-const short UM_EVENT_ACTIVE_DESCENDANT_CHANGED = 18 ;
+const short UM_EVENT_ACTIVE_DESCENDANT_CHANGED = 18;
//BOUNDRECT_CHANGED --> EVENT_OBJECT_LOCATIONCHANGE
-const short UM_EVENT_BOUNDRECT_CHANGED = 19 ;
+const short UM_EVENT_BOUNDRECT_CHANGED = 19;
//VISIBLE_DATA_CHANGED --> EVENT_OBJECT_VALUECHANGE
-const short UM_EVENT_VISIBLE_DATA_CHANGED = 20 ;
+const short UM_EVENT_VISIBLE_DATA_CHANGED = 20;
//to enable SHOW on dialogs, windows, frames
-const short UM_EVENT_SHOW = 21 ;
+const short UM_EVENT_SHOW = 21;
-const short UM_EVENT_STATE_BUSY = 22 ;
+const short UM_EVENT_STATE_BUSY = 22;
const short UM_EVENT_TABLE_CAPTION_CHANGED = 24;
const short UM_EVENT_TABLE_COLUMN_DESCRIPTION_CHANGED = 25;
@@ -87,13 +87,13 @@ const short UM_EVENT_TABLE_MODEL_CHANGED = 27;
const short UM_EVENT_TABLE_ROW_HEADER_CHANGED = 28;
const short UM_EVENT_TABLE_SUMMARY_CHANGED = 29;
const short UM_EVENT_OBJECT_REORDER = 30;
-const short UM_EVENT_PAGE_CHANGED =31;
-const short UM_EVENT_CHILD_ADDED =32;
-const short UM_EVENT_CHILD_REMOVED =33;
-const short UM_EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 34;
-const short UM_EVENT_SELECTION_CHANGED_ADD = 35 ;
-const short UM_EVENT_SELECTION_CHANGED_REMOVE = 36 ;
-const short UM_EVENT_SELECTION_CHANGED_WITHIN = 37 ;
+const short UM_EVENT_PAGE_CHANGED = 31;
+const short UM_EVENT_CHILD_ADDED = 32;
+const short UM_EVENT_CHILD_REMOVED = 33;
+const short UM_EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 34;
+const short UM_EVENT_SELECTION_CHANGED_ADD = 35;
+const short UM_EVENT_SELECTION_CHANGED_REMOVE = 36;
+const short UM_EVENT_SELECTION_CHANGED_WITHIN = 37;
//support for PAGE_CHANGED event
const short UM_EVENT_OBJECT_PAGECHANGED = 38;
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h
b/winaccessibility/source/UAccCOM/AccActionBase.h
index e804c3a14945..e70c32467809 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.h
+++ b/winaccessibility/source/UAccCOM/AccActionBase.h
@@ -26,7 +26,7 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include "UNOXWrapper.h"
-class ATL_NO_VTABLE CAccActionBase : public CUNOXWrapper
+class ATL_NO_VTABLE CAccActionBase : public CUNOXWrapper
{
public:
CAccActionBase();
@@ -37,29 +37,30 @@ public:
// IAccessibleAction
// Returns the number of action.
- STDMETHOD(nActions)(/*[out,retval]*/long* nActions);
+ STDMETHOD(nActions)(/*[out,retval]*/ long* nActions);
// Performs specified action on the object.
STDMETHOD(doAction)(/* [in] */ long actionIndex);
// Gets description of specified action.
- STDMETHOD(get_description)(long actionIndex,BSTR __RPC_FAR *description);
+ STDMETHOD(get_description)(long actionIndex, BSTR __RPC_FAR* description);
// added , 2006/06/28, for driver 07/11
// get the action name
- STDMETHOD(get_name)( long actionIndex, BSTR __RPC_FAR *name);
+ STDMETHOD(get_name)(long actionIndex, BSTR __RPC_FAR* name);
// get the localized action Name
- STDMETHOD(get_localizedName)( long actionIndex, BSTR __RPC_FAR
*localizedName);
+ STDMETHOD(get_localizedName)(long actionIndex, BSTR __RPC_FAR*
localizedName);
// Returns key binding object (if any) associated with specified action
// key binding is string.
// e.g. "alt+d" (like IAccessible::get_accKeyboardShortcut).
- STDMETHOD(get_keyBinding)(
+ STDMETHOD(get_keyBinding)
+ (
/* [in] */ long actionIndex,
/* [in] */ long nMaxBinding,
- /* [length_is][length_is][size_is][size_is][out] */ BSTR __RPC_FAR
*__RPC_FAR *keyBinding,
- /* [retval][out] */ long __RPC_FAR *nBinding);
+ /* [length_is][length_is][size_is][size_is][out] */ BSTR __RPC_FAR*
__RPC_FAR* keyBinding,
+ /* [retval][out] */ long __RPC_FAR* nBinding);
// Override of IUNOXWrapper.
STDMETHOD(put_XInterface)(hyper pXInterface) override;
@@ -68,10 +69,7 @@ protected:
css::uno::Reference<css::accessibility::XAccessibleAction> pRXAct;
private:
- css::accessibility::XAccessibleAction* GetXInterface()
- {
- return pRXAct.get();
- }
+ css::accessibility::XAccessibleAction* GetXInterface() { return
pRXAct.get(); }
};
#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTIONBASE_H
diff --git a/winaccessibility/source/UAccCOM/AccComponent.cxx
b/winaccessibility/source/UAccCOM/AccComponent.cxx
index 22318751e62d..2ca64cd7df1c 100644
--- a/winaccessibility/source/UAccCOM/AccComponent.cxx
+++ b/winaccessibility/source/UAccCOM/AccComponent.cxx
@@ -27,7 +27,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
-#include <UAccCOM.h>
+#include <UAccCOM.h>
#if defined __clang__
#pragma clang diagnostic pop
#endif
@@ -38,10 +38,9 @@
*
* @param Location the upper left corner of the object's bounding box.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_locationInParent(long *x,
long *y)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_locationInParent(long* x,
long* y)
{
-
- return CAccComponentBase::get_locationInParent(x,y);
+ return CAccComponentBase::get_locationInParent(x, y);
}
/**
@@ -49,9 +48,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponent::get_locationInParent(long *x, l
*
* @param Color the color of foreground.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_foreground(IA2Color *
foreground)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_foreground(IA2Color*
foreground)
{
-
return CAccComponentBase::get_foreground(foreground);
}
@@ -60,9 +58,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponent::get_foreground(IA2Color * foreg
*
* @param Color the color of background.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_background(IA2Color *
background)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_background(IA2Color*
background)
{
-
return CAccComponentBase::get_background(background);
}
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.cxx
b/winaccessibility/source/UAccCOM/AccComponentBase.cxx
index ad3b06f79668..7d173dd0064a 100644
--- a/winaccessibility/source/UAccCOM/AccComponentBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.cxx
@@ -27,16 +27,11 @@
using namespace com::sun::star::accessibility;
using namespace com::sun::star::uno;
-
// Construction/Destruction
+CAccComponentBase::CAccComponentBase() {}
-CAccComponentBase::CAccComponentBase()
-{}
-
-CAccComponentBase::~CAccComponentBase()
-{}
-
+CAccComponentBase::~CAccComponentBase() {}
/**
* Returns the location of the upper left corner of the object's bounding
@@ -44,7 +39,7 @@ CAccComponentBase::~CAccComponentBase()
*
* @param Location the upper left corner of the object's bounding box.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::get_locationInParent(long
*x, long *y)
+COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_locationInParent(long* x, long* y)
{
SolarMutexGuard g;
@@ -53,7 +48,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_locationInParent(long *
if (x == nullptr || y == nullptr)
return E_INVALIDARG;
// #CHECK XInterface#
- if(!pRXComp.is())
+ if (!pRXComp.is())
return E_FAIL;
const css::awt::Point& pt = GetXInterface()->getLocation();
@@ -61,7 +56,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_locationInParent(long *
*y = pt.Y;
return S_OK;
}
- catch(...)
+ catch (...)
{
return E_FAIL;
}
@@ -74,7 +69,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_locationInParent(long *
* @param Location the upper left corner of the object's bounding
* box in screen coordinates.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::get_locationOnScreen(long
*x, long *y)
+COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_locationOnScreen(long* x, long* y)
{
SolarMutexGuard g;
@@ -83,16 +78,15 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_locationOnScreen(long *
if (x == nullptr || y == nullptr)
return E_INVALIDARG;
// #CHECK XInterface#
- if(!pRXComp.is())
+ if (!pRXComp.is())
return E_FAIL;
const css::awt::Point& pt = GetXInterface()->getLocationOnScreen();
*x = pt.X;
*y = pt.Y;
return S_OK;
-
}
- catch(...)
+ catch (...)
{
return E_FAIL;
}
@@ -103,7 +97,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_locationOnScreen(long *
*
* @param success the boolean result to be returned.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::grabFocus(boolean *
success)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::grabFocus(boolean*
success)
{
SolarMutexGuard g;
@@ -112,7 +106,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::grabFocus(boolean * success
if (success == nullptr)
return E_INVALIDARG;
// #CHECK XInterface#
- if(!pRXComp.is())
+ if (!pRXComp.is())
{
return E_FAIL;
}
@@ -129,7 +123,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::grabFocus(boolean * success
*
* @param Color the color of foreground.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::get_foreground(IA2Color *
foreground)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::get_foreground(IA2Color*
foreground)
{
SolarMutexGuard g;
@@ -138,7 +132,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_foreground(IA2Color * f
if (foreground == nullptr)
return E_INVALIDARG;
// #CHECK XInterface#
- if(!pRXComp.is())
+ if (!pRXComp.is())
{
return E_FAIL;
}
@@ -154,7 +148,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_foreground(IA2Color * f
*
* @param Color the color of background.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::get_background(IA2Color *
background)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::get_background(IA2Color*
background)
{
SolarMutexGuard g;
@@ -163,7 +157,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::get_background(IA2Color * b
if (background == nullptr)
return E_INVALIDARG;
// #CHECK XInterface#
- if(!pRXComp.is())
+ if (!pRXComp.is())
{
return E_FAIL;
}
@@ -187,15 +181,15 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccComponentBase::put_XInterface(hyper pXInte
CUNOXWrapper::put_XInterface(pXInterface);
//special query.
- if(pUNOInterface == nullptr)
+ if (pUNOInterface == nullptr)
return E_FAIL;
Reference<XAccessibleContext> pRContext =
pUNOInterface->getAccessibleContext();
- if( !pRContext.is() )
+ if (!pRContext.is())
{
return E_FAIL;
}
- Reference<XAccessibleComponent> pRXI(pRContext,UNO_QUERY);
- if( !pRXI.is() )
+ Reference<XAccessibleComponent> pRXI(pRContext, UNO_QUERY);
+ if (!pRXI.is())
pRXComp = nullptr;
else
pRXComp = pRXI.get();
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h
b/winaccessibility/source/UAccCOM/AccComponentBase.h
index 7bc0c3bb8dd0..fd050d4c64ed 100644
--- a/winaccessibility/source/UAccCOM/AccComponentBase.h
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.h
@@ -37,32 +37,28 @@ public:
// Returns the location of the upper left corner of the object's bounding
// box relative to the parent.
- STDMETHOD(get_locationInParent)(long *x, long *y);
+ STDMETHOD(get_locationInParent)(long* x, long* y);
// Returns the location of the upper left corner of the object's bounding
// box in screen.
- STDMETHOD(get_locationOnScreen)(long *x, long *y);
+ STDMETHOD(get_locationOnScreen)(long* x, long* y);
// Grabs the focus to this object.
- STDMETHOD(grabFocus)(boolean * success);
+ STDMETHOD(grabFocus)(boolean* success);
// Returns the foreground color of this object.
- STDMETHOD(get_foreground)(IA2Color * foreground);
+ STDMETHOD(get_foreground)(IA2Color* foreground);
// Returns the background color of this object.
- STDMETHOD(get_background)(IA2Color * background);
+ STDMETHOD(get_background)(IA2Color* background);
// Override of IUNOXWrapper.
STDMETHOD(put_XInterface)(hyper pXInterface) override;
protected:
-
css::uno::Reference<css::accessibility::XAccessibleComponent> pRXComp;
- css::accessibility::XAccessibleComponent* GetXInterface()
- {
- return pRXComp.get();
- }
+ css::accessibility::XAccessibleComponent* GetXInterface() { return
pRXComp.get(); }
};
#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENTBASE_H
diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx
b/winaccessibility/source/UAccCOM/AccImage.cxx
index d9fe6a3c4c38..1319e2e65f4c 100644
--- a/winaccessibility/source/UAccCOM/AccImage.cxx
+++ b/winaccessibility/source/UAccCOM/AccImage.cxx
@@ -24,7 +24,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
-#include <UAccCOM.h>
+#include <UAccCOM.h>
#if defined __clang__
#pragma clang diagnostic pop
#endif
@@ -43,7 +43,7 @@ using namespace css::uno;
* @param description Variant to get description.
* @return Result.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccImage::get_description(BSTR *
description)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccImage::get_description(BSTR* description)
{
SolarMutexGuard g;
@@ -52,7 +52,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccImage::get_description(BSTR * description)
// #CHECK#
if (description == nullptr)
return E_INVALIDARG;
- if( !pRXImg.is() )
+ if (!pRXImg.is())
return E_FAIL;
OUString ouStr = GetXInterface()->getAccessibleImageDescription();
@@ -66,15 +66,15 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccImage::get_description(BSTR * description)
COM_DECLSPEC_NOTHROW STDMETHODIMP CAccImage::get_imagePosition(
/* [in] */ enum IA2CoordinateType,
- /* [out] */ long __RPC_FAR *,
- /* [retval][out] */ long __RPC_FAR *)
+ /* [out] */ long __RPC_FAR*,
+ /* [retval][out] */ long __RPC_FAR*)
{
return E_NOTIMPL;
}
COM_DECLSPEC_NOTHROW STDMETHODIMP CAccImage::get_imageSize(
- /* [out] */ long __RPC_FAR *,
- /* [retval][out] */ long __RPC_FAR *)
+ /* [out] */ long __RPC_FAR*,
+ /* [retval][out] */ long __RPC_FAR*)
{
return E_NOTIMPL;
}
@@ -92,16 +92,16 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccImage::put_XInterface(hyper pXInterface)
CUNOXWrapper::put_XInterface(pXInterface);
//special query.
- if(pUNOInterface == nullptr)
+ if (pUNOInterface == nullptr)
return E_FAIL;
Reference<XAccessibleContext> pRContext =
pUNOInterface->getAccessibleContext();
- if( !pRContext.is() )
+ if (!pRContext.is())
{
return E_FAIL;
}
- Reference<XAccessibleImage> pRXI(pRContext,UNO_QUERY);
- if( !pRXI.is() )
+ Reference<XAccessibleImage> pRXI(pRContext, UNO_QUERY);
+ if (!pRXI.is())
pRXImg = nullptr;
else
pRXImg = pRXI.get();
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.h
b/winaccessibility/source/UAccCOM/AccTextBase.h
index fc0c0a7be772..da4272cba8d1 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.h
+++ b/winaccessibility/source/UAccCOM/AccTextBase.h
@@ -40,39 +40,44 @@ public:
STDMETHOD(get_addSelection)(long startOffset, long endOffset);
// Gets text attributes.
- STDMETHOD(get_attributes)(long offset, long * startOffset, long *
endOffset, BSTR * textAttributes);
+ STDMETHOD(get_attributes)
+ (long offset, long* startOffset, long* endOffset, BSTR* textAttributes);
// Gets caret offset.
- STDMETHOD(get_caretOffset)(long * offset);
+ STDMETHOD(get_caretOffset)(long* offset);
// Gets total number of characters.
- STDMETHOD(get_characterCount)(long * nCharacters);
+ STDMETHOD(get_characterCount)(long* nCharacters);
// Gets bounding rect containing the glyph(s) representing the character
// at the specified text offset
- STDMETHOD(get_characterExtents)(long offset, IA2CoordinateType coordType,
long * x, long * y, long * width, long * height);
+ STDMETHOD(get_characterExtents)
+ (long offset, IA2CoordinateType coordType, long* x, long* y, long* width,
long* height);
// Gets number of active non-contiguous selections.
- STDMETHOD(get_nSelections)(long * nSelections);
+ STDMETHOD(get_nSelections)(long* nSelections);
// Gets bounding rect for the glyph at a certain point.
- STDMETHOD(get_offsetAtPoint)(long x, long y, IA2CoordinateType coordType,
long * offset);
+ STDMETHOD(get_offsetAtPoint)(long x, long y, IA2CoordinateType coordType,
long* offset);
// Gets character offsets of N-th active text selection.
- STDMETHOD(get_selection)(long selectionIndex, long * startOffset, long *
endOffset);
+ STDMETHOD(get_selection)(long selectionIndex, long* startOffset, long*
endOffset);
// Gets a range of text by offset NOTE: returned string may be longer
// than endOffset-startOffset bytes if text contains multi-byte characters.
- STDMETHOD(get_text)(long startOffset, long endOffset, BSTR * text);
+ STDMETHOD(get_text)(long startOffset, long endOffset, BSTR* text);
// Gets a specified amount of text that ends before a specified offset.
- STDMETHOD(get_textBeforeOffset)(long offset, IA2TextBoundaryType
boundaryType, long * startOffset, long * endOffset, BSTR * text);
+ STDMETHOD(get_textBeforeOffset)
+ (long offset, IA2TextBoundaryType boundaryType, long* startOffset, long*
endOffset, BSTR* text);
// Gets a specified amount of text that spans the specified offset.
- STDMETHOD(get_textAfterOffset)(long offset, IA2TextBoundaryType
boundaryType, long * startOffset, long * endOffset, BSTR * text);
+ STDMETHOD(get_textAfterOffset)
+ (long offset, IA2TextBoundaryType boundaryType, long* startOffset, long*
endOffset, BSTR* text);
// Gets a specified amount of text that starts after a specified offset.
- STDMETHOD(get_textAtOffset)(long offset, IA2TextBoundaryType boundaryType,
long * startOffset, long * endOffset, BSTR * text);
+ STDMETHOD(get_textAtOffset)
+ (long offset, IA2TextBoundaryType boundaryType, long* startOffset, long*
endOffset, BSTR* text);
// Unselects a range of text.
STDMETHOD(removeSelection)(long selectionIndex);
@@ -86,27 +91,24 @@ public:
// Gets total number of characters.
// NOTE: this may be different than the total number of bytes required
// to store the text, if the text contains multi-byte characters.
- STDMETHOD(get_nCharacters)(long * nCharacters);
+ STDMETHOD(get_nCharacters)(long* nCharacters);
- STDMETHOD(get_newText)( IA2TextSegment *newText);
+ STDMETHOD(get_newText)(IA2TextSegment* newText);
- STDMETHOD(get_oldText)( IA2TextSegment *oldText);
+ STDMETHOD(get_oldText)(IA2TextSegment* oldText);
// Makes specific part of string visible on screen.
- STDMETHOD(scrollSubstringTo)(long startIndex, long endIndex,enum
IA2ScrollType scrollType);
- STDMETHOD(scrollSubstringToPoint)(long startIndex, long endIndex,enum
IA2CoordinateType coordinateType, long x, long y );
+ STDMETHOD(scrollSubstringTo)(long startIndex, long endIndex, enum
IA2ScrollType scrollType);
+ STDMETHOD(scrollSubstringToPoint)
+ (long startIndex, long endIndex, enum IA2CoordinateType coordinateType,
long x, long y);
// Override of IUNOXWrapper.
STDMETHOD(put_XInterface)(hyper pXInterface) override;
private:
-
css::uno::Reference<css::accessibility::XAccessibleText> pRXText;
- css::accessibility::XAccessibleText* GetXInterface()
- {
- return pRXText.get();
- }
+ css::accessibility::XAccessibleText* GetXInterface() { return
pRXText.get(); }
};
#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXTBASE_H
diff --git a/winaccessibility/source/UAccCOM/AccValue.cxx
b/winaccessibility/source/UAccCOM/AccValue.cxx
index 7c8f069b4d6c..81fcf0b026db 100644
--- a/winaccessibility/source/UAccCOM/AccValue.cxx
+++ b/winaccessibility/source/UAccCOM/AccValue.cxx
@@ -25,7 +25,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
-#include <UAccCOM.h>
+#include <UAccCOM.h>
#if defined __clang__
#pragma clang diagnostic pop
#endif
@@ -44,7 +44,7 @@ using namespace com::sun::star::uno;
* @return Result.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccValue::get_currentValue(VARIANT *
currentValue)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccValue::get_currentValue(VARIANT*
currentValue)
{
SolarMutexGuard g;
@@ -52,11 +52,11 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::get_currentValue(VARIANT * currentV
if (currentValue == nullptr)
return E_INVALIDARG;
- if ( !pRXVal.is() )
+ if (!pRXVal.is())
return E_FAIL;
// Get Any type value from UNO.
- css::uno::Any anyVal = GetXInterface()->getCurrentValue();
+ css::uno::Any anyVal = GetXInterface()->getCurrentValue();
// Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, currentValue);
@@ -77,57 +77,57 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::setCurrentValue(VARIANT value)
ENTER_PROTECTED_BLOCK
- if ( !pRXVal.is() )
+ if (!pRXVal.is())
return E_FAIL;
HRESULT hRet = S_OK;
css::uno::Any anyVal;
// Set value according to value type.
- switch(value.vt)
+ switch (value.vt)
{
- case VT_UI1:
+ case VT_UI1:
{
anyVal <<= sal_Unicode(value.bVal);
}
break;
- case VT_BOOL:
+ case VT_BOOL:
{
- css::uno::Type typeInfo(TypeClass_BOOLEAN, "bool");
+ css::uno::Type typeInfo(TypeClass_BOOLEAN, "bool");
anyVal.setValue(&value.boolVal, typeInfo);
}
break;
- case VT_I2:
+ case VT_I2:
{
- css::uno::Type typeInfo(TypeClass_SHORT, "short");
+ css::uno::Type typeInfo(TypeClass_SHORT, "short");
anyVal.setValue(&value.iVal, typeInfo);
}
break;
- case VT_I4:
+ case VT_I4:
{
- css::uno::Type typeInfo(TypeClass_LONG, "long");
+ css::uno::Type typeInfo(TypeClass_LONG, "long");
anyVal.setValue(&value.lVal, typeInfo);
}
break;
- case VT_R4:
+ case VT_R4:
{
- css::uno::Type typeInfo(TypeClass_FLOAT, "float");
+ css::uno::Type typeInfo(TypeClass_FLOAT, "float");
anyVal.setValue(&value.fltVal, typeInfo);
}
break;
- case VT_R8:
+ case VT_R8:
{
- css::uno::Type typeInfo(TypeClass_DOUBLE, "double");
+ css::uno::Type typeInfo(TypeClass_DOUBLE, "double");
anyVal.setValue(&value.dblVal, typeInfo);
}
break;
- default:
+ default:
{
// Unsupported type conversion.
hRet = E_FAIL;
@@ -135,9 +135,9 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::setCurrentValue(VARIANT value)
break;
}
- if(hRet == S_OK)
+ if (hRet == S_OK)
{
- hRet = pRXVal->setCurrentValue(anyVal) ? S_OK : E_FAIL ;
+ hRet = pRXVal->setCurrentValue(anyVal) ? S_OK : E_FAIL;
}
return hRet;
@@ -150,7 +150,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::setCurrentValue(VARIANT value)
* @param maximumValue Variant that accepts maximum value.
* @return Result.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccValue::get_maximumValue(VARIANT
*maximumValue)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccValue::get_maximumValue(VARIANT*
maximumValue)
{
SolarMutexGuard g;
@@ -158,11 +158,11 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::get_maximumValue(VARIANT *maximumVa
if (maximumValue == nullptr)
return E_INVALIDARG;
- if ( !pRXVal.is() )
+ if (!pRXVal.is())
return E_FAIL;
// Get Any type value from UNO.
- css::uno::Any anyVal = GetXInterface()->getMaximumValue();
+ css::uno::Any anyVal = GetXInterface()->getMaximumValue();
// Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, maximumValue);
@@ -176,7 +176,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::get_maximumValue(VARIANT *maximumVa
* @param minimumValue Variant that accepts minimum value.
* @return Result.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccValue::get_minimumValue(VARIANT
*minimumValue)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccValue::get_minimumValue(VARIANT*
minimumValue)
{
SolarMutexGuard g;
@@ -184,11 +184,11 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::get_minimumValue(VARIANT *minimumVa
if (minimumValue == nullptr)
return E_FAIL;
- if ( !pRXVal.is() )
+ if (!pRXVal.is())
return E_FAIL;
// Get Any type value from UNO.
- css::uno::Any anyVal = GetXInterface()->getMinimumValue();
+ css::uno::Any anyVal = GetXInterface()->getMinimumValue();
// Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, minimumValue);
@@ -210,15 +210,15 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccValue::put_XInterface(hyper pXInterface)
CUNOXWrapper::put_XInterface(pXInterface);
//special query.
- if(pUNOInterface == nullptr)
+ if (pUNOInterface == nullptr)
return E_FAIL;
Reference<XAccessibleContext> pRContext =
pUNOInterface->getAccessibleContext();
- if( !pRContext.is() )
+ if (!pRContext.is())
{
return E_FAIL;
}
- Reference<XAccessibleValue> pRXI(pRContext,UNO_QUERY);
- if( !pRXI.is() )
+ Reference<XAccessibleValue> pRXI(pRContext, UNO_QUERY);
+ if (!pRXI.is())
pRXVal = nullptr;
else
pRXVal = pRXI.get();
diff --git a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
index fa03a79934aa..74a731fbd8b2 100644
--- a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
+++ b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
@@ -20,11 +20,12 @@
#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
-struct ACCESSIBLE_KEYSTROKE {
- short modifiers;
- short keyCode;
- char keyChar;
- short keyFunc;
+struct ACCESSIBLE_KEYSTROKE
+{
+ short modifiers;
+ short keyCode;
+ char keyChar;
+ short keyFunc;
};
const short MODIFIER_SHIFT = 1;
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx
b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 43c3188b4f03..403aa86db41c 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
@@ -26,7 +26,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
-#include <UAccCOM.h>
+#include <UAccCOM.h>
#if defined __clang__
#pragma clang diagnostic pop
#endif
@@ -34,7 +34,7 @@
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wextra-tokens"
- // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
+// "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
#endif
#include <UAccCOM_i.c>
#include <ia2_api_all_i.c>
@@ -56,7 +56,6 @@
#include "AccHyperLink.h"
#include "AccHypertext.h"
-
CComModule _Module;
BEGIN_OBJECT_MAP(ObjectMap)
@@ -83,8 +82,7 @@ END_OBJECT_MAP()
// DLL Entry Point
-extern "C"
- BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID
/*lpReserved*/)
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID
/*lpReserved*/)
{
if (dwReason == DLL_PROCESS_ATTACH)
{
@@ -93,17 +91,12 @@ extern "C"
}
else if (dwReason == DLL_PROCESS_DETACH)
_Module.Term();
- return TRUE; // ok
+ return TRUE; // ok
}
-
// Used to determine whether the DLL can be unloaded by OLE
-STDAPI DllCanUnloadNow()
-{
- return (_Module.GetLockCount()==0) ? S_OK : E_FAIL;
-}
-
+STDAPI DllCanUnloadNow() { return (_Module.GetLockCount() == 0) ? S_OK :
E_FAIL; }
// Returns a class factory to create an object of the requested type
@@ -112,10 +105,9 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid,
LPVOID* ppv)
return _Module.GetClassObject(rclsid, riid, ppv);
}
-
-IMAccessible * UAccCOMCreateInstance()
+IMAccessible* UAccCOMCreateInstance()
{
- IMAccessible * pIMA = nullptr;
+ IMAccessible* pIMA = nullptr;
HRESULT hr = createInstance<CMAccessible>(IID_IMAccessible, &pIMA);
return (S_OK == hr) ? pIMA : nullptr;
}
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
index cc43370b64c6..a2b5d917dfa0 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
@@ -24,14 +24,13 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
-#include <UAccCOM.h>
+#include <UAccCOM.h>
#if defined __clang__
#pragma clang diagnostic pop
#endif
using namespace ::com::sun::star;
-
// CUNOXWrapper
COM_DECLSPEC_NOTHROW STDMETHODIMP CUNOXWrapper::put_XInterface(hyper
nXInterface)
@@ -40,9 +39,6 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CUNOXWrapper::put_XInterface(hyper nXInterface
return S_OK;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CUNOXWrapper::put_XSubInterface(hyper)
-{
- return S_OK;
-}
+COM_DECLSPEC_NOTHROW STDMETHODIMP CUNOXWrapper::put_XSubInterface(hyper) {
return S_OK; }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h
b/winaccessibility/source/UAccCOM/UNOXWrapper.h
index db22f4b0675e..b00bb6cbb5a7 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
-#include "Resource.h" // main symbols
+#include "Resource.h" // main symbols
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -28,7 +28,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
-#include <UAccCOM.h>
+#include <UAccCOM.h>
#if defined __clang__
#pragma clang diagnostic pop
#endif
@@ -42,8 +42,10 @@ protected:
css::accessibility::XAccessible* pUNOInterface;
public:
- CUNOXWrapper() : pUNOInterface(nullptr)
- { }
+ CUNOXWrapper()
+ : pUNOInterface(nullptr)
+ {
+ }
// IUNOXWrapper
STDMETHOD(put_XInterface)(hyper pXInterface) override;
diff --git a/winaccessibility/source/service/AccEventListener.cxx
b/winaccessibility/source/service/AccEventListener.cxx
index e2be5cce145d..d7bf74390765 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -46,33 +46,32 @@
AccEventListener::AccEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent)
: m_xAccessible(pAcc)
, pAgent(Agent)
-{}
-
-AccEventListener::~AccEventListener()
{
}
+AccEventListener::~AccEventListener() {}
+
/**
* Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains
information about event
*/
-void AccEventListener::notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent )
+void AccEventListener::notifyEvent(const
css::accessibility::AccessibleEventObject& aEvent)
{
SolarMutexGuard g;
switch (aEvent.EventId)
{
- case AccessibleEventId::NAME_CHANGED:
- HandleNameChangedEvent(aEvent.NewValue);
- break;
- case AccessibleEventId::DESCRIPTION_CHANGED:
- HandleDescriptionChangedEvent(aEvent.NewValue);
- break;
- case AccessibleEventId::STATE_CHANGED:
- HandleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
- break;
- default:
- break;
+ case AccessibleEventId::NAME_CHANGED:
+ HandleNameChangedEvent(aEvent.NewValue);
+ break;
+ case AccessibleEventId::DESCRIPTION_CHANGED:
+ HandleDescriptionChangedEvent(aEvent.NewValue);
+ break;
+ case AccessibleEventId::STATE_CHANGED:
+ HandleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ break;
+ default:
+ break;
}
}
@@ -85,7 +84,7 @@ void AccEventListener::HandleNameChangedEvent(Any name)
if (pAgent->IsTopWinAcc(m_xAccessible.get()))
{
XAccessible* pAccDoc =
pAgent->GetAccDocByAccTopWin(m_xAccessible.get());
- if ( pAccDoc )
+ if (pAccDoc)
{
pAgent->UpdateAccName(pAccDoc);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_NAMECHANGE, pAccDoc);
@@ -132,7 +131,7 @@ void AccEventListener::HandleVisibleDataChangedEvent()
void AccEventListener::HandleStateChangedEvent(Any oldValue, Any newValue)
{
short newV, oldV;
- if( newValue >>= newV)
+ if (newValue >>= newV)
{
SetComponentState(newV, true);
}
@@ -147,16 +146,16 @@ void AccEventListener::HandleStateChangedEvent(Any
oldValue, Any newValue)
* @param state new state id
* @param enable true if state is set, false if state is unset
*/
-void AccEventListener::SetComponentState(short state, bool enable )
+void AccEventListener::SetComponentState(short state, bool enable)
{
switch (state)
{
- case AccessibleStateType::FOCUSED:
- FireStateFocusedChange(enable);
- break;
- default:
- FireStatePropertyChange(state, enable);
- break;
+ case AccessibleStateType::FOCUSED:
+ FireStateFocusedChange(enable);
+ break;
+ default:
+ FireStatePropertyChange(state, enable);
+ break;
}
}
@@ -166,7 +165,7 @@ void AccEventListener::SetComponentState(short state, bool
enable )
*/
void AccEventListener::FireStateFocusedChange(bool enable)
{
- if(enable)
+ if (enable)
{
pAgent->IncreaseState(m_xAccessible.get(),
AccessibleStateType::FOCUSED);
pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, m_xAccessible.get());
@@ -177,15 +176,14 @@ void AccEventListener::FireStateFocusedChange(bool enable)
}
}
-
/**
* fire the MSAA state changed event
* @param state the state id
* @param set true if state is set, false if state is unset
*/
-void AccEventListener::FireStatePropertyChange(short /*state*/, bool set )
+void AccEventListener::FireStatePropertyChange(short /*state*/, bool set)
{
- if( set )
+ if (set)
{
//get new state
}
@@ -200,9 +198,9 @@ void AccEventListener::FireStatePropertyChange(short
/*state*/, bool set )
*/
short AccEventListener::GetRole()
{
- css::uno::Reference<css::accessibility::XAccessibleContext> const
- xContext(m_xAccessible->getAccessibleContext());
- if(xContext.is())
+ css::uno::Reference<css::accessibility::XAccessibleContext> const xContext(
+ m_xAccessible->getAccessibleContext());
+ if (xContext.is())
{
return xContext->getAccessibleRole();
}
@@ -234,7 +232,7 @@ void AccEventListener::RemoveMeFromBroadcaster()
try
{
css::uno::Reference<XAccessibleEventBroadcaster> const
xBroadcaster(
- m_xAccessible->getAccessibleContext(), UNO_QUERY);
+ m_xAccessible->getAccessibleContext(), UNO_QUERY);
if (xBroadcaster.is())
{
//remove the lister from accessible object
@@ -242,22 +240,21 @@ void AccEventListener::RemoveMeFromBroadcaster()
}
}
catch (Exception const&)
- { // may throw if it's already disposed - ignore that
+ { // may throw if it's already disposed - ignore that
}
pAgent->NotifyDestroy(m_xAccessible.get());
m_xAccessible.clear(); // release cyclic reference
}
- catch(...)
+ catch (...)
{
return;
}
-
}
/**
* this method is invoked before listener is disposed
*/
-void AccEventListener::disposing( const css::lang::EventObject& /*Source*/ )
+void AccEventListener::disposing(const css::lang::EventObject& /*Source*/)
{
SolarMutexGuard g;
diff --git
a/winaccessibility/source/service/AccObjectContainerEventListener.cxx
b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
index ccda6df4e57f..dc99d3394c4a 100644
--- a/winaccessibility/source/service/AccObjectContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
@@ -19,7 +19,6 @@
// AccObjectContainerEventListener.cpp: implementation of the
AccContainerEventListener class.
-
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -33,12 +32,12 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility;
-AccObjectContainerEventListener::AccObjectContainerEventListener(css::accessibility::XAccessible*
pAcc, AccObjectManagerAgent* Agent)
- :AccContainerEventListener(pAcc, Agent)
-{}
-AccObjectContainerEventListener::~AccObjectContainerEventListener()
+AccObjectContainerEventListener::AccObjectContainerEventListener(
+ css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+ : AccContainerEventListener(pAcc, Agent)
{
}
+AccObjectContainerEventListener::~AccObjectContainerEventListener() {}
/**
* handle the STATE_CHANGED event
@@ -48,7 +47,7 @@ void
AccObjectContainerEventListener::HandleStateChangedEvent(Any oldValue, Any
//set the accessible name before process for there is no NAME_CHANGED
event when change
//the text in drawing objects.
short newV;
- if( newValue >>= newV)
+ if (newValue >>= newV)
{
if (newV == AccessibleStateType::FOCUSED)
{
diff --git a/winaccessibility/source/service/ResIDGenerator.cxx
b/winaccessibility/source/service/ResIDGenerator.cxx
index fafb236c77ab..6c88a12a402c 100644
--- a/winaccessibility/source/service/ResIDGenerator.cxx
+++ b/winaccessibility/source/service/ResIDGenerator.cxx
@@ -21,9 +21,7 @@
#include <cassert>
-ResIDGenerator::~ResIDGenerator()
-{
-}
+ResIDGenerator::~ResIDGenerator() {}
/**
* SubList stores those IDs that were ever generated and deleted, the method
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
