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

Gbuildify winaccessibility service

Browse Source 
Conflicts:
	winaccessibility/source/UAccCOM/UAccCOM.def
	winaccessibility/source/service/AccObjectWinManager.cxx
	winaccessibility/source/service/checkmt.cxx
	winaccessibility/source/service/checkmt.hxx

Change-Id: Ia66872bee7c70c840c1bd5caa626bf63eac9ef7c
This commit is contained in:
David Ostrovsky
2013-11-02 20:40:47 +01:00
committed by Michael Meeks
parent 026a7dc385
commit cbf2a0d90c
16 changed files with 137 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Repository.mk
View File

@@ -558,7 +558,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(DISABLE_ATL),,\
inprocserv \
) \
UAccCOM \
$(if $(ENABLE_IA2), \
UAccCOM \
winaccessibility \
) \
) \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \

2
include/vcl/svapp.hxx Normal file → Executable file
View File

@@ -400,6 +400,8 @@ public:
createFolderPicker( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rServiceManager );
static bool IsEnableAccessInterface() {return true;}
private:
DECL_STATIC_LINK( Application, PostEventHandler, void* );

7
postprocess/Rdb_services.mk Normal file → Executable file
View File

@@ -137,8 +137,11 @@ $(eval $(call gb_Rdb_add_components,services,\
shell/source/win32/simplemail/smplmail \
shell/source/win32/syssh \
vcl/vcl.windows \
$(if $(ENABLE_JAVA), \
accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \
$(if $(ENABLE_IA2), \
winaccessibility/source/service/winaccessibility, \
$(if $(ENABLE_JAVA), \
accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \
) \
) \
) \
$(if $(ENABLE_HEADLESS), \

12
winaccessibility/Library_uacccom.mk
View File

@@ -37,21 +37,20 @@ $(eval $(call gb_Library_add_exception_objects,UAccCOM,\
winaccessibility/source/UAccCOM/AccHypertext \
winaccessibility/source/UAccCOM/AccImage \
winaccessibility/source/UAccCOM/AccRelation \
winaccessibility/source/UAccCOM/AccTable \
winaccessibility/source/UAccCOM/AccText \
winaccessibility/source/UAccCOM/AccTextBase \
winaccessibility/source/UAccCOM/AccValue \
winaccessibility/source/UAccCOM/CheckEnableAccessible \
winaccessibility/source/UAccCOM/EnumVariant \
winaccessibility/source/UAccCOM/MAccessible \
winaccessibility/source/UAccCOM/StdAfx \
winaccessibility/source/UAccCOM/UAccCOM \
winaccessibility/source/UAccCOM/UNOXWrapper \
))
# winaccessibility/source/UAccCOM/AccTextBase \
# winaccessibility/source/UAccCOM/AccTable \
# winaccessibility/source/UAccCOM/MAccessible \
# /DEF:$(SRCDIR)/winaccessibility/source/UAccCOM/UAccCOM.def \
$(eval $(call gb_Library_add_ldflags,UAccCOM,\
/DEF:$(SRCDIR)/winaccessibility/source/UAccCOM/UAccCOM.def \
-LIBPATH:$(ATL_LIB) \
-delayload:$(call gb_Library_get_filename,cppu) \
-delayload:$(call gb_Library_get_filename,sal) \
@@ -64,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,UAccCOM,\
))
$(eval $(call gb_Library_use_externals,UAccCOM,\
boost_headers \
icuuc \
icui18n \
))

81
winaccessibility/Library_winaccessibility.mk Executable file
View File

@@ -0,0 +1,81 @@
# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(eval $(call gb_Library_Library,winaccessibility))
$(eval $(call gb_Library_use_custom_headers,winaccessibility,winaccessibility/ia2/idl))
$(eval $(call gb_Library_set_include,winaccessibility,\
$$(INCLUDE) \
-I$(SRCDIR)/winaccessibility/inc \
$(foreach i,$(ATL_INCLUDE), -I$(i)) \
))
$(eval $(call gb_Library_use_sdk_api,winaccessibility))
$(eval $(call gb_Library_set_componentfile,winaccessibility,winaccessibility/source/service/winaccessibility))
$(eval $(call gb_Library_add_exception_objects,winaccessibility,\
winaccessibility/source/service/AccObject \
winaccessibility/source/service/ResIDGenerator \
winaccessibility/source/service/AccObjectWinManager \
winaccessibility/source/service/AccObjectManagerAgent \
winaccessibility/source/service/AccEventListener \
winaccessibility/source/service/AccComponentEventListener \
winaccessibility/source/service/AccContainerEventListener \
winaccessibility/source/service/AccDialogEventListener \
winaccessibility/source/service/AccFrameEventListener \
winaccessibility/source/service/AccWindowEventListener \
winaccessibility/source/service/AccMenuEventListener \
winaccessibility/source/service/AccTextComponentEventListener \
winaccessibility/source/service/AccObjectContainerEventListener \
winaccessibility/source/service/AccParagraphEventListener \
winaccessibility/source/service/AccDescendantManagerEventListener \
winaccessibility/source/service/AccListEventListener \
winaccessibility/source/service/AccTableEventListener \
winaccessibility/source/service/AccTreeEventListener \
winaccessibility/source/service/AccTopWindowListener \
winaccessibility/source/service/msaaservice_impl \
winaccessibility/source/service/AccResource \
winaccessibility/source/service/checkmt \
))
$(eval $(call gb_Library_use_externals,winaccessibility,\
boost_headers \
))
$(eval $(call gb_Library_use_libraries,winaccessibility,\
cppu \
cppuhelper \
vcl \
sal \
tk \
uwinapi \
tl \
))
$(eval $(call gb_Library_use_system_win32_libs,winaccessibility,\
oleacc \
advapi32 \
delayimp \
kernel32 \
ole32 \
oleaut32 \
shlwapi \
user32 \
uuid \
gdi32 \
shell32 \
imm32 \
winspool \
))
# vim:set noet sw=4 ts=4:

1
winaccessibility/Module_winaccessibility.mk
View File

@@ -16,6 +16,7 @@ $(eval $(call gb_Module_add_targets,winaccessibility,\
WinResTarget_uacccom \
CustomTarget_ia2_idl \
Library_uacccom \
Library_winaccessibility \
))
endif # ENABLE_IA2
endif # COM=MSC

4
winaccessibility/inc/AccEventListener.hxx Normal file → Executable file
View File

@@ -23,7 +23,7 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <cppuhelper/weak.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
class AccObjectManagerAgent;
using namespace ::com::sun::star::uno;
@@ -45,7 +45,7 @@ protected:
AccObjectManagerAgent* pAgent;
//disposed state indicator
bool m_isDisposed;
mutable ::vos::OMutex aRemoveMutex;
mutable ::osl::Mutex aRemoveMutex;
public:
AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccEventListener();

8
winaccessibility/inc/AccObjectWinManager.hxx Normal file → Executable file
View File

@@ -25,7 +25,7 @@
#endif
#include <map>
#include <windows.h>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/dllapi.h>
#include "ResIDGenerator.hxx"
#include "UAccCOM2.h"
@@ -93,9 +93,9 @@ private:
AccObjectManagerAgent* pAgent;
static AccObjectWinManager* me;
ResIDGenerator ResIdGen;
mutable ::vos::OMutex aDeleteMutex;
mutable ::vos::OMutex aNotifyMutex;
mutable ::vos::OMutex maATInterfaceMutex;
mutable ::osl::Mutex aDeleteMutex;
mutable ::osl::Mutex aNotifyMutex;
mutable ::osl::Mutex maATInterfaceMutex;
AccObjectWinManager(AccObjectManagerAgent* Agent=NULL);

0
winaccessibility/source/UAccCOM/UAccCOM.cxx Normal file → Executable file
View File

8
winaccessibility/source/service/AccEventListener.cxx Normal file → Executable file
View File

@@ -188,7 +188,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 )
{
@@ -231,7 +231,7 @@ void AccEventListener::removeMeFromBroadcaster()
{
try
{
vos::OGuard aGuard(aRemoveMutex);
osl::MutexGuard aGuard(aRemoveMutex);
if(m_isDisposed)
return;
//get accessible context
@@ -259,7 +259,7 @@ void AccEventListener::removeMeFromBroadcaster()
if (pBroadcaster != NULL)
{
//remove the lister from accessible object
pBroadcaster->removeEventListener(this);
pBroadcaster->removeAccessibleEventListener(this);
m_isDisposed = true;
pAgent->NotifyDestroy(pAccessible);
}
@@ -274,7 +274,7 @@ void AccEventListener::removeMeFromBroadcaster()
/**
* this method is invoked before listener is disposed
*/
void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& Source )
void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException)
{
removeMeFromBroadcaster();

10
winaccessibility/source/service/AccFrameEventListener.cxx Normal file → Executable file
View File

@@ -33,7 +33,8 @@ using namespace com::sun::star::accessibility;
#include <vcl/window.hxx>
#include <toolkit/awt/Vclxwindow.hxx>
#ifndef _SV_SYSDATA_HXX
//#ifndef _SV_SYSDATA_HXX
#if 0
#if defined( WIN ) || defined( WNT ) || defined( OS2 )
typedef sal_Int32 HWND;
typedef sal_Int32 HMENU;
@@ -42,9 +43,9 @@ typedef void *PVOID;
typedef PVOID HANDLE;
typedef HANDLE HFONT;
#endif
#include <vcl/sysdata.hxx>
#endif
#include <vcl/sysdata.hxx>
//#endif
AccFrameEventListener::AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccEventListener(pAcc, Agent)
@@ -115,7 +116,8 @@ void AccFrameEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
const SystemEnvData* systemdata=window->GetSystemData();
//add this child
pAgent->InsertAccObj( pAcc,pAccessible,(HWND)systemdata->hWnd);
//TODO(davido): FixMe
pAgent->InsertAccObj( pAcc,pAccessible,(long)(HWND)systemdata->hWnd);
//add all oldValue's existing children
pAgent->InsertChildrenAccObj(pAcc);
pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);

10
winaccessibility/source/service/AccObjectWinManager.cxx Normal file → Executable file
View File

@@ -133,7 +133,7 @@ AccObjectWinManager::~AccObjectWinManager()
long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam)
{
vos::OGuard localGuard(maATInterfaceMutex);//
osl::MutexGuard localGuard(maATInterfaceMutex);//
IMAccessible* pRetIMAcc = NULL;
@@ -215,7 +215,7 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd)
*/
sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state)
{
vos::OGuard aGuard(aNotifyMutex);
osl::MutexGuard aGuard(aNotifyMutex);
if (!IsInMainThread())
{
@@ -563,7 +563,7 @@ void AccObjectWinManager::DeleteFromHwndXAcc(XAccessible* pXAcc )
*/
void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
{
vos::OGuard aGuard( aDeleteMutex );
osl::MutexGuard aGuard( aDeleteMutex );
AccObject* currentObj=NULL;
AccObject* childObj=NULL;
XAccessible* pTmpXAcc=NULL;
@@ -592,7 +592,7 @@ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
*/
void AccObjectWinManager::DeleteAccObj( XAccessible* pXAcc )
{
vos::OGuard aGuard( aDeleteMutex );
osl::MutexGuard aGuard( aDeleteMutex );
if( pXAcc == NULL )
return;
XIdToAccObjHash::iterator temp = XIdAccList.find(pXAcc);
@@ -792,7 +792,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar
static_cast< XAccessibleEventListener* >(listener),UNO_QUERY );
if(pp.is())
{
broadcaster->addEventListener(pp);
broadcaster->addAccessibleEventListener(pp);
}
else
{

11
winaccessibility/source/service/AccTopWindowListener.cxx Normal file → Executable file
View File

@@ -23,7 +23,8 @@
#include <vcl/window.hxx>
#include <toolkit/awt/Vclxwindow.hxx>
#ifndef _SV_SYSDATA_HXX
//#ifndef _SV_SYSDATA_HXX
#if 0
#if defined( WIN ) || defined( WNT ) || defined( OS2 )
typedef sal_Int32 HWND;
typedef sal_Int32 HMENU;
@@ -32,8 +33,8 @@ typedef void *PVOID;
typedef PVOID HANDLE;
typedef HANDLE HFONT;
#endif
#include <vcl/sysdata.hxx>
#endif
#include <vcl/sysdata.hxx>
#include "AccTopWindowListener.hxx"
#include "unomsaaevent.hxx"
@@ -105,7 +106,7 @@ void AccTopWindowListener::handleWindowOpened( com::sun::star::accessibility::XA
//Only AccessibleContext exist, add all listeners
if(pAccessibleContext != NULL && systemdata != NULL)
{
accManagerAgent.SaveTopWindowHandle((HWND)systemdata->hWnd, pAccessible);
accManagerAgent.SaveTopWindowHandle((long)(HWND)systemdata->hWnd, pAccessible);
AddAllListeners(pAccessible,NULL,(HWND)systemdata->hWnd);
@@ -181,7 +182,7 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
return;
}
accManagerAgent.InsertAccObj( pAccessible, pParentXAcc,pWND );
accManagerAgent.InsertAccObj( pAccessible, pParentXAcc,(long)(HWND)pWND );
if (!accManagerAgent.IsContainer(pAccessible))
{
@@ -220,7 +221,7 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
}
}
void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException)
void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
{
}

4
winaccessibility/source/service/checkmt.cxx Normal file → Executable file
View File

@@ -22,13 +22,13 @@
bool IsInMainThread()
{
if( Application::GetMainThreadIdentifier() == ::vos::OThread::getCurrentIdentifier())
if( Application::GetMainThreadIdentifier() == osl::Thread::getCurrentIdentifier())
return true;
else
return false;
}
vos::IMutex& GetSolarMutex()
comphelper::SolarMutex& GetSolarMutex()
{
return Application::GetSolarMutex();
}

4
winaccessibility/source/service/checkmt.hxx Normal file → Executable file
View File

@@ -19,10 +19,10 @@
#pragma once
#include <vos/mutex.hxx>
#include "comphelper/solarmutex.hxx"
bool IsInMainThread();
vos::IMutex& GetSolarMutex();
comphelper::SolarMutex& GetSolarMutex();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

14
winaccessibility/source/service/msaaservice_impl.cxx Normal file → Executable file
View File

@@ -49,11 +49,11 @@ extern void handleWindowOpened_impl( long pAcc);
namespace my_sc_impl
{
extern Sequence< OUString > SAL_CALL getSupportedServiceNames_MSAAServiceImpl();
extern OUString SAL_CALL getImplementationName_MSAAServiceImpl();
extern Reference< XInterface > SAL_CALL create_MSAAServiceImpl(
Reference< XComponentContext > const & xContext )
SAL_THROW( () );
//extern Sequence< OUString > SAL_CALL getSupportedServiceNames_MSAAServiceImpl();
//static OUString SAL_CALL getImplementationName_MSAAServiceImpl();
//static Reference< XInterface > SAL_CALL create_MSAAServiceImpl(
// Reference< XComponentContext > const & xContext )
// SAL_THROW( () );
/**
* Method that returns the service name.
* @param
@@ -272,12 +272,12 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
extern "C"
{
void SAL_CALL component_getImplementationEnvironment(
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
sal_Char const ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
void * SAL_CALL component_getFactory(
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
registry::XRegistryKey * xRegistry )
{