[Libreoffice-commits] core.git: 10 commits - offapi/com winaccessibility/inc winaccessibility/source
Michael Stahl
mstahl at redhat.com
Tue Nov 19 16:41:26 PST 2013
offapi/com/sun/star/accessibility/XMSAAService.idl | 4
winaccessibility/inc/AccComponentEventListener.hxx | 32 +-
winaccessibility/inc/AccContainerEventListener.hxx | 62 ++---
winaccessibility/inc/AccDescendantManagerEventListener.hxx | 24 +-
winaccessibility/inc/AccDialogEventListener.hxx | 15 -
winaccessibility/inc/AccEventListener.hxx | 36 +--
winaccessibility/inc/AccFrameEventListener.hxx | 16 -
winaccessibility/inc/AccListEventListener.hxx | 10
winaccessibility/inc/AccMenuEventListener.hxx | 8
winaccessibility/inc/AccObject.hxx | 2
winaccessibility/inc/AccObjectContainerEventListener.hxx | 8
winaccessibility/inc/AccObjectWinManager.hxx | 38 ---
winaccessibility/inc/AccParagraphEventListener.hxx | 14 -
winaccessibility/inc/AccTableEventListener.hxx | 9
winaccessibility/inc/AccTextComponentEventListener.hxx | 3
winaccessibility/inc/AccTopWindowListener.hxx | 7
winaccessibility/inc/AccTreeEventListener.hxx | 7
winaccessibility/inc/AccWindowEventListener.hxx | 15 -
winaccessibility/inc/UAccCOM2.h | 30 --
winaccessibility/inc/accHelper.hxx | 109 ---------
winaccessibility/inc/act.hxx | 19 -
winaccessibility/inc/g_msacc.hxx | 4
winaccessibility/source/UAccCOM/AccAction.cxx | 2
winaccessibility/source/UAccCOM/AccComponent.cxx | 2
winaccessibility/source/UAccCOM/AccComponent.h | 2
winaccessibility/source/UAccCOM/AccEditableText.cxx | 2
winaccessibility/source/UAccCOM/AccHyperLink.cxx | 2
winaccessibility/source/UAccCOM/AccHypertext.cxx | 2
winaccessibility/source/UAccCOM/AccImage.cxx | 2
winaccessibility/source/UAccCOM/AccRelation.cxx | 2
winaccessibility/source/UAccCOM/AccTable.cxx | 2
winaccessibility/source/UAccCOM/AccText.cxx | 2
winaccessibility/source/UAccCOM/AccValue.cxx | 2
winaccessibility/source/UAccCOM/EnumVariant.cxx | 6
winaccessibility/source/UAccCOM/EnumVariant.h | 13 -
winaccessibility/source/UAccCOM/MAccessible.cxx | 4
winaccessibility/source/UAccCOM/MAccessible.h | 44 ++-
winaccessibility/source/UAccCOM/UAccCOM.cxx | 2
winaccessibility/source/UAccCOM/UNOXWrapper.cxx | 2
winaccessibility/source/UAccCOM/UNOXWrapper.h | 2
winaccessibility/source/UAccCOM/acccommon.h | 5
winaccessibility/source/service/AccComponentEventListener.cxx | 70 ++----
winaccessibility/source/service/AccContainerEventListener.cxx | 113 ++++------
winaccessibility/source/service/AccDescendantManagerEventListener.cxx | 29 +-
winaccessibility/source/service/AccDialogEventListener.cxx | 30 --
winaccessibility/source/service/AccEventListener.cxx | 45 ++-
winaccessibility/source/service/AccFrameEventListener.cxx | 30 --
winaccessibility/source/service/AccListEventListener.cxx | 14 -
winaccessibility/source/service/AccMenuEventListener.cxx | 18 -
winaccessibility/source/service/AccObject.cxx | 91 ++++++++
winaccessibility/source/service/AccObjectContainerEventListener.cxx | 8
winaccessibility/source/service/AccObjectManagerAgent.cxx | 2
winaccessibility/source/service/AccObjectWinManager.cxx | 28 +-
winaccessibility/source/service/AccParagraphEventListener.cxx | 36 +--
winaccessibility/source/service/AccTableEventListener.cxx | 12 -
winaccessibility/source/service/AccTextComponentEventListener.cxx | 6
winaccessibility/source/service/AccTopWindowListener.cxx | 13 -
winaccessibility/source/service/AccTreeEventListener.cxx | 8
winaccessibility/source/service/AccWindowEventListener.cxx | 30 --
winaccessibility/source/service/checkmt.cxx | 5
winaccessibility/source/service/checkmt.hxx | 2
winaccessibility/source/service/msaaservice_impl.cxx | 17 +
62 files changed, 516 insertions(+), 663 deletions(-)
New commits:
commit 4757ed435519b660d6e7922006a630f23bfedd5d
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 20 01:29:56 2013 +0100
winaccessibility: XMSAAService could only work on 32-bit
... so replace all long with hyper to fit in 64-bit pointers.
Change-Id: Ia5c044e8d7cc8c4e55f1ef8c0fb0f91bb9a69e1c
diff --git a/offapi/com/sun/star/accessibility/XMSAAService.idl b/offapi/com/sun/star/accessibility/XMSAAService.idl
old mode 100755
new mode 100644
index 54c12d3..3b9773e
--- a/offapi/com/sun/star/accessibility/XMSAAService.idl
+++ b/offapi/com/sun/star/accessibility/XMSAAService.idl
@@ -39,9 +39,9 @@ interface XMSAAService : ::com::sun::star::uno::XInterface
@see AccessibleContext
*/
- long getAccObjectPtr ([in] long hWnd, [in] long lParam, [in] long wParam);
+ hyper getAccObjectPtr([in] hyper hWnd, [in] hyper lParam, [in] hyper wParam);
- void handleWindowOpened ([in] long i);
+ void handleWindowOpened([in] hyper i);
};
}; }; }; };
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 046e83e..2b20558 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -103,7 +103,7 @@ public:
sal_Bool NotifyAccEvent( com::sun::star::accessibility::XAccessible* pXAcc,short state = 0 );
- long Get_ToATInterface( HWND hWnd, long lParam, long wParam);
+ LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
void DecreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
void IncreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
diff --git a/winaccessibility/inc/g_msacc.hxx b/winaccessibility/inc/g_msacc.hxx
index d700249..9f851bf 100644
--- a/winaccessibility/inc/g_msacc.hxx
+++ b/winaccessibility/inc/g_msacc.hxx
@@ -21,8 +21,8 @@
#define __G_MSACC_HXX
extern void FreeTopWindowListener();
-extern void handleWindowOpened_impl( long pAcc );
-extern long GetMSComPtr( long hWnd, long lParam, long wParam );
+extern void handleWindowOpened_impl(sal_Int64 pAcc);
+extern sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
extern AccTopWindowListener* g_pTop;
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index 0a84c38..88d31a8 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -63,11 +63,12 @@ AccObjectWinManager* AccObjectWinManager::me = NULL;
* @param
* @return Com interface.
*/
-long GetMSComPtr(long hWnd, long lParam, long wParam)
+sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
{
- if( g_acc_manager )
- return (long)g_acc_manager->Get_ToATInterface(HWND((void*)hWnd),lParam,wParam );
- return NULL;
+ if (!g_acc_manager)
+ return 0;
+ return static_cast<sal_Int64>(g_acc_manager->Get_ToATInterface(
+ static_cast<HWND>(reinterpret_cast<void*>(hWnd)), lParam, wParam));
}
/**
@@ -132,7 +133,8 @@ AccObjectWinManager::~AccObjectWinManager()
* @return Com interface with event.
*/
-long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam)
+LRESULT
+AccObjectWinManager::Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam)
{
IMAccessible* pRetIMAcc = NULL;
@@ -150,7 +152,7 @@ long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam
if ( pRetIMAcc && lParam == OBJID_CLIENT )
{
IAccessible* pTemp = dynamic_cast<IAccessible*>( pRetIMAcc );
- HRESULT result = LresultFromObject(IID_IAccessible, wParam, pTemp);
+ LRESULT result = LresultFromObject(IID_IAccessible, wParam, pTemp);
pTemp->Release();
return result;
}
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index 87b4b9f..7900bf6 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -59,10 +59,12 @@ void FreeTopWindowListener()
/**
* As a global method to invoke the handleWindowOpened() method
*/
-void handleWindowOpened_impl(long pAcc)
+void handleWindowOpened_impl(sal_Int64 pAcc)
{
if( g_pTop && pAcc != 0 )
- g_pTop->HandleWindowOpened( (com::sun::star::accessibility::XAccessible*)((void*)pAcc) );
+ g_pTop->HandleWindowOpened(
+ static_cast<com::sun::star::accessibility::XAccessible*>(
+ reinterpret_cast<void*>(pAcc)));
}
/**
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index 6b27c9a..b68efde 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -80,8 +80,9 @@ public:
virtual void SAL_CALL removeEventListener( const ::css::uno::Reference< ::css::lang::XEventListener >& ) { /* dummy */ }
// XMSAAService
- virtual sal_Int32 SAL_CALL getAccObjectPtr (long hWnd, long lParam, long wParam);
- virtual void SAL_CALL handleWindowOpened(sal_Int32);
+ virtual sal_Int64 SAL_CALL getAccObjectPtr(
+ sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
+ virtual void SAL_CALL handleWindowOpened(sal_Int64);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName();
@@ -112,7 +113,9 @@ void MSAAServiceImpl::initialize( Sequence< Any > const & args ) throw (Exceptio
* @param
* @return Com interface.
*/
-sal_Int32 MSAAServiceImpl::getAccObjectPtr ( long hWnd, long lParam, long wParam) throw (RuntimeException)
+sal_Int64 MSAAServiceImpl::getAccObjectPtr(
+ sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
+throw (RuntimeException)
{
SolarMutexGuard g;
@@ -125,7 +128,7 @@ sal_Int32 MSAAServiceImpl::getAccObjectPtr ( long hWnd, long lParam, long wParam
* @param
* @return
*/
-void MSAAServiceImpl::handleWindowOpened( sal_Int32 nAcc)
+void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
{
SolarMutexGuard g;
commit 3e1c7d12eeefdfc50b842fe34f3db657292359b9
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 19 20:12:23 2013 +0100
winaccessibility: replace mysterious and inexplicable locking strategy
Do the conservative thing and lock the SolarMutex at every UNO API entry
point.
Change-Id: I51afffada975df7ee3435784aa050a2c19cd0ac8
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index ec90022..a32ab46 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -45,7 +45,6 @@ protected:
AccObjectManagerAgent* pAgent;
//disposed state indicator
bool m_isDisposed;
- mutable ::osl::Mutex aRemoveMutex;
public:
AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccEventListener();
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 6d43fdd..046e83e 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -72,9 +72,6 @@ private:
AccObjectManagerAgent* pAgent;
static AccObjectWinManager* me;
ResIDGenerator ResIdGen;
- mutable ::osl::Mutex aDeleteMutex;
- mutable ::osl::Mutex aNotifyMutex;
- mutable ::osl::Mutex maATInterfaceMutex;
AccObjectWinManager(AccObjectManagerAgent* Agent=NULL);
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 5856f6c..0374572 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccComponentEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -47,6 +49,8 @@ AccComponentEventListener::~AccComponentEventListener()
void AccComponentEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::VALUE_CHANGED:
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index 05688bc..8cb93c4 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccContainerEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -47,6 +49,8 @@ AccContainerEventListener::~AccContainerEventListener()
void AccContainerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
short role = GetRole();
switch (aEvent.EventId)
{
diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index f04dc3b..6db2bc0 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccDescendantManagerEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -47,6 +49,8 @@ AccDescendantManagerEventListener::~AccDescendantManagerEventListener()
void AccDescendantManagerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::SELECTION_CHANGED:
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index 07e3e3e..e0d9a5b 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccDialogEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -44,6 +46,8 @@ AccDialogEventListener::~AccDialogEventListener()
void AccDialogEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index 54c4f87..5a3c687 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -20,6 +20,9 @@
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+#include <vcl/svapp.hxx>
+
#include <toolkit/awt/Vclxwindow.hxx>
#ifndef _SV_SYSDATA_HXX
@@ -63,6 +66,7 @@ AccEventListener::~AccEventListener()
void AccEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
switch (aEvent.EventId)
{
@@ -230,7 +234,6 @@ void AccEventListener::RemoveMeFromBroadcaster()
{
try
{
- osl::MutexGuard aGuard(aRemoveMutex);
if(m_isDisposed)
return;
//get accessible context
@@ -276,6 +279,8 @@ void AccEventListener::RemoveMeFromBroadcaster()
void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
RemoveMeFromBroadcaster();
}
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 4c9a687..c9ef5a8 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccFrameEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -50,6 +52,8 @@ AccFrameEventListener::~AccFrameEventListener()
void AccFrameEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx
index ac8c540..aa3a0a1 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccListEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -46,6 +48,8 @@ AccListEventListener::~AccListEventListener()
*/
void AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx
index 2cf99ea..36a96e5 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccMenuEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -44,6 +46,8 @@ AccMenuEventListener::~AccMenuEventListener()
void AccMenuEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index 8b5e1ec..0a84c38 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -134,8 +134,6 @@ AccObjectWinManager::~AccObjectWinManager()
long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam)
{
- osl::MutexGuard localGuard(maATInterfaceMutex);//
-
IMAccessible* pRetIMAcc = NULL;
if(lParam == OBJID_CLIENT )
@@ -216,7 +214,8 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd)
*/
sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state)
{
- osl::MutexGuard aGuard(aNotifyMutex);
+ // no idea why this checks for main thread but with this check no mutex
+ // is needed here (the test only accesses Application const member)
if (!IsInMainThread())
{
@@ -564,7 +563,6 @@ void AccObjectWinManager::DeleteFromHwndXAcc(XAccessible* pXAcc )
*/
void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
{
- osl::MutexGuard aGuard( aDeleteMutex );
AccObject* currentObj=NULL;
AccObject* childObj=NULL;
XAccessible* pTmpXAcc=NULL;
@@ -593,7 +591,6 @@ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
*/
void AccObjectWinManager::DeleteAccObj( XAccessible* pXAcc )
{
- osl::MutexGuard aGuard( aDeleteMutex );
if( pXAcc == NULL )
return;
XIdToAccObjHash::iterator temp = XIdAccList.find(pXAcc);
diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx b/winaccessibility/source/service/AccParagraphEventListener.cxx
index b594c0d..d3b0b39 100644
--- a/winaccessibility/source/service/AccParagraphEventListener.cxx
+++ b/winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccParagraphEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -44,6 +46,8 @@ AccParagraphEventListener::~AccParagraphEventListener()
void AccParagraphEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::CARET_CHANGED:
diff --git a/winaccessibility/source/service/AccTableEventListener.cxx b/winaccessibility/source/service/AccTableEventListener.cxx
index 1985772..64ba8ca 100644
--- a/winaccessibility/source/service/AccTableEventListener.cxx
+++ b/winaccessibility/source/service/AccTableEventListener.cxx
@@ -24,6 +24,8 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccTableEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -45,6 +47,8 @@ AccTableEventListener::~AccTableEventListener()
void AccTableEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
diff --git a/winaccessibility/source/service/AccTextComponentEventListener.cxx b/winaccessibility/source/service/AccTextComponentEventListener.cxx
index 9250355..775c31f 100644
--- a/winaccessibility/source/service/AccTextComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccTextComponentEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccTextComponentEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index c812ea9..87b4b9f 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -24,6 +24,7 @@
#include <toolkit/awt/Vclxwindow.hxx>
#include <vcl/sysdata.hxx>
+#include <vcl/svapp.hxx>
#include "AccTopWindowListener.hxx"
#include "unomsaaevent.hxx"
@@ -141,6 +142,8 @@ void AccTopWindowListener::windowOpened( const ::com::sun::star::lang::EventObje
if ( !pAccessible )
return;
+ SolarMutexGuard g;
+
HandleWindowOpened( pAccessible );
}
diff --git a/winaccessibility/source/service/AccTreeEventListener.cxx b/winaccessibility/source/service/AccTreeEventListener.cxx
index 2339f21..6a66356 100644
--- a/winaccessibility/source/service/AccTreeEventListener.cxx
+++ b/winaccessibility/source/service/AccTreeEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccTreeEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -43,6 +45,8 @@ AccTreeEventListener::~AccTreeEventListener()
*/
void AccTreeEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
diff --git a/winaccessibility/source/service/AccWindowEventListener.cxx b/winaccessibility/source/service/AccWindowEventListener.cxx
index e6301dfc..5191990 100644
--- a/winaccessibility/source/service/AccWindowEventListener.cxx
+++ b/winaccessibility/source/service/AccWindowEventListener.cxx
@@ -23,6 +23,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <vcl/svapp.hxx>
+
#include "AccWindowEventListener.hxx"
#include "AccObjectManagerAgent.hxx"
#include "unomsaaevent.hxx"
@@ -43,6 +45,8 @@ AccWindowEventListener::~AccWindowEventListener()
*/
void AccWindowEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
{
+ SolarMutexGuard g;
+
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
diff --git a/winaccessibility/source/service/checkmt.cxx b/winaccessibility/source/service/checkmt.cxx
index ad0f2b7..96535c3 100644
--- a/winaccessibility/source/service/checkmt.cxx
+++ b/winaccessibility/source/service/checkmt.cxx
@@ -28,9 +28,4 @@ bool IsInMainThread()
return false;
}
-comphelper::SolarMutex& GetSolarMutex()
-{
- return Application::GetSolarMutex();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/checkmt.hxx b/winaccessibility/source/service/checkmt.hxx
index bc5b757..2c3a6d4 100644
--- a/winaccessibility/source/service/checkmt.hxx
+++ b/winaccessibility/source/service/checkmt.hxx
@@ -23,6 +23,4 @@
bool IsInMainThread();
-comphelper::SolarMutex& GetSolarMutex();
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index f5bf0fc..6b27c9a 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -114,6 +114,8 @@ void MSAAServiceImpl::initialize( Sequence< Any > const & args ) throw (Exceptio
*/
sal_Int32 MSAAServiceImpl::getAccObjectPtr ( long hWnd, long lParam, long wParam) throw (RuntimeException)
{
+ SolarMutexGuard g;
+
return GetMSComPtr( hWnd, lParam, wParam );
}
@@ -125,6 +127,8 @@ sal_Int32 MSAAServiceImpl::getAccObjectPtr ( long hWnd, long lParam, long wParam
*/
void MSAAServiceImpl::handleWindowOpened( sal_Int32 nAcc)
{
+ SolarMutexGuard g;
+
SAL_INFO( "iacc2", "Window opened " << nAcc );
handleWindowOpened_impl( nAcc );
}
@@ -308,6 +312,8 @@ MSAAServiceImpl::~MSAAServiceImpl()
void MSAAServiceImpl::dispose()
{
+ SolarMutexGuard g;
+
// As all folders and streams contain references to their parents,
// we must remove these references so that they will be deleted when
// the hash_map of the root folder is cleared, releasing all subfolders
commit ed750424f7c02b0ae868f33731f90885a4946f47
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 20 00:22:42 2013 +0100
winaccessibility: remove some pointless overrides
Change-Id: I9a215d71bfeec9feed9d7f27fb1a47d36c827ef0
diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index e52fbac..6cfb317 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -59,12 +59,6 @@ public:
virtual void HandleCaretChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- //for visible data changed event
- virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
-
- //for bound rect changed event
- virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
-
virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE;
virtual void FireStateFocusedChange(bool enable) SAL_OVERRIDE;
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index 2f59d6c..5cc4eb6 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -61,12 +61,6 @@ public:
virtual void HandleStateChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
- //for visible data changed event
- virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
-
- //for bound rect changed event
- virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
-
//for value changed event
virtual void HandleValueChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index 2c7c137..cdf7d14 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -44,12 +44,6 @@ public:
virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- //for visible data changed event
- virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
-
- //for bound rect changed event
- virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
-
//state changed
virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index a47310e..bd51e01 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -45,12 +45,6 @@ public:
virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- //for visible data changed event
- virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
-
- //for bound rect changed event
- virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
-
//state changed
virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index 015f177..4b5c5d2d 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -45,12 +45,6 @@ public:
virtual void HandleCaretChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- //for visible data changed event
- virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
-
- //for bound rect changed event
- virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
-
virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
//add TEXT_SELECTION_CHANGED event
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index 9a88030..ca17cb1 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -45,12 +45,6 @@ public:
virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- //for visible data changed event
- virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
-
- //for bound rect changed event
- virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
-
//state changed
virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 2939bf4..5856f6c 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -126,22 +126,6 @@ void AccComponentEventListener::HandleCaretChangedEvent(Any oldValue, Any newVal
}
/**
- * handle the VISIBLE_DATA_CHANGED event
- */
-void AccComponentEventListener::HandleVisibleDataChangedEvent()
-{
- AccEventListener::HandleVisibleDataChangedEvent();
-}
-
-/**
- * handle the BOUNDRECT_CHANGED event
- */
-void AccComponentEventListener::HandleBoundrectChangedEvent()
-{
- AccEventListener::HandleBoundrectChangedEvent();
-}
-
-/**
* set the new state and fire the MSAA event
*
* @param state new state id
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index 5f28b81..05688bc 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -97,22 +97,6 @@ throw (::com::sun::star::uno::RuntimeException)
}
}
-/**
- * handle the VISIBLE_DATA_CHANGED event
- */
-void AccContainerEventListener::HandleVisibleDataChangedEvent()
-{
- AccEventListener::HandleVisibleDataChangedEvent();
-}
-
-/**
- * handle the BOUNDRECT_CHANGED event
- */
-void AccContainerEventListener::HandleBoundrectChangedEvent()
-{
- AccEventListener::HandleBoundrectChangedEvent();
-}
-
void AccContainerEventListener::HandleStateChangedEvent(Any oldValue, Any newValue)
{
short State;
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index 849f5bd..07e3e3e 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -62,22 +62,6 @@ throw (::com::sun::star::uno::RuntimeException)
}
/**
- * handle the VISIBLE_DATA_CHANGED event
- */
-void AccDialogEventListener::HandleVisibleDataChangedEvent()
-{
- AccEventListener::HandleVisibleDataChangedEvent();
-}
-
-/**
- * handle the BOUNDRECT_CHANGED event
- */
-void AccDialogEventListener::HandleBoundrectChangedEvent()
-{
- AccEventListener::HandleBoundrectChangedEvent();
-}
-
-/**
* handle the CHILD event
* @param oldValue the child to be deleted
* @param newValue the child to be added
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 32974b7..4c9a687 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -68,22 +68,6 @@ throw (::com::sun::star::uno::RuntimeException)
}
/**
- * handle the VISIBLE_DATA_CHANGED event
- */
-void AccFrameEventListener::HandleVisibleDataChangedEvent()
-{
- AccEventListener::HandleVisibleDataChangedEvent();
-}
-
-/**
- * handle the BOUNDRECT_CHANGED event
- */
-void AccFrameEventListener::HandleBoundrectChangedEvent()
-{
- AccEventListener::HandleBoundrectChangedEvent();
-}
-
-/**
* handle the CHILD event
* @param oldValue the child to be deleted
* @param newValue the child to be added
diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx b/winaccessibility/source/service/AccParagraphEventListener.cxx
index a423557..b594c0d 100644
--- a/winaccessibility/source/service/AccParagraphEventListener.cxx
+++ b/winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -96,22 +96,6 @@ void AccParagraphEventListener::HandleCaretChangedEvent(Any oldValue, Any newVal
}
/**
- * handle the VISIBLE_DATA_CHANGED event
- */
-void AccParagraphEventListener::HandleVisibleDataChangedEvent()
-{
- AccEventListener::HandleVisibleDataChangedEvent();
-}
-
-/**
- * handle the BOUNDRECT_CHANGED event
- */
-void AccParagraphEventListener::HandleBoundrectChangedEvent()
-{
- AccEventListener::HandleBoundrectChangedEvent();
-}
-
-/**
* set the new state and fire the MSAA event
* @param state new state id
* @param enable true if state is set, false if state is unset
diff --git a/winaccessibility/source/service/AccWindowEventListener.cxx b/winaccessibility/source/service/AccWindowEventListener.cxx
index 1385f70..e6301dfc 100644
--- a/winaccessibility/source/service/AccWindowEventListener.cxx
+++ b/winaccessibility/source/service/AccWindowEventListener.cxx
@@ -61,22 +61,6 @@ void AccWindowEventListener::notifyEvent( const ::com::sun::star::accessibility
}
/**
- * handle the VISIBLE_DATA_CHANGED event
- */
-void AccWindowEventListener::HandleVisibleDataChangedEvent()
-{
- AccEventListener::HandleVisibleDataChangedEvent();
-}
-
-/**
- * handle the BOUNDRECT_CHANGED event
- */
-void AccWindowEventListener::HandleBoundrectChangedEvent()
-{
- AccEventListener::HandleBoundrectChangedEvent();
-}
-
-/**
* handle the CHILD event
* @param oldValue the child to be deleted
* @param newValue the child to be added
commit 2fb80b6d30a6e5c6cd554c5c5cee2215c81a4b06
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 20 00:13:07 2013 +0100
winaccessibility: make listener methods a bit more obvious
- disambiguate overloading
- only use SAL_CALL for UNO methods, and non-UNO methods start uppercase
- use SAL_OVERRIDE
Change-Id: Ib57adad65b2b8e8246b103ff77ce162b0b540422
diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index 05ecc12..e52fbac 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -41,39 +41,38 @@ public:
AccComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccComponentEventListener();
- //AccessibleEventListener
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for value changed event
- virtual void SAL_CALL handleValueChangedEvent(
+ virtual void HandleValueChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for action changed event
- virtual void SAL_CALL handleActionChangedEvent();
+ virtual void HandleActionChangedEvent();
//for text changed event
- virtual void SAL_CALL handleTextChangedEvent(
+ virtual void HandleTextChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for caret changed event
- virtual void SAL_CALL handleCaretChangedEvent(
+ virtual void HandleCaretChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for visible data changed event
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
//for bound rect changed event
- virtual void SAL_CALL handleBoundrectChangedEvent();
+ virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
- virtual void SAL_CALL setComponentState(short state, bool enable);
- virtual void SAL_CALL fireStatePropertyChange(short state, bool set
- );
- virtual void SAL_CALL fireStateFocusdChange(bool enable);
+ virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
+ virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE;
+ virtual void FireStateFocusedChange(bool enable) SAL_OVERRIDE;
- void handleSelectionChangedEvent();
+ void HandleSelectionChangedEventNoArgs();
//add TEXT_SELECTION_CHANGED event
- void handleTextSelectionChangedEvent();
+ void HandleTextSelectionChangedEvent();
};
#endif
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index d7019dc..2f59d6c 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -45,63 +45,62 @@ public:
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for child changed event
- virtual void SAL_CALL handleChildChangedEvent(
+ virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for selection changed event
- virtual void SAL_CALL handleSelectionChangedEvent(
+ virtual void HandleSelectionChangedEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
//for all children changed event
- virtual void SAL_CALL handleAllChildrenChangedEvent();
+ virtual void HandleAllChildrenChangedEvent();
//for text changed event
- virtual void SAL_CALL handleTextChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
- virtual void SAL_CALL handleStateChangedEvent(
+ virtual void HandleTextChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleStateChangedEvent(
+ css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
//for visible data changed event
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
//for bound rect changed event
- virtual void SAL_CALL handleBoundrectChangedEvent();
+ virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
//for value changed event
- virtual void SAL_CALL handleValueChangedEvent(
+ virtual void HandleValueChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//state changed
- virtual void SAL_CALL setComponentState(short state, bool enable);
- virtual void SAL_CALL fireStatePropertyChange(short state, bool set
- );
- virtual void SAL_CALL fireStateFocusdChange(bool enable);
- virtual bool SAL_CALL IsEditable(
+ virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
+ virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE;
+ virtual void FireStateFocusedChange(bool enable) SAL_OVERRIDE;
+ virtual bool IsEditable(
css::uno::Reference<css::accessibility::XAccessibleContext> xContext);
// update all children's state
- void SAL_CALL UpdateAllChildrenState( com::sun::star::accessibility::XAccessible* pXAccessible );
+ void UpdateAllChildrenState(
+ com::sun::star::accessibility::XAccessible* pXAccessible);
bool NotifyChildEvent(short nWinEvent, const css::uno::Any &Value);
- virtual void handleSelectionChangedAddEvent(
+ virtual void HandleSelectionChangedAddEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- virtual void handleSelectionChangedRemoveEvent(
+ virtual void HandleSelectionChangedRemoveEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- virtual void handleSelectionChangedWithinEvent(
+ virtual void HandleSelectionChangedWithinEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- virtual void handlePageChangedEvent(
+ virtual void HandlePageChangedEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- virtual void handleSectionChangedEvent(
+ virtual void HandleSectionChangedEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- virtual void handleColumnChangedEvent(
+ virtual void HandleColumnChangedEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- //IAccessibility2 Implementation 2009-----
+
//for name changed event
- virtual void SAL_CALL handleNameChangedEvent(css::uno::Any name);
- //-----IAccessibility2 Implementation 2009
+ virtual void HandleNameChangedEvent(css::uno::Any name) SAL_OVERRIDE;
};
#endif
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index 240e4f7..bb5add6 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -39,27 +39,27 @@ public:
AccDescendantManagerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccDescendantManagerEventListener();
- //AccessibleEventListener
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for selection changed event
- virtual void SAL_CALL handleSelectionChangedEvent(
+ virtual void HandleSelectionChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for child changed event
- virtual void SAL_CALL handleChildChangedEvent(
+ virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- virtual void SAL_CALL handleChildChangedNoFocusEvent(
+ virtual void HandleChildChangedNoFocusEvent(
css::uno::Any oldValue, css::uno::Any newValue);
bool NotifyChildEvent(short nWinEvent,const css::uno::Any &Value);
- virtual void handleSelectionChangedAddEvent(
+ virtual void HandleSelectionChangedAddEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- virtual void handleSelectionChangedRemoveEvent(
+ virtual void HandleSelectionChangedRemoveEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
- virtual void handleSelectionChangedWithinEvent(
+ virtual void HandleSelectionChangedWithinEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
};
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index 47e3215..2c7c137 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -41,19 +41,17 @@ public:
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for child changed event
- virtual void SAL_CALL handleChildChangedEvent(
+ virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for visible data changed event
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
//for bound rect changed event
- virtual void SAL_CALL handleBoundrectChangedEvent();
+ virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
//state changed
- virtual void SAL_CALL setComponentState(short state, bool enable);
- //virtual void SAL_CALL fireStatePropertyChange(short state, bool set);
- //virtual void SAL_CALL fireStateFocusdChange(bool enable);
+ virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
};
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index 7447fe8..ec90022 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -50,37 +50,37 @@ public:
AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccEventListener();
- //AccessibleEventListener
+ // XEventListener
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for name changed event
- virtual void SAL_CALL handleNameChangedEvent(css::uno::Any name);
+ virtual void HandleNameChangedEvent(css::uno::Any name);
//for description changed event
- virtual void SAL_CALL handleDescriptionChangedEvent(css::uno::Any desc);
+ virtual void HandleDescriptionChangedEvent(css::uno::Any desc);
//for state changed event
- virtual void SAL_CALL handleStateChangedEvent(
+ virtual void HandleStateChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- virtual void SAL_CALL setComponentState(short state, bool enable);
- virtual void SAL_CALL fireStatePropertyChange(short state, bool set
- );
- virtual void SAL_CALL fireStateFocusdChange(bool enable);
+ virtual void SetComponentState(short state, bool enable);
+ virtual void FireStatePropertyChange(short state, bool set);
+ virtual void FireStateFocusedChange(bool enable);
//for bound rect changed event
- virtual void SAL_CALL handleBoundrectChangedEvent();
+ virtual void HandleBoundrectChangedEvent();
//for visible data changed event
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent();
- //for interface
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
//get the accessible role of pAccessible
- virtual short SAL_CALL getRole();
+ virtual short GetRole();
//get the accessible parent's role
- virtual short SAL_CALL getParentRole();
-public:
- void removeMeFromBroadcaster();
+ virtual short GetParentRole();
+
+ void RemoveMeFromBroadcaster();
};
#endif
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index d606edc..a47310e 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -38,23 +38,21 @@ public:
AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccFrameEventListener();
- //AccessibleEventListener
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for child changed event
- virtual void SAL_CALL handleChildChangedEvent(
+ virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for visible data changed event
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
//for bound rect changed event
- virtual void SAL_CALL handleBoundrectChangedEvent();
+ virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
//state changed
- virtual void SAL_CALL setComponentState(short state, bool enable);
- //virtual void SAL_CALL fireStatePropertyChange(short state, bool set);
- //virtual void SAL_CALL fireStateFocusdChange(bool enable);
+ virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
};
diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx
index 0addafd..bd70194 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -40,14 +40,15 @@ public:
AccListEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccListEventListener();
- //AccessibleEventListener
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+
//for active descendant changed event
- virtual void SAL_CALL handleActiveDescendantChangedEvent(
+ virtual void HandleActiveDescendantChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for value changed event
- virtual void SAL_CALL handleValueChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleValueChangedEvent(
+ css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
};
#endif
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx
index 662469e..5a4c6e5 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -42,14 +42,14 @@ public:
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for child changed event
- virtual void SAL_CALL handleChildChangedEvent(
+ virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for selection changed event
- virtual void SAL_CALL handleSelectionChangedEvent();
+ virtual void HandleSelectionChangedEventNoArgs();
//for state changed event
- virtual void SAL_CALL fireStatePropertyChange(short state, bool set );
+ virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE;
};
#endif
diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx
index 878f7c0..fd046cd 100644
--- a/winaccessibility/inc/AccObjectContainerEventListener.hxx
+++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx
@@ -38,11 +38,11 @@ public:
AccObjectContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccObjectContainerEventListener();
- //overwrite handleStateChangedEvent()
- virtual void SAL_CALL handleStateChangedEvent(
- css::uno::Any oldValue, css::uno::Any newValue);
+ virtual void HandleStateChangedEvent(
+ css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
+
//for visible data changed event, for shapes, the visiabledatachanged should be mapped to LOCATION_CHANGED
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
};
#endif
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index a7460c84..015f177 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -42,19 +42,19 @@ public:
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for caret changed event
- virtual void SAL_CALL handleCaretChangedEvent(
+ virtual void HandleCaretChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for visible data changed event
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
//for bound rect changed event
- virtual void SAL_CALL handleBoundrectChangedEvent();
+ virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
- virtual void SAL_CALL setComponentState(short state, bool enable);
+ virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
//add TEXT_SELECTION_CHANGED event
- void handleTextSelectionChangedEvent();
+ void HandleTextSelectionChangedEvent();
};
#endif
diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx
index d230867..7843819 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -38,13 +38,14 @@ public:
AccTableEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccTableEventListener();
- //AccessibleEventListener
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+
//for active descendant changed event
- virtual void SAL_CALL handleActiveDescendantChangedEvent(
+ virtual void HandleActiveDescendantChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
- void SAL_CALL handleTableModelChangeEvent(css::uno::Any newValue);
+ void HandleTableModelChangeEvent(css::uno::Any newValue);
};
diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx
index 064a736..1b111db 100644
--- a/winaccessibility/inc/AccTextComponentEventListener.hxx
+++ b/winaccessibility/inc/AccTextComponentEventListener.hxx
@@ -38,7 +38,7 @@ public:
AccTextComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccTextComponentEventListener();
- virtual void SAL_CALL setComponentState(short state, bool enable);
+ virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
};
diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx
index edf83b3..9babd67 100644
--- a/winaccessibility/inc/AccTopWindowListener.hxx
+++ b/winaccessibility/inc/AccTopWindowListener.hxx
@@ -43,6 +43,8 @@ private:
public:
AccTopWindowListener();
virtual ~AccTopWindowListener();
+
+ // XTopWindowListener
virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
@@ -50,10 +52,13 @@ public:
virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
+
+ // XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
virtual void AddAllListeners(com::sun::star::accessibility::XAccessible* pAccessible,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWND );
//for On-Demand load.
- virtual void handleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible );
+ virtual void HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible );
};
#endif
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx
index d0cc1eb..3b0dcaf 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -38,10 +38,11 @@ public:
AccTreeEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccTreeEventListener();
- //AccessibleEventListener
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+
//for active descendant changed event
- virtual void SAL_CALL handleActiveDescendantChangedEvent(
+ virtual void HandleActiveDescendantChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
};
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index d538c81..9a88030 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -38,21 +38,21 @@ public:
AccWindowEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccWindowEventListener();
- //AccessibleEventListener
+ // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//for child changed event
- virtual void SAL_CALL handleChildChangedEvent(
+ virtual void HandleChildChangedEvent(
css::uno::Any oldValue, css::uno::Any newValue);
//for visible data changed event
- virtual void SAL_CALL handleVisibleDataChangedEvent();
+ virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
//for bound rect changed event
- virtual void SAL_CALL handleBoundrectChangedEvent();
+ virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
//state changed
- virtual void SAL_CALL setComponentState(short state, bool enable);
+ virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
};
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index cca17eb..2939bf4 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -50,29 +50,29 @@ throw (::com::sun::star::uno::RuntimeException)
switch (aEvent.EventId)
{
case AccessibleEventId::VALUE_CHANGED:
- handleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::ACTION_CHANGED:
- handleActionChangedEvent();
+ HandleActionChangedEvent();
break;
case AccessibleEventId::TEXT_CHANGED:
- handleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::CARET_CHANGED:
- handleCaretChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleCaretChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::VISIBLE_DATA_CHANGED:
- handleVisibleDataChangedEvent();
+ HandleVisibleDataChangedEvent();
break;
case AccessibleEventId::BOUNDRECT_CHANGED:
- handleBoundrectChangedEvent();
+ HandleBoundrectChangedEvent();
break;
case AccessibleEventId::SELECTION_CHANGED:
- handleSelectionChangedEvent();
+ HandleSelectionChangedEventNoArgs();
break;
//to add TEXT_SELECTION_CHANGED event
case AccessibleEventId::TEXT_SELECTION_CHANGED:
- handleTextSelectionChangedEvent();
+ HandleTextSelectionChangedEvent();
break;
//End
default:
@@ -87,7 +87,7 @@ throw (::com::sun::star::uno::RuntimeException)
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccComponentEventListener::handleValueChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
{
pAgent->UpdateValue(pAccessible);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible);
@@ -96,7 +96,7 @@ void AccComponentEventListener::handleValueChangedEvent(Any oldValue, Any newVal
/**
* handle the NAME_CHANGED event
*/
-void AccComponentEventListener::handleActionChangedEvent()
+void AccComponentEventListener::HandleActionChangedEvent()
{
pAgent->UpdateAction(pAccessible);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DEFACTIONCHANGE, pAccessible);
@@ -108,7 +108,7 @@ void AccComponentEventListener::handleActionChangedEvent()
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccComponentEventListener::handleTextChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleTextChangedEvent(Any oldValue, Any newValue)
{
pAgent->UpdateValue(pAccessible, newValue);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible);
@@ -120,7 +120,7 @@ void AccComponentEventListener::handleTextChangedEvent(Any oldValue, Any newValu
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccComponentEventListener::handleCaretChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleCaretChangedEvent(Any oldValue, Any newValue)
{
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, pAccessible);
}
@@ -128,17 +128,17 @@ void AccComponentEventListener::handleCaretChangedEvent(Any oldValue, Any newVal
/**
* handle the VISIBLE_DATA_CHANGED event
*/
-void AccComponentEventListener::handleVisibleDataChangedEvent()
+void AccComponentEventListener::HandleVisibleDataChangedEvent()
{
- AccEventListener::handleVisibleDataChangedEvent();
+ AccEventListener::HandleVisibleDataChangedEvent();
}
/**
* handle the BOUNDRECT_CHANGED event
*/
-void AccComponentEventListener::handleBoundrectChangedEvent()
+void AccComponentEventListener::HandleBoundrectChangedEvent()
{
- AccEventListener::handleBoundrectChangedEvent();
+ AccEventListener::HandleBoundrectChangedEvent();
}
/**
@@ -147,7 +147,7 @@ void AccComponentEventListener::handleBoundrectChangedEvent()
* @param state new state id
* @param enable true if state is set, false if state is unset
*/
-void AccComponentEventListener::setComponentState(short state, bool enable )
+void AccComponentEventListener::SetComponentState(short state, bool enable)
{
// only the following state can be fired state event.
switch (state)
@@ -158,10 +158,10 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
case AccessibleStateType::ARMED:
case AccessibleStateType::INDETERMINATE:
case AccessibleStateType::SHOWING:
- fireStatePropertyChange(state, enable);
+ FireStatePropertyChange(state, enable);
break;
case AccessibleStateType::VISIBLE:
- if (getRole() == AccessibleRole::MENU_ITEM)
+ if (GetRole() == AccessibleRole::MENU_ITEM)
{
if(enable)
{
@@ -176,12 +176,12 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
}
else
{
- fireStatePropertyChange(state, enable);
+ FireStatePropertyChange(state, enable);
}
break;
break;
case AccessibleStateType::FOCUSED:
- fireStateFocusdChange(enable);
+ FireStateFocusedChange(enable);
break;
case AccessibleStateType::ENABLED:
if(enable)
@@ -189,9 +189,11 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
pAgent->UpdateState(pAccessible);
pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC);
// 8. label should have no FOCUSABLE state state, Firefox has READONLY state, we can also have.
- if( getRole() != AccessibleRole::LABEL
- && getRole() != AccessibleRole::SCROLL_BAR) //IAccessibility2 Implementation 2009
+ if ( GetRole() != AccessibleRole::LABEL
+ && GetRole() != AccessibleRole::SCROLL_BAR)
+ {
pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE);
+ }
}
else
{
@@ -215,7 +217,7 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
* @param state the state id
* @param set true if state is set, false if state is unset
*/
-void AccComponentEventListener::fireStatePropertyChange(short state, bool set)
+void AccComponentEventListener::FireStatePropertyChange(short state, bool set)
{
if( set)
{
@@ -308,11 +310,11 @@ void AccComponentEventListener::fireStatePropertyChange(short state, bool set)
*
* @param enable true if get focus, false if lose focus
*/
-void AccComponentEventListener::fireStateFocusdChange(bool enable)
+void AccComponentEventListener::FireStateFocusedChange(bool enable)
{
if(enable)
{
- if(getParentRole() != AccessibleRole::COMBO_BOX )
+ if (GetParentRole() != AccessibleRole::COMBO_BOX)
pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, pAccessible);
}
else
@@ -322,13 +324,13 @@ void AccComponentEventListener::fireStateFocusdChange(bool enable)
}
}
-void AccComponentEventListener::handleSelectionChangedEvent()
+void AccComponentEventListener::HandleSelectionChangedEventNoArgs()
{
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAccessible);
}
//add TEXT_SELECTION_CHANGED event
-void AccComponentEventListener::handleTextSelectionChangedEvent()
+void AccComponentEventListener::HandleTextSelectionChangedEvent()
{
pAgent->NotifyAccEvent(UM_EVENT_TEXT_SELECTION_CHANGED, pAccessible);
}
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index bcf357f..5f28b81 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -47,49 +47,49 @@ AccContainerEventListener::~AccContainerEventListener()
void AccContainerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
- short role = getRole();
+ short role = GetRole();
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
- handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED:
- handleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
- handleAllChildrenChangedEvent();
+ HandleAllChildrenChangedEvent();
break;
case AccessibleEventId::TEXT_CHANGED:
- handleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
case AccessibleEventId::VISIBLE_DATA_CHANGED:
- handleVisibleDataChangedEvent();
+ HandleVisibleDataChangedEvent();
break;
case AccessibleEventId::BOUNDRECT_CHANGED:
- handleBoundrectChangedEvent();
+ HandleBoundrectChangedEvent();
break;
case AccessibleEventId::STATE_CHANGED:
- handleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::VALUE_CHANGED:
- handleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED_ADD:
- handleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED_REMOVE:
- handleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED_WITHIN:
- handleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::PAGE_CHANGED:
- handlePageChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandlePageChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SECTION_CHANGED:
- handleSectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::COLUMN_CHANGED:
- handleColumnChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleColumnChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
default:
AccEventListener::notifyEvent(aEvent);
@@ -100,29 +100,29 @@ throw (::com::sun::star::uno::RuntimeException)
/**
* handle the VISIBLE_DATA_CHANGED event
*/
-void AccContainerEventListener::handleVisibleDataChangedEvent()
+void AccContainerEventListener::HandleVisibleDataChangedEvent()
{
- AccEventListener::handleVisibleDataChangedEvent();
+ AccEventListener::HandleVisibleDataChangedEvent();
}
/**
* handle the BOUNDRECT_CHANGED event
*/
-void AccContainerEventListener::handleBoundrectChangedEvent()
+void AccContainerEventListener::HandleBoundrectChangedEvent()
{
- AccEventListener::handleBoundrectChangedEvent();
+ AccEventListener::HandleBoundrectChangedEvent();
}
-void AccContainerEventListener::handleStateChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleStateChangedEvent(Any oldValue, Any newValue)
{
short State;
if( newValue >>= State)
{
- setComponentState( State,true);
+ SetComponentState(State, true);
}
else if (oldValue >>= State)
{
- setComponentState( State,false);
+ SetComponentState(State, false);
}
}
@@ -132,7 +132,7 @@ void AccContainerEventListener::handleStateChangedEvent(Any oldValue, Any newVal
* @param oldValue the child to be deleted
* @param newValue the child to be added
*/
-void AccContainerEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
{
Reference< XAccessible > xChild;
if( newValue >>= xChild)
@@ -177,7 +177,7 @@ void AccContainerEventListener::handleChildChangedEvent(Any oldValue, Any newVal
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccContainerEventListener::handleSelectionChangedEvent(const Any& /*oldValue*/, const Any& newValue)
+void AccContainerEventListener::HandleSelectionChangedEvent(const Any& /*oldValue*/, const Any& newValue)
{
if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED,newValue))
{
@@ -185,14 +185,14 @@ void AccContainerEventListener::handleSelectionChangedEvent(const Any& /*oldValu
}
//menu bar does not process selection change event,just same as word behavior
- if(getRole()!=AccessibleRole::MENU_BAR)
+ if (GetRole()!=AccessibleRole::MENU_BAR)
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAccessible);
}
/**
* handle the INVALIDATE_ALL_CHILDREN event
*/
-void AccContainerEventListener::handleAllChildrenChangedEvent()
+void AccContainerEventListener::HandleAllChildrenChangedEvent()
{
//TODO: update all the children
if( pAccessible )
@@ -208,7 +208,7 @@ void AccContainerEventListener::handleAllChildrenChangedEvent()
/**
* handle the TEXT_CHANGED event
*/
-void AccContainerEventListener::handleTextChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleTextChangedEvent(Any oldValue, Any newValue)
{
pAgent->UpdateValue(pAccessible, newValue);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_TEXTCHANGE, pAccessible);
@@ -219,7 +219,7 @@ void AccContainerEventListener::handleTextChangedEvent(Any oldValue, Any newValu
* @param state new state id
* @param enable true if state is set, false if state is unset
*/
-void AccContainerEventListener::setComponentState(short state, bool enable )
+void AccContainerEventListener::SetComponentState(short state, bool enable )
{
// only the following state can be fired state event.
@@ -232,10 +232,10 @@ void AccContainerEventListener::setComponentState(short state, bool enable )
case AccessibleStateType::FOCUSABLE:
case AccessibleStateType::SHOWING:
case AccessibleStateType::VISIBLE:
- fireStatePropertyChange(state, enable);
+ FireStatePropertyChange(state, enable);
break;
case AccessibleStateType::FOCUSED:
- fireStateFocusdChange(enable);
+ FireStateFocusedChange(enable);
break;
case AccessibleStateType::ENABLED:
if(enable)
@@ -259,7 +259,7 @@ void AccContainerEventListener::setComponentState(short state, bool enable )
// Only frames should be active
// no msaa state mapping
//for PAGE_TAB_LIST, there will be ACTIVE state, then it should be converted to FOCUSED event.
- if(getRole() == AccessibleRole::PAGE_TAB_LIST)
+ if (GetRole() == AccessibleRole::PAGE_TAB_LIST)
{
if (!enable) /* get the active state */
{
@@ -292,7 +292,7 @@ void AccContainerEventListener::setComponentState(short state, bool enable )
* @param state the state id
* @param set true if state is set, false if state is unset
*/
-void AccContainerEventListener::fireStatePropertyChange(short state, bool set)
+void AccContainerEventListener::FireStatePropertyChange(short state, bool set)
{
if( set )
{
@@ -354,14 +354,14 @@ void AccContainerEventListener::fireStatePropertyChange(short state, bool set)
* handle the focused event
* @param enable true if get focus, false if lose focus
*/
-void AccContainerEventListener::fireStateFocusdChange(bool enable)
+void AccContainerEventListener::FireStateFocusedChange(bool enable)
{
if(enable)
{
pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSED);
//if the acc role is MENU_BAR, MSAA UM_EVENT_MENU_START event should be sent
//if the acc role is POPUP_MENU, MSAA UM_EVENT_MENUPOPUPSTART event should be sent
- short role = getRole();
+ short role = GetRole();
if(role == AccessibleRole::MENU_BAR)
{
pAgent->NotifyAccEvent(UM_EVENT_MENU_START, pAccessible);
@@ -373,7 +373,7 @@ void AccContainerEventListener::fireStateFocusdChange(bool enable)
else if (role == AccessibleRole::PANEL || role == AccessibleRole::OPTION_PANE )
{
//don't send focused event on PANEL & OPTION_PANE if the parent is not toolbar
- short parentRole = getParentRole();
+ short parentRole = GetParentRole();
if (parentRole == AccessibleRole::TOOL_BAR
|| parentRole == AccessibleRole::SCROLL_PANE // sidebar
|| parentRole == AccessibleRole::PANEL) // sidebar
@@ -417,11 +417,11 @@ void AccContainerEventListener::fireStateFocusdChange(bool enable)
pAgent->DecreaseState( pAccessible, AccessibleStateType::FOCUSED);
//if the acc role is MENU_BAR, MSAA UM_EVENT_MENU_END event should be sent
//if the acc role is POPUP_MENU, MSAA UM_EVENT_MENUPOPUPEND event should be sent
- if(getRole() == AccessibleRole::MENU_BAR)
+ if (GetRole() == AccessibleRole::MENU_BAR)
{
pAgent->NotifyAccEvent(UM_EVENT_MENU_END, pAccessible);
}
- else if (getRole() == AccessibleRole::POPUP_MENU)
+ else if (GetRole() == AccessibleRole::POPUP_MENU)
{
pAgent->NotifyAccEvent(UM_EVENT_MENUPOPUPEND, pAccessible);
}
@@ -434,7 +434,7 @@ void AccContainerEventListener::fireStateFocusdChange(bool enable)
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccContainerEventListener::handleValueChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
{
pAgent->UpdateValue(pAccessible);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible);
@@ -472,7 +472,7 @@ bool AccContainerEventListener::NotifyChildEvent(short nWinEvent,const Any &Valu
return false;
}
-void AccContainerEventListener::handleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any& newValue)
+void AccContainerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any& newValue)
{
if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_ADD,newValue))
{
@@ -480,7 +480,8 @@ void AccContainerEventListener::handleSelectionChangedAddEvent(const Any& /*oldV
}
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_ADD,pAccessible);
}
-void AccContainerEventListener::handleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any& newValue)
+
+void AccContainerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any& newValue)
{
if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,newValue))
{
@@ -488,7 +489,8 @@ void AccContainerEventListener::handleSelectionChangedRemoveEvent(const Any& /*o
}
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,pAccessible);
}
-void AccContainerEventListener::handleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any& newValue)
+
+void AccContainerEventListener::HandleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any& newValue)
{
if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,newValue))
{
@@ -497,7 +499,7 @@ void AccContainerEventListener::handleSelectionChangedWithinEvent(const Any& /*o
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,pAccessible);
}
-void SAL_CALL AccContainerEventListener::UpdateAllChildrenState( com::sun::star::accessibility::XAccessible* pXAccessible )
+void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible)
{
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pXAccessible->getAccessibleContext(),UNO_QUERY);
if(!xContext.is())
@@ -530,26 +532,24 @@ void SAL_CALL AccContainerEventListener::UpdateAllChildrenState( com::sun::star:
}
}
-
-void AccContainerEventListener::handlePageChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
+void AccContainerEventListener::HandlePageChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
{
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_PAGECHANGED, pAccessible);
}
-void AccContainerEventListener::handleSectionChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/ )
+void AccContainerEventListener::HandleSectionChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/ )
{
pAgent->NotifyAccEvent(UM_EVENT_SECTION_CHANGED, pAccessible);
}
-void AccContainerEventListener::handleColumnChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
+void AccContainerEventListener::HandleColumnChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
{
pAgent->NotifyAccEvent(UM_EVENT_COLUMN_CHANGED, pAccessible);
}
-//IAccessibility2 Implementation 2009-----
-void AccContainerEventListener::handleNameChangedEvent( Any name )
+void AccContainerEventListener::HandleNameChangedEvent( Any name )
{
- if (getRole() == AccessibleRole::COMBO_BOX)
+ if (GetRole() == AccessibleRole::COMBO_BOX)
{
Reference<XAccessibleContext> mxContext(pAccessible->getAccessibleContext(),UNO_QUERY);
if(mxContext.is())
@@ -566,8 +566,7 @@ void AccContainerEventListener::handleNameChangedEvent( Any name )
}
}
}
- AccEventListener::handleNameChangedEvent(name);
+ AccEventListener::HandleNameChangedEvent(name);
}
-//-----IAccessibility2 Implementation 2009
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index 53b03f3..f04dc3b 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -50,22 +50,22 @@ throw (::com::sun::star::uno::RuntimeException)
switch (aEvent.EventId)
{
case AccessibleEventId::SELECTION_CHANGED:
- handleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::CHILD:
- handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS:
- handleChildChangedNoFocusEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleChildChangedNoFocusEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED_ADD:
- handleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED_REMOVE:
- handleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED_WITHIN:
- handleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
break;
default:
AccComponentEventListener::notifyEvent(aEvent);
@@ -78,7 +78,7 @@ throw (::com::sun::star::uno::RuntimeException)
* @param oldValue the child to be deleted
* @param newValue the child to be added
*/
-void AccDescendantManagerEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
{
Reference< XAccessible > xChild;
@@ -117,7 +117,7 @@ void AccDescendantManagerEventListener::handleChildChangedEvent(Any oldValue, An
/**
* handle the SELECTION_CHANGED event
*/
-void AccDescendantManagerEventListener::handleSelectionChangedEvent(Any oldValue, Any newValue)
+void AccDescendantManagerEventListener::HandleSelectionChangedEvent(Any oldValue, Any newValue)
{
bool bSend =false;
Reference< XAccessible > xChild;
@@ -151,7 +151,7 @@ void AccDescendantManagerEventListener::handleSelectionChangedEvent(Any oldValue
}
-void AccDescendantManagerEventListener::handleChildChangedNoFocusEvent(Any oldValue, Any newValue)
+void AccDescendantManagerEventListener::HandleChildChangedNoFocusEvent(Any oldValue, Any newValue)
{
Reference< XAccessible > xChild;
if(newValue >>= xChild )
@@ -196,7 +196,7 @@ bool AccDescendantManagerEventListener::NotifyChildEvent(short nWinEvent,const A
}
return false;
}
-void AccDescendantManagerEventListener::handleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any &newValue)
+void AccDescendantManagerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any &newValue)
{
if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_ADD,newValue))
{
@@ -204,7 +204,8 @@ void AccDescendantManagerEventListener::handleSelectionChangedAddEvent(const Any
}
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_ADD,pAccessible);
}
-void AccDescendantManagerEventListener::handleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any &newValue)
+
+void AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any &newValue)
{
if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,newValue))
{
@@ -213,7 +214,7 @@ void AccDescendantManagerEventListener::handleSelectionChangedRemoveEvent(const
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,pAccessible);
}
-void AccDescendantManagerEventListener::handleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any &newValue)
+void AccDescendantManagerEventListener::HandleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any &newValue)
{
if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,newValue))
{
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index dfcb08a..849f5bd 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -47,13 +47,13 @@ throw (::com::sun::star::uno::RuntimeException)
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
- handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::VISIBLE_DATA_CHANGED:
- handleVisibleDataChangedEvent();
+ HandleVisibleDataChangedEvent();
break;
case AccessibleEventId::BOUNDRECT_CHANGED:
- handleBoundrectChangedEvent();
+ HandleBoundrectChangedEvent();
break;
default:
AccEventListener::notifyEvent(aEvent);
@@ -64,17 +64,17 @@ throw (::com::sun::star::uno::RuntimeException)
/**
* handle the VISIBLE_DATA_CHANGED event
*/
-void AccDialogEventListener::handleVisibleDataChangedEvent()
+void AccDialogEventListener::HandleVisibleDataChangedEvent()
{
- AccEventListener::handleVisibleDataChangedEvent();
+ AccEventListener::HandleVisibleDataChangedEvent();
}
/**
* handle the BOUNDRECT_CHANGED event
*/
-void AccDialogEventListener::handleBoundrectChangedEvent()
+void AccDialogEventListener::HandleBoundrectChangedEvent()
{
- AccEventListener::handleBoundrectChangedEvent();
+ AccEventListener::HandleBoundrectChangedEvent();
}
/**
@@ -82,7 +82,7 @@ void AccDialogEventListener::handleBoundrectChangedEvent()
* @param oldValue the child to be deleted
* @param newValue the child to be added
*/
-void AccDialogEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccDialogEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
{
Reference< XAccessible > xChild;
if( newValue >>= xChild)
@@ -123,7 +123,7 @@ void AccDialogEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
* @param state new state id
* @param enable true if state is set, false if state is unset
*/
-void AccDialogEventListener::setComponentState(short state, bool enable )
+void AccDialogEventListener::SetComponentState(short state, bool enable)
{
// only the following state can be fired state event.
switch (state)
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index de4d7b4..54c4f87 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -67,13 +67,13 @@ throw (::com::sun::star::uno::RuntimeException)
switch (aEvent.EventId)
{
case AccessibleEventId::NAME_CHANGED:
- handleNameChangedEvent(aEvent.NewValue);
+ HandleNameChangedEvent(aEvent.NewValue);
break;
case AccessibleEventId::DESCRIPTION_CHANGED:
- handleDescriptionChangedEvent(aEvent.NewValue);
+ HandleDescriptionChangedEvent(aEvent.NewValue);
break;
case AccessibleEventId::STATE_CHANGED:
- handleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
default:
break;
@@ -84,7 +84,7 @@ throw (::com::sun::star::uno::RuntimeException)
* handle the NAME_CHANGED event
* @param name the new name with changed.
*/
-void AccEventListener::handleNameChangedEvent(Any name)
+void AccEventListener::HandleNameChangedEvent(Any name)
{
if ( pAgent->IsTopWinAcc( pAccessible ) )
{
@@ -104,7 +104,7 @@ void AccEventListener::handleNameChangedEvent(Any name)
* handle the DESCRIPTION_CHANGED event
* @param desc the new description
*/
-void AccEventListener::handleDescriptionChangedEvent(Any desc)
+void AccEventListener::HandleDescriptionChangedEvent(Any desc)
{
pAgent->UpdateDescription(pAccessible, desc);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DESCRIPTIONCHANGE, pAccessible);
@@ -113,7 +113,7 @@ void AccEventListener::handleDescriptionChangedEvent(Any desc)
/**
* handle the BOUNDRECT_CHANGED event
*/
-void AccEventListener::handleBoundrectChangedEvent()
+void AccEventListener::HandleBoundrectChangedEvent()
{
pAgent->UpdateLocation(pAccessible);
pAgent->NotifyAccEvent(UM_EVENT_BOUNDRECT_CHANGED, pAccessible);
@@ -122,7 +122,7 @@ void AccEventListener::handleBoundrectChangedEvent()
/**
* handle the VISIBLE_DATA_CHANGED event
*/
-void AccEventListener::handleVisibleDataChangedEvent()
+void AccEventListener::HandleVisibleDataChangedEvent()
{
pAgent->UpdateValue(pAccessible);
pAgent->NotifyAccEvent(UM_EVENT_VISIBLE_DATA_CHANGED, pAccessible);
@@ -133,16 +133,16 @@ void AccEventListener::handleVisibleDataChangedEvent()
* @param oldValue the old state of the source of event
* @param newValue the new state of the source of event
*/
-void AccEventListener::handleStateChangedEvent(Any oldValue, Any newValue)
+void AccEventListener::HandleStateChangedEvent(Any oldValue, Any newValue)
{
short newV, oldV;
if( newValue >>= newV)
{
- setComponentState(newV, true);
+ SetComponentState(newV, true);
}
else if (oldValue >>= oldV)
{
- setComponentState(oldV, false);
+ SetComponentState(oldV, false);
}
}
@@ -151,15 +151,15 @@ 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:
- fireStateFocusdChange(enable);
+ FireStateFocusedChange(enable);
break;
default:
- fireStatePropertyChange(state, enable);
+ FireStatePropertyChange(state, enable);
break;
}
}
@@ -168,7 +168,7 @@ void AccEventListener::setComponentState(short state, bool enable )
* handle the focused event
* @param enable true if get focus, false if lose focus
*/
-void AccEventListener::fireStateFocusdChange(bool enable)
+void AccEventListener::FireStateFocusedChange(bool enable)
{
if(enable)
{
@@ -187,7 +187,7 @@ void AccEventListener::fireStateFocusdChange(bool enable)
* @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 )
{
@@ -202,7 +202,7 @@ void AccEventListener::fireStatePropertyChange(short /*state*/, bool set )
/**
* get the role of accessible object which is observed
*/
-short AccEventListener::getRole()
+short AccEventListener::GetRole()
{
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
if(xContext.is())
@@ -215,7 +215,7 @@ short AccEventListener::getRole()
/**
* get the role of accessible parent object which is observed
*/
-short AccEventListener::getParentRole()
+short AccEventListener::GetParentRole()
{
if(pAccessible)
{
@@ -226,7 +226,7 @@ short AccEventListener::getParentRole()
/**
* remove the listener from accessible object
*/
-void AccEventListener::removeMeFromBroadcaster()
+void AccEventListener::RemoveMeFromBroadcaster()
{
try
{
@@ -276,7 +276,7 @@ void AccEventListener::removeMeFromBroadcaster()
void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException)
{
- removeMeFromBroadcaster();
+ RemoveMeFromBroadcaster();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 81b81ff..32974b7 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -53,13 +53,13 @@ throw (::com::sun::star::uno::RuntimeException)
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
- handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::VISIBLE_DATA_CHANGED:
- handleVisibleDataChangedEvent();
+ HandleVisibleDataChangedEvent();
break;
case AccessibleEventId::BOUNDRECT_CHANGED:
- handleBoundrectChangedEvent();
+ HandleBoundrectChangedEvent();
break;
default:
AccEventListener::notifyEvent(aEvent);
@@ -70,17 +70,17 @@ throw (::com::sun::star::uno::RuntimeException)
/**
* handle the VISIBLE_DATA_CHANGED event
*/
-void AccFrameEventListener::handleVisibleDataChangedEvent()
+void AccFrameEventListener::HandleVisibleDataChangedEvent()
{
- AccEventListener::handleVisibleDataChangedEvent();
+ AccEventListener::HandleVisibleDataChangedEvent();
}
/**
* handle the BOUNDRECT_CHANGED event
*/
-void AccFrameEventListener::handleBoundrectChangedEvent()
+void AccFrameEventListener::HandleBoundrectChangedEvent()
{
- AccEventListener::handleBoundrectChangedEvent();
+ AccEventListener::HandleBoundrectChangedEvent();
}
/**
@@ -88,7 +88,7 @@ void AccFrameEventListener::handleBoundrectChangedEvent()
* @param oldValue the child to be deleted
* @param newValue the child to be added
*/
-void AccFrameEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
{
Reference< XAccessible > xChild;
if( newValue >>= xChild)
@@ -135,7 +135,7 @@ void AccFrameEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
* @param state new state id
* @param enable true if state is set, false if state is unset
*/
-void AccFrameEventListener::setComponentState(short state, bool enable )
+void AccFrameEventListener::SetComponentState(short state, bool enable )
{
// only the following state can be fired state event.
switch (state)
diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx
index 83129ad..ac8c540 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -49,7 +49,7 @@ void AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::
switch (aEvent.EventId)
{
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
- handleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
// Since List items a transient a child events are mostly used
@@ -57,7 +57,7 @@ void AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::
//TODO: investigate again
break;
case AccessibleEventId::VALUE_CHANGED:
- handleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
default:
AccDescendantManagerEventListener::notifyEvent(aEvent);
@@ -70,7 +70,7 @@ void AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::
* @param oldValue the child to lose active
* @param newValue the child to get active
*/
-void AccListEventListener::handleActiveDescendantChangedEvent(Any oldValue, Any newValue)
+void AccListEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any newValue)
{
Reference< XAccessible > xChild;
@@ -109,10 +109,10 @@ void AccListEventListener::handleActiveDescendantChangedEvent(Any oldValue, Any
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccListEventListener::handleValueChangedEvent(Any oldValue, Any newValue)
+void AccListEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
{
//to enable value changed event
- if(getParentRole() == AccessibleRole::COMBO_BOX)
+ if (GetParentRole() == AccessibleRole::COMBO_BOX)
{
XAccessible* pParentAcc = pAgent->GetParentXAccessible(pAccessible);
pAgent->UpdateValue(pParentAcc);
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx
index ff4b938..2cf99ea 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -47,7 +47,7 @@ throw (::com::sun::star::uno::RuntimeException)
switch (aEvent.EventId)
{
case AccessibleEventId::CHILD:
- handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+ HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
break;
case AccessibleEventId::SELECTION_CHANGED:
//don't need to process anything,just same as word behavior
@@ -64,7 +64,7 @@ throw (::com::sun::star::uno::RuntimeException)
* @param oldValue the child to be deleted
* @param newValue the child to be added
*/
-void AccMenuEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
{
Reference< XAccessible > xChild;
@@ -104,7 +104,7 @@ void AccMenuEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
/**
* handle the SELECTION_CHANGED event
*/
-void AccMenuEventListener::handleSelectionChangedEvent()
+void AccMenuEventListener::HandleSelectionChangedEventNoArgs()
{
pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAccessible);
}
@@ -112,7 +112,7 @@ void AccMenuEventListener::handleSelectionChangedEvent()
/**
* handle the Menu_popup event
*/
-void AccMenuEventListener::fireStatePropertyChange(short state, bool set)
+void AccMenuEventListener::FireStatePropertyChange(short state, bool set)
{
if( set )
{
@@ -126,8 +126,7 @@ void AccMenuEventListener::fireStatePropertyChange(short state, bool set)
pAgent->UpdateChildState(pAccessible);
break;
default:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list