mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#123936 Formatting files in module winaccessibility with clang-format

Browse Source 
Change-Id: I9d5b9697cb241b306d0614fb563feb5594c19887
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105729
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer 2020-11-12 13:27:36 +01:00 committed by Christian Lohmaier
parent b9e9ac51a7
commit 65717f77c4
30 changed files with 267 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
solenv/clang-format/excludelist
View File

@ -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

13
winaccessibility/inc/AccComponentEventListener.hxx
View File

@ -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,
@ -42,22 +41,20 @@ public:
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;

7
winaccessibility/inc/AccDialogEventListener.hxx
View File

@ -38,15 +38,14 @@ public:
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

11
winaccessibility/inc/AccEventListener.hxx
View File

@ -32,15 +32,14 @@ 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);
virtual ~AccEventListener() override;
@ -49,7 +48,8 @@ public:
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);

8
winaccessibility/inc/AccFrameEventListener.hxx
View File

@ -25,7 +25,6 @@
#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.
@ -39,15 +38,14 @@ public:
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

10
winaccessibility/inc/AccListEventListener.hxx
View File

@ -25,7 +25,6 @@
#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.
@ -39,14 +38,13 @@ public:
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

7
winaccessibility/inc/AccMenuEventListener.hxx
View File

@ -25,7 +25,6 @@
#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
@ -39,11 +38,11 @@ public:
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();

7
winaccessibility/inc/AccParagraphEventListener.hxx
View File

@ -25,7 +25,6 @@
#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.
@ -39,11 +38,11 @@ public:
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;

8
winaccessibility/inc/AccTableEventListener.hxx
View File

@ -25,7 +25,6 @@
#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.
@ -39,14 +38,13 @@ public:
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

5
winaccessibility/inc/AccTextComponentEventListener.hxx
View File

@ -25,7 +25,6 @@
#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
@ -35,11 +34,11 @@
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

7
winaccessibility/inc/AccTopWindowListener.hxx
View File

@ -35,11 +35,11 @@
* 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;
@ -56,7 +56,8 @@ public:
// XEventListener
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);

7
winaccessibility/inc/AccTreeEventListener.hxx
View File

@ -25,7 +25,6 @@
#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.
@ -39,11 +38,11 @@ public:
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

8
winaccessibility/inc/AccWindowEventListener.hxx
View File

@ -25,7 +25,6 @@
#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.
@ -39,15 +38,14 @@ public:
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

12
winaccessibility/inc/ResIDGenerator.hxx
View File

@ -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

8
winaccessibility/source/UAccCOM/AccActionBase.h
View File

@ -55,7 +55,8 @@ public:
// 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,
@ -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

3
winaccessibility/source/UAccCOM/AccComponent.cxx
View File

@ -40,7 +40,6 @@
*/
COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_locationInParent(long* x, long* y)
{
return CAccComponentBase::get_locationInParent(x, y);
}
@ -51,7 +50,6 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_locationInParent(long *x, l
*/
COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_foreground(IA2Color* foreground)
{
return CAccComponentBase::get_foreground(foreground);
}
@ -62,7 +60,6 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_foreground(IA2Color * foreg
*/
COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponent::get_background(IA2Color* background)
{
return CAccComponentBase::get_background(background);
}

10
winaccessibility/source/UAccCOM/AccComponentBase.cxx
View File

@ -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
@ -90,7 +85,6 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccComponentBase::get_locationOnScreen(long *
*x = pt.X;
*y = pt.Y;
return S_OK;
}
catch (...)
{

6
winaccessibility/source/UAccCOM/AccComponentBase.h
View File

@ -56,13 +56,9 @@ public:
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

24
winaccessibility/source/UAccCOM/AccTextBase.h
View File

@ -40,7 +40,8 @@ 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);
@ -50,7 +51,8 @@ public:
// 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);
@ -66,13 +68,16 @@ public:
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);
@ -94,19 +99,16 @@ public:
// 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(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

3
winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
View File

@ -20,7 +20,8 @@
#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
struct ACCESSIBLE_KEYSTROKE {
struct ACCESSIBLE_KEYSTROKE
{
short modifiers;
short keyCode;
char keyChar;

12
winaccessibility/source/UAccCOM/UAccCOM.cxx
View File

@ -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)
{
@ -96,14 +94,9 @@ extern "C"
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,7 +105,6 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
return _Module.GetClassObject(rclsid, riid, ppv);
}
IMAccessible* UAccCOMCreateInstance()
{
IMAccessible* pIMA = nullptr;

6
winaccessibility/source/UAccCOM/UNOXWrapper.cxx
View File

@ -31,7 +31,6 @@
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: */

6
winaccessibility/source/UAccCOM/UNOXWrapper.h
View File

@ -42,8 +42,10 @@ protected:
css::accessibility::XAccessible* pUNOInterface;
public:
CUNOXWrapper() : pUNOInterface(nullptr)
{ }
CUNOXWrapper()
: pUNOInterface(nullptr)
{
}
// IUNOXWrapper
STDMETHOD(put_XInterface)(hyper pXInterface) override;

11
winaccessibility/source/service/AccEventListener.cxx
View File

@ -46,12 +46,11 @@ 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
@ -177,7 +176,6 @@ void AccEventListener::FireStateFocusedChange(bool enable)
}
}
/**
* fire the MSAA state changed event
* @param state the state id
@ -200,8 +198,8 @@ void AccEventListener::FireStatePropertyChange(short /*state*/, bool set )
*/
short AccEventListener::GetRole()
{
css::uno::Reference<css::accessibility::XAccessibleContext> const
xContext(m_xAccessible->getAccessibleContext());
css::uno::Reference<css::accessibility::XAccessibleContext> const xContext(
m_xAccessible->getAccessibleContext());
if (xContext.is())
{
return xContext->getAccessibleRole();
@ -251,7 +249,6 @@ void AccEventListener::RemoveMeFromBroadcaster()
{
return;
}
}
/**

7
winaccessibility/source/service/AccObjectContainerEventListener.cxx
View File

@ -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)
AccObjectContainerEventListener::AccObjectContainerEventListener(
css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
: AccContainerEventListener(pAcc, Agent)
{}
AccObjectContainerEventListener::~AccObjectContainerEventListener()
{
}
AccObjectContainerEventListener::~AccObjectContainerEventListener() {}
/**
* handle the STATE_CHANGED event

4
winaccessibility/source/service/ResIDGenerator.cxx
View File

@ -21,9 +21,7 @@
#include <cassert>
ResIDGenerator::~ResIDGenerator()
{
}
ResIDGenerator::~ResIDGenerator() {}
/**
* SubList stores those IDs that were ever generated and deleted, the method