[Libreoffice-commits] core.git: Branch 'feature/ia2.3' - 5 commits - accessibility/Module_accessibility.mk config_host.mk.in configure.ac include/vcl postprocess/Rdb_services.mk Repository.mk winaccessibility/CustomTarget_ia2_idl.mk winaccessibility/inc winaccessibility/Library_uacccom.mk winaccessibility/Library_winaccessibility.mk winaccessibility/Makefile winaccessibility/Module_winaccessibility.mk winaccessibility/source winaccessibility/WinResTarget_uacccom.mk
David Ostrovsky
david at ostrovsky.org
Thu Nov 14 14:19:01 PST 2013
Repository.mk | 4
accessibility/Module_accessibility.mk | 2
config_host.mk.in | 1
configure.ac | 20 +++
include/vcl/svapp.hxx | 2
postprocess/Rdb_services.mk | 7 -
winaccessibility/CustomTarget_ia2_idl.mk | 56 +++++++++
winaccessibility/Library_uacccom.mk | 87 ++++++++++++++
winaccessibility/Library_winaccessibility.mk | 81 +++++++++++++
winaccessibility/Makefile | 14 ++
winaccessibility/Module_winaccessibility.mk | 25 ++++
winaccessibility/WinResTarget_uacccom.mk | 31 ++++
winaccessibility/inc/AccEventListener.hxx | 4
winaccessibility/inc/AccObjectWinManager.hxx | 8 -
winaccessibility/source/UAccCOM/AccActionBase.h | 2
winaccessibility/source/UAccCOM/AccComponentBase.h | 2
winaccessibility/source/UAccCOM/AccRelation.cxx | 6
winaccessibility/source/UAccCOM/AccTextBase.cxx | 1
winaccessibility/source/UAccCOM/AccTextBase.h | 2
winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx | 1
winaccessibility/source/UAccCOM/EnumVariant.h | 2
winaccessibility/source/UAccCOM/MAccessible.cxx | 4
winaccessibility/source/UAccCOM/Resource.h | 1
winaccessibility/source/UAccCOM/UNOXWrapper.h | 2
winaccessibility/source/service/AccEventListener.cxx | 8 -
winaccessibility/source/service/AccFrameEventListener.cxx | 10 -
winaccessibility/source/service/AccObjectWinManager.cxx | 10 -
winaccessibility/source/service/AccTopWindowListener.cxx | 11 -
winaccessibility/source/service/checkmt.cxx | 4
winaccessibility/source/service/checkmt.hxx | 4
winaccessibility/source/service/msaaservice_impl.cxx | 14 +-
31 files changed, 371 insertions(+), 55 deletions(-)
New commits:
commit cc680a21652dda2a10bcc9a0415209a855eb3faf
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sat Nov 2 15:33:13 2013 +0100
Remove WNT define
Change-Id: Ia69141f58fad25797d7d7495a357dd18c7abf08d
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h
old mode 100644
new mode 100755
index 9c201107..8a6f64a
--- a/winaccessibility/source/UAccCOM/AccActionBase.h
+++ b/winaccessibility/source/UAccCOM/AccActionBase.h
@@ -28,8 +28,6 @@
#pragma once
#endif // _MSC_VER > 1000
-#define WNT
-
#include <com/sun/star/uno/reference.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include "UNOXWrapper.h"
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h b/winaccessibility/source/UAccCOM/AccComponentBase.h
old mode 100644
new mode 100755
index 500f7cf..a894816
--- a/winaccessibility/source/UAccCOM/AccComponentBase.h
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.h
@@ -28,8 +28,6 @@
#pragma once
#endif // _MSC_VER > 1000
-#define WNT
-
#include <com/sun/star/uno/reference.hxx>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include "UNOXWrapper.h"
diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx
old mode 100644
new mode 100755
index 9a6ddc3..3df484a
--- a/winaccessibility/source/UAccCOM/AccRelation.cxx
+++ b/winaccessibility/source/UAccCOM/AccRelation.cxx
@@ -202,13 +202,13 @@ BSTR CAccRelation::getRelationTypeBSTR(int type)
{IA2_RELATION_LABELED_BY , 6},
{IA2_RELATION_MEMBER_OF , 7},
{IA2_RELATION_SUBWINDOW_OF , 8},
- {IA2_RELATION_NODE_CHILD_OF, 9},
- {IA2_RELATION_DESCRIBED_BY , 10},
+ {IA2_RELATION_NODE_CHILD_OF , 9},
+ {IA2_RELATION_DESCRIBED_BY , 10},
};
USES_CONVERSION;
- return (type >= 0 && type <= 10) ? T2BSTR(map[type].string) : _T("");
+ return (type >= 0 && type <= 10) ? map[type].string : _T("");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx
old mode 100644
new mode 100755
index c218006..1191eb4
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -22,7 +22,6 @@
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <string>
-#define WNT
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include "AccTextBase.h"
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.h b/winaccessibility/source/UAccCOM/AccTextBase.h
old mode 100644
new mode 100755
index 71dd1f8..8494936
--- a/winaccessibility/source/UAccCOM/AccTextBase.h
+++ b/winaccessibility/source/UAccCOM/AccTextBase.h
@@ -28,8 +28,6 @@
#pragma once
#endif // _MSC_VER > 1000
-#define WNT
-
#include <com/sun/star/uno/reference.hxx>
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include "UNOXWrapper.h"
diff --git a/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx b/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
old mode 100644
new mode 100755
index f4a5dce..128d2cb
--- a/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define WNT
#define _USE_NAMESPACE
#ifndef _SV_SVAPP_HXX
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
old mode 100644
new mode 100755
index 42b0ccc..ea6d68d
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -20,8 +20,6 @@
#ifndef __ENUMVARIANT_H_
#define __ENUMVARIANT_H_
-#define WNT
-
#include "resource.h" // main symbols
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
old mode 100644
new mode 100755
index d4a31a8..a75cfb3
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -36,9 +36,9 @@
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
+//#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+//#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#include <com/sun/star/style/LineSpacing.hpp>
#include <com/sun/star/style/TabStop.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
diff --git a/winaccessibility/source/UAccCOM/Resource.h b/winaccessibility/source/UAccCOM/Resource.h
old mode 100644
new mode 100755
index 3173399..819b28d
--- a/winaccessibility/source/UAccCOM/Resource.h
+++ b/winaccessibility/source/UAccCOM/Resource.h
@@ -21,7 +21,6 @@
// Microsoft Developer Studio generated include file.
// Used by UAccCOM.rc
//
-#define WNT
#define IDS_PROJNAME 100
#define IDR_MACCESSIBLE 101
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h
old mode 100644
new mode 100755
index 5555f0a..08b2632
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -20,8 +20,6 @@
#ifndef __UNOXWRAPPER_H_
#define __UNOXWRAPPER_H_
-#define WNT
-
#include "resource.h" // main symbols
commit 9aad9c1ccd3c97eeef9424147144472b0b433639
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sat Nov 2 20:40:47 2013 +0100
Gbuildify winaccessibility service
Conflicts:
winaccessibility/source/UAccCOM/UAccCOM.def
winaccessibility/source/service/AccObjectWinManager.cxx
winaccessibility/source/service/checkmt.cxx
winaccessibility/source/service/checkmt.hxx
Change-Id: Ia66872bee7c70c840c1bd5caa626bf63eac9ef7c
diff --git a/Repository.mk b/Repository.mk
index 394025d..af05400 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -559,7 +559,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, \
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
old mode 100644
new mode 100755
index b18c79b..385cedb
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -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* );
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
old mode 100644
new mode 100755
index 768a8e7..6157e25
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -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), \
diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk
index 749be7c..b3b91ce 100755
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@@ -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 \
))
diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk
new file mode 100755
index 0000000..0f1558c
--- /dev/null
+++ b/winaccessibility/Library_winaccessibility.mk
@@ -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:
diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk
index e96f988..b4945cf 100755
--- a/winaccessibility/Module_winaccessibility.mk
+++ b/winaccessibility/Module_winaccessibility.mk
@@ -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
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
old mode 100644
new mode 100755
index 06801da..5978ddd
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -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();
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
old mode 100644
new mode 100755
index 945e86c..800c927
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -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);
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
old mode 100644
new mode 100755
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
old mode 100644
new mode 100755
index 0b3f720..df2a42c7
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -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();
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
old mode 100644
new mode 100755
index c3627e3..a57fc3c
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -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);
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
old mode 100644
new mode 100755
index 84a7456..4ed41d6
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -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
{
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
old mode 100644
new mode 100755
index 7e1de22..28d2b79
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -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)
{
}
diff --git a/winaccessibility/source/service/checkmt.cxx b/winaccessibility/source/service/checkmt.cxx
old mode 100644
new mode 100755
index f5e89aa..ad0f2b7
--- a/winaccessibility/source/service/checkmt.cxx
+++ b/winaccessibility/source/service/checkmt.cxx
@@ -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();
}
diff --git a/winaccessibility/source/service/checkmt.hxx b/winaccessibility/source/service/checkmt.hxx
old mode 100644
new mode 100755
index c70f380..bc5b757
--- a/winaccessibility/source/service/checkmt.hxx
+++ b/winaccessibility/source/service/checkmt.hxx
@@ -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: */
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
old mode 100644
new mode 100755
index c51b79b..8606069
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -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 )
{
commit 0d757cea6b7eab5916f5918d3a1fc19a2a7842f8
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sat Nov 2 15:44:00 2013 +0100
Gbuildify UAA to IA2 bridge
Change-Id: I1aae7ec50c3bb78ac1035d70eaf39c6efef465ab
diff --git a/Repository.mk b/Repository.mk
old mode 100644
new mode 100755
index ac07ba1..394025d
--- a/Repository.mk
+++ b/Repository.mk
@@ -559,6 +559,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(DISABLE_ATL),,\
inprocserv \
) \
+ UAccCOM \
) \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk
new file mode 100755
index 0000000..749be7c
--- /dev/null
+++ b/winaccessibility/Library_uacccom.mk
@@ -0,0 +1,87 @@
+# -*- 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,UAccCOM))
+
+$(eval $(call gb_Library_use_custom_headers,UAccCOM,winaccessibility/ia2/idl))
+
+$(eval $(call gb_Library_set_include,UAccCOM,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/winaccessibility/inc \
+ $(foreach i,$(ATL_INCLUDE), -I$(i)) \
+))
+
+$(eval $(call gb_Library_add_defs,UAccCOM,\
+ -D_UNICODE=1 \
+))
+
+$(eval $(call gb_Library_use_sdk_api,UAccCOM))
+
+$(eval $(call gb_Library_add_nativeres,UAccCOM,UAccCOM))
+
+$(eval $(call gb_Library_add_exception_objects,UAccCOM,\
+ winaccessibility/source/UAccCOM/AccAction \
+ winaccessibility/source/UAccCOM/AccActionBase \
+ winaccessibility/source/UAccCOM/AccComponent \
+ winaccessibility/source/UAccCOM/AccComponentBase \
+ winaccessibility/source/UAccCOM/AccEditableText \
+ winaccessibility/source/UAccCOM/AccHyperLink \
+ winaccessibility/source/UAccCOM/AccHypertext \
+ winaccessibility/source/UAccCOM/AccImage \
+ winaccessibility/source/UAccCOM/AccRelation \
+ winaccessibility/source/UAccCOM/AccText \
+ winaccessibility/source/UAccCOM/AccValue \
+ winaccessibility/source/UAccCOM/EnumVariant \
+ 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,\
+ -LIBPATH:$(ATL_LIB) \
+ -delayload:$(call gb_Library_get_filename,cppu) \
+ -delayload:$(call gb_Library_get_filename,sal) \
+))
+
+$(eval $(call gb_Library_use_libraries,UAccCOM,\
+ cppu \
+ vcl \
+ sal \
+))
+
+$(eval $(call gb_Library_use_externals,UAccCOM,\
+ icuuc \
+ icui18n \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,UAccCOM,\
+ oleacc \
+ advapi32 \
+ delayimp \
+ kernel32 \
+ ole32 \
+ oleaut32 \
+ shlwapi \
+ user32 \
+ uuid \
+))
+
+$(eval $(call gb_Library_add_libs,UAccCOM,\
+ $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk
index efd7b3e..e96f988 100755
--- a/winaccessibility/Module_winaccessibility.mk
+++ b/winaccessibility/Module_winaccessibility.mk
@@ -13,7 +13,9 @@ ifeq ($(OS),WNT)
ifeq ($(COM),MSC)
ifneq ($(ENABLE_IA2),)
$(eval $(call gb_Module_add_targets,winaccessibility,\
+ WinResTarget_uacccom \
CustomTarget_ia2_idl \
+ Library_uacccom \
))
endif # ENABLE_IA2
endif # COM=MSC
diff --git a/winaccessibility/WinResTarget_uacccom.mk b/winaccessibility/WinResTarget_uacccom.mk
new file mode 100755
index 0000000..9da01e7
--- /dev/null
+++ b/winaccessibility/WinResTarget_uacccom.mk
@@ -0,0 +1,31 @@
+# -*- 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_WinResTarget_WinResTarget,UAccCOM))
+
+$(eval $(call gb_WinResTarget_use_custom_headers,UAccCOM,\
+ winaccessibility/ia2/idl \
+))
+
+ifneq ($(ENABLE_DBGUTIL),TRUE)
+$(eval $(call gb_WinResTarget_add_defs,UAccCOM,\
+ -DPRODUCT \
+))
+endif
+
+$(eval $(call gb_WinResTarget_set_include,UAccCOM,\
+ $$(INCLUDE) \
+ $(foreach i,$(ATL_INCLUDE), -I$(i)) \
+))
+
+$(eval $(call gb_WinResTarget_set_rcfile,UAccCOM,winaccessibility/source/UAccCOM/UAccCOM))
+
+# vim:set noet sw=4 ts=4:
commit a4f57ca56faa24ab7b5788cfedfddbd8bdba236b
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sat Nov 2 11:07:01 2013 +0100
Add custom target to process IA2 COM idl files
Change-Id: Id20cba53fc21eaa396c3a3d3ed8fa1eb9fdb4978
diff --git a/winaccessibility/CustomTarget_ia2_idl.mk b/winaccessibility/CustomTarget_ia2_idl.mk
new file mode 100755
index 0000000..fc3fc46
--- /dev/null
+++ b/winaccessibility/CustomTarget_ia2_idl.mk
@@ -0,0 +1,56 @@
+# -*- Mode: makefile-gmake; 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_CustomTarget_CustomTarget,winaccessibility/ia2/idl))
+
+wina11y_COMIDLDIR := $(call gb_CustomTarget_get_workdir,winaccessibility/ia2/idl)
+wina11y_SOURCE := $(SRCDIR)/winaccessibility/source/UAccCOMIDL
+
+# We cannot depend on *.tlb because they only produced by IDL compiler
+# if idl contains 'library' statement.
+$(call gb_CustomTarget_get_target,winaccessibility/ia2/idl) : \
+ $(wina11y_COMIDLDIR)/Accessible2.h \
+ $(wina11y_COMIDLDIR)/AccessibleAction.h \
+ $(wina11y_COMIDLDIR)/AccessibleApplication.h \
+ $(wina11y_COMIDLDIR)/AccessibleComponent.h \
+ $(wina11y_COMIDLDIR)/AccessibleEditableText.h \
+ $(wina11y_COMIDLDIR)/AccessibleEventId.h \
+ $(wina11y_COMIDLDIR)/AccessibleHyperlink.h \
+ $(wina11y_COMIDLDIR)/AccessibleHypertext.h \
+ $(wina11y_COMIDLDIR)/AccessibleImage.h \
+ $(wina11y_COMIDLDIR)/AccessibleKeyBinding.h \
+ $(wina11y_COMIDLDIR)/AccessibleKeyStroke.h \
+ $(wina11y_COMIDLDIR)/AccessibleRelation.h \
+ $(wina11y_COMIDLDIR)/AccessibleRole.h \
+ $(wina11y_COMIDLDIR)/AccessibleStates.h \
+ $(wina11y_COMIDLDIR)/AccessibleTable.h \
+ $(wina11y_COMIDLDIR)/AccessibleText.h \
+ $(wina11y_COMIDLDIR)/AccessibleValue.h \
+ $(wina11y_COMIDLDIR)/Charset.h \
+ $(wina11y_COMIDLDIR)/IA2CommonTypes.h \
+ $(wina11y_COMIDLDIR)/IA2TypeLibrary.h \
+ $(wina11y_COMIDLDIR)/UAccCOM.h \
+ $(wina11y_COMIDLDIR)/defines.h
+
+$(wina11y_COMIDLDIR)/%.h : $(wina11y_SOURCE)/%.idl \
+ | $(wina11y_COMIDLDIR)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ midl.exe \
+ -tlb $(wina11y_COMIDLDIR)/$*.tlb \
+ -h $(wina11y_COMIDLDIR)/$*.h \
+ -iid $(wina11y_COMIDLDIR)/$*_i.c \
+ -dlldata $(wina11y_COMIDLDIR)/dlldata.c \
+ -proxy $(wina11y_COMIDLDIR)/$*_p.c \
+ -Oicf \
+ $(SOLARINC) \
+ -I $(wina11y_SOURCE) \
+ $<)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/winaccessibility/Makefile b/winaccessibility/Makefile
new file mode 100644
index 0000000..0997e62
--- /dev/null
+++ b/winaccessibility/Makefile
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; 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/.
+#
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk
new file mode 100755
index 0000000..efd7b3e
--- /dev/null
+++ b/winaccessibility/Module_winaccessibility.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; 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_Module_Module,winaccessibility))
+
+ifeq ($(OS),WNT)
+ifeq ($(COM),MSC)
+ifneq ($(ENABLE_IA2),)
+$(eval $(call gb_Module_add_targets,winaccessibility,\
+ CustomTarget_ia2_idl \
+))
+endif # ENABLE_IA2
+endif # COM=MSC
+endif # WNT
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
commit c60e6a6da74a06da0451a448c753a1518bb1ee20
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sat Nov 2 11:01:44 2013 +0100
Add --enable-ia2 configuration option
Change-Id: I950c47bd95d5bb4aacf9e584c8e2eeef461af71f
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
old mode 100644
new mode 100755
index e5e090c..5f2aa17
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_l10n_targets,accessibility,\
AllLangResTarget_acc \
))
+ifneq ($(ENABLE_IA2),TRUE)
ifneq ($(ENABLE_JAVA),)
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,accessibility,\
@@ -27,5 +28,6 @@ $(eval $(call gb_Module_add_targets,accessibility,\
))
endif
endif
+endif
# vim:set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
old mode 100644
new mode 100755
index 42bc002..dc1b454
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -123,6 +123,7 @@ export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
export ENABLE_ORCUS=@ENABLE_ORCUS@
export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
+export ENABLE_IA2=@ENABLE_IA2@
export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
export ENABLE_GTK3=@ENABLE_GTK3@
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index 7218fb8..919749a
--- a/configure.ac
+++ b/configure.ac
@@ -1309,6 +1309,11 @@ AC_ARG_ENABLE(library-bin-tar,
for the next time.]),
)
+AC_ARG_ENABLE(ia2,
+ AS_HELP_STRING([--enable-ia2],
+ [Enable the Windows IAccessibility2. Disables Java Accessibility Bridge.]),
+,)
+
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@@ -11558,6 +11563,21 @@ fi
AC_SUBST(ENABLE_ONLINE_UPDATE)
dnl ===================================================================
+dnl Test whether to enable ia2
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable IA2])
+ENABLE_IA2=
+if test "$enable_ia2" = "yes"; then
+ if test "$_os" = "WINNT"; then
+ AC_MSG_RESULT([yes])
+ ENABLE_IA2="TRUE"
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(ENABLE_IA2)
+
+dnl ===================================================================
dnl Test whether to create MSI with LIMITUI=1 (silent install)
dnl ===================================================================
AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)])
More information about the Libreoffice-commits
mailing list