[Libreoffice-commits] core.git: Branch 'feature/ia2' - 6 commits - accessibility/Module_accessibility.mk config_host.mk.in configure.ac include/vcl postprocess/Rdb_services.mk Repository.mk solenv/gbuild 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
Sat Nov 2 23:39:27 CET 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 
 solenv/gbuild/platform/windows.mk                         |    3 
 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/AccAction.cpp             |  120 
 winaccessibility/source/UAccCOM/AccAction.cxx             |  120 
 winaccessibility/source/UAccCOM/AccActionBase.cpp         |  416 -
 winaccessibility/source/UAccCOM/AccActionBase.cxx         |  416 +
 winaccessibility/source/UAccCOM/AccActionBase.h           |    2 
 winaccessibility/source/UAccCOM/AccComponent.cpp          |   72 
 winaccessibility/source/UAccCOM/AccComponent.cxx          |   72 
 winaccessibility/source/UAccCOM/AccComponentBase.cpp      |  213 
 winaccessibility/source/UAccCOM/AccComponentBase.cxx      |  213 
 winaccessibility/source/UAccCOM/AccComponentBase.h        |    2 
 winaccessibility/source/UAccCOM/AccEditableText.cpp       |  508 --
 winaccessibility/source/UAccCOM/AccEditableText.cxx       |  508 ++
 winaccessibility/source/UAccCOM/AccHyperLink.cpp          |  296 -
 winaccessibility/source/UAccCOM/AccHyperLink.cxx          |  296 +
 winaccessibility/source/UAccCOM/AccHypertext.cpp          |  406 -
 winaccessibility/source/UAccCOM/AccHypertext.cxx          |  406 +
 winaccessibility/source/UAccCOM/AccImage.cpp              |  102 
 winaccessibility/source/UAccCOM/AccImage.cxx              |  102 
 winaccessibility/source/UAccCOM/AccRelation.cpp           |  214 
 winaccessibility/source/UAccCOM/AccRelation.cxx           |  214 
 winaccessibility/source/UAccCOM/AccTable.cpp              | 1064 ----
 winaccessibility/source/UAccCOM/AccTable.cxx              | 1064 ++++
 winaccessibility/source/UAccCOM/AccText.cpp               |  282 -
 winaccessibility/source/UAccCOM/AccText.cxx               |  282 +
 winaccessibility/source/UAccCOM/AccTextBase.cpp           |  995 ----
 winaccessibility/source/UAccCOM/AccTextBase.cxx           |  994 ++++
 winaccessibility/source/UAccCOM/AccTextBase.h             |    2 
 winaccessibility/source/UAccCOM/AccValue.cpp              |  224 
 winaccessibility/source/UAccCOM/AccValue.cxx              |  224 
 winaccessibility/source/UAccCOM/CheckEnableAccessible.cpp |   35 
 winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx |   34 
 winaccessibility/source/UAccCOM/EnumVariant.cpp           |  224 
 winaccessibility/source/UAccCOM/EnumVariant.cxx           |  224 
 winaccessibility/source/UAccCOM/EnumVariant.h             |    2 
 winaccessibility/source/UAccCOM/MAccessible.cpp           | 3262 --------------
 winaccessibility/source/UAccCOM/MAccessible.cxx           | 3262 ++++++++++++++
 winaccessibility/source/UAccCOM/Resource.h                |    1 
 winaccessibility/source/UAccCOM/StdAfx.cpp                |   29 
 winaccessibility/source/UAccCOM/StdAfx.cxx                |   29 
 winaccessibility/source/UAccCOM/UAccCOM.cpp               |  119 
 winaccessibility/source/UAccCOM/UAccCOM.cxx               |  119 
 winaccessibility/source/UAccCOM/UAccCOM.def               |    7 
 winaccessibility/source/UAccCOM/UNOXWrapper.cpp           |   27 
 winaccessibility/source/UAccCOM/UNOXWrapper.cxx           |   27 
 winaccessibility/source/UAccCOM/UNOXWrapper.h             |    2 
 winaccessibility/source/service/AccEventListener.cxx      |    8 
 winaccessibility/source/service/AccFrameEventListener.cxx |   10 
 winaccessibility/source/service/AccObjectWinManager.cxx   |   12 
 winaccessibility/source/service/AccTopWindowListener.cxx  |   11 
 winaccessibility/source/service/checkmt.cxx               |    5 
 winaccessibility/source/service/checkmt.hxx               |    5 
 winaccessibility/source/service/msaaservice_impl.cxx      |   14 
 67 files changed, 8984 insertions(+), 8658 deletions(-)

New commits:
commit 903ab3e93ecded38b4ff0e0a85db16226545b750
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Nov 2 20:40:47 2013 +0100

    Gbuildify winaccessibility service
    
    Change-Id: Ia66872bee7c70c840c1bd5caa626bf63eac9ef7c

diff --git a/Repository.mk b/Repository.mk
index d032943..90840bf 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -564,7 +564,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 3f613ed..7d1a98c
--- 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 06d90e3..3f2b874
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -138,8 +138,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 1f824ca..585c846
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -25,7 +25,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;
@@ -47,7 +47,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 89771cd..a7677dc
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -27,7 +27,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"
@@ -95,9 +95,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);
     bool m_bBridgeRegistered;
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 7a9119f..6216ac3 100755
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -38,9 +38,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/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
old mode 100644
new mode 100755
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.def b/winaccessibility/source/UAccCOM/UAccCOM.def
new file mode 100755
index 0000000..575a281
--- /dev/null
+++ b/winaccessibility/source/UAccCOM/UAccCOM.def
@@ -0,0 +1,7 @@
+LIBRARY      "UAccCOM.DLL"
+
+EXPORTS
+	DllCanUnloadNow     PRIVATE
+	DllGetClassObject   PRIVATE
+	DllRegisterServer   PRIVATE
+	DllUnregisterServer	PRIVATE
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
old mode 100644
new mode 100755
index 1925b87..863e38f
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -190,7 +190,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 )
     {
@@ -233,7 +233,7 @@ void AccEventListener::removeMeFromBroadcaster()
 {
     try
     {
-        vos::OGuard aGuard(aRemoveMutex);
+        osl::MutexGuard aGuard(aRemoveMutex);
         if(m_isDisposed)
             return;
         //get accessible context
@@ -261,7 +261,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);
         }
@@ -276,7 +276,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 bec7cac..e775251
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -35,7 +35,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;
@@ -44,9 +45,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)
@@ -117,7 +118,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 8761813..cedd6d8
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -139,7 +139,7 @@ AccObjectWinManager::~AccObjectWinManager()
 
 long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam)
 {
-    vos::OGuard localGuard(maATInterfaceMutex);//
+    osl::MutexGuard localGuard(maATInterfaceMutex);//
 
     IMAccessible* pRetIMAcc = NULL;
 
@@ -221,7 +221,7 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd)
    */
 sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state)
 {
-    vos::OGuard aGuard(aNotifyMutex);
+    osl::MutexGuard aGuard(aNotifyMutex);
 
     if (!m_bBridgeRegistered)
     {
@@ -573,7 +573,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;
@@ -602,7 +602,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);
@@ -806,7 +806,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
         {
@@ -1330,4 +1330,4 @@ bool AccObjectWinManager::IsTopWinAcc( com::sun::star::accessibility::XAccessibl
         bRet = ( pAccObj->GetParentObj() == NULL );
     }
     return bRet;
-}
\ No newline at end of file
+}
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
old mode 100644
new mode 100755
index c853977..9f0ca3a
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -25,7 +25,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;
@@ -34,8 +35,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"
@@ -108,7 +109,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);
 
@@ -184,7 +185,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))
     {
@@ -249,7 +250,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 788f613..be3acc5
--- a/winaccessibility/source/service/checkmt.cxx
+++ b/winaccessibility/source/service/checkmt.cxx
@@ -24,16 +24,17 @@
 
 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();
 }
+
 bool IsBridgeRegisteredAcc()
 {
     return IsBridgeRegistered();
diff --git a/winaccessibility/source/service/checkmt.hxx b/winaccessibility/source/service/checkmt.hxx
old mode 100644
new mode 100755
index 7eaaebf..c52b6d2
--- a/winaccessibility/source/service/checkmt.hxx
+++ b/winaccessibility/source/service/checkmt.hxx
@@ -21,9 +21,10 @@
 
 #pragma once
 
-#include <vos/mutex.hxx>
+#include "comphelper/solarmutex.hxx"
 
 bool IsInMainThread();
 
-vos::IMutex&  GetSolarMutex();
+comphelper::SolarMutex& GetSolarMutex();
+
 bool IsBridgeRegisteredAcc();
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
old mode 100644
new mode 100755
index 3148c97..ff0bebc
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -51,11 +51,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
@@ -274,12 +274,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 253b6d5b504813db3432367a8e8a71e072329c3e
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 b3e21fe..d032943
--- a/Repository.mk
+++ b/Repository.mk
@@ -564,6 +564,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 1a5de4c543fcd19724f079802d9cbc5e2d494039
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 349bd49..48390ce
--- a/winaccessibility/source/UAccCOM/AccActionBase.h
+++ b/winaccessibility/source/UAccCOM/AccActionBase.h
@@ -30,8 +30,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 6eed578..ee7294d
--- a/winaccessibility/source/UAccCOM/AccComponentBase.h
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.h
@@ -30,8 +30,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 1eb2615..a108a8c
--- a/winaccessibility/source/UAccCOM/AccRelation.cxx
+++ b/winaccessibility/source/UAccCOM/AccRelation.cxx
@@ -204,11 +204,11 @@ 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("");
 }
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx
old mode 100644
new mode 100755
index 6b7a38f..6d60776
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -24,7 +24,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 3e22ba0..adef380
--- a/winaccessibility/source/UAccCOM/AccTextBase.h
+++ b/winaccessibility/source/UAccCOM/AccTextBase.h
@@ -30,8 +30,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 fa61021..5bdc15c
--- a/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
@@ -19,7 +19,6 @@
  *
  *************************************************************/
 
-#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 1089abd..daf2772
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -22,8 +22,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 6216ac3..7a9119f
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -38,9 +38,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 a4df8cd..b23c2b3
--- a/winaccessibility/source/UAccCOM/Resource.h
+++ b/winaccessibility/source/UAccCOM/Resource.h
@@ -23,7 +23,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 c80eb20..39757dd
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -22,8 +22,6 @@
 #ifndef __UNOXWRAPPER_H_
 #define __UNOXWRAPPER_H_
 
-#define WNT
-
 #include "resource.h"       // main symbols
 
 
commit cd3a8aa5b515112c2c651831c4f6d31e6c5318cb
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Nov 2 15:22:17 2013 +0100

    Rename the file to have cxx extension
    
    Change-Id: I3b4f2d1de39c27066dc9573e6f22d1646c2eade2

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
old mode 100644
new mode 100755
index bc2dad1..2ae2fb1
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -18,7 +18,8 @@ gb_Helper_LIBRARY_PATH_VAR := PATH
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
 gb_OSDEFS := \
-	-DWINVER=0x0500 \
+	-D_WIN32_WINNT=0x0502 \
+	-DWINVER=0x0502 \
 	-D_WIN32_IE=0x0500 \
 	-DWIN32 \
 	-DWNT \
diff --git a/winaccessibility/source/UAccCOM/AccAction.cpp b/winaccessibility/source/UAccCOM/AccAction.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccAction.cpp
rename to winaccessibility/source/UAccCOM/AccAction.cxx
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cpp b/winaccessibility/source/UAccCOM/AccActionBase.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccActionBase.cpp
rename to winaccessibility/source/UAccCOM/AccActionBase.cxx
diff --git a/winaccessibility/source/UAccCOM/AccComponent.cpp b/winaccessibility/source/UAccCOM/AccComponent.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccComponent.cpp
rename to winaccessibility/source/UAccCOM/AccComponent.cxx
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.cpp b/winaccessibility/source/UAccCOM/AccComponentBase.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccComponentBase.cpp
rename to winaccessibility/source/UAccCOM/AccComponentBase.cxx
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cpp b/winaccessibility/source/UAccCOM/AccEditableText.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccEditableText.cpp
rename to winaccessibility/source/UAccCOM/AccEditableText.cxx
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cpp b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccHyperLink.cpp
rename to winaccessibility/source/UAccCOM/AccHyperLink.cxx
diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cpp b/winaccessibility/source/UAccCOM/AccHypertext.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccHypertext.cpp
rename to winaccessibility/source/UAccCOM/AccHypertext.cxx
diff --git a/winaccessibility/source/UAccCOM/AccImage.cpp b/winaccessibility/source/UAccCOM/AccImage.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccImage.cpp
rename to winaccessibility/source/UAccCOM/AccImage.cxx
diff --git a/winaccessibility/source/UAccCOM/AccRelation.cpp b/winaccessibility/source/UAccCOM/AccRelation.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccRelation.cpp
rename to winaccessibility/source/UAccCOM/AccRelation.cxx
diff --git a/winaccessibility/source/UAccCOM/AccTable.cpp b/winaccessibility/source/UAccCOM/AccTable.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccTable.cpp
rename to winaccessibility/source/UAccCOM/AccTable.cxx
diff --git a/winaccessibility/source/UAccCOM/AccText.cpp b/winaccessibility/source/UAccCOM/AccText.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccText.cpp
rename to winaccessibility/source/UAccCOM/AccText.cxx
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cpp b/winaccessibility/source/UAccCOM/AccTextBase.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccTextBase.cpp
rename to winaccessibility/source/UAccCOM/AccTextBase.cxx
diff --git a/winaccessibility/source/UAccCOM/AccValue.cpp b/winaccessibility/source/UAccCOM/AccValue.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/AccValue.cpp
rename to winaccessibility/source/UAccCOM/AccValue.cxx
diff --git a/winaccessibility/source/UAccCOM/CheckEnableAccessible.cpp b/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/CheckEnableAccessible.cpp
rename to winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cpp b/winaccessibility/source/UAccCOM/EnumVariant.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/EnumVariant.cpp
rename to winaccessibility/source/UAccCOM/EnumVariant.cxx
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cpp b/winaccessibility/source/UAccCOM/MAccessible.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/MAccessible.cpp
rename to winaccessibility/source/UAccCOM/MAccessible.cxx
diff --git a/winaccessibility/source/UAccCOM/StdAfx.cpp b/winaccessibility/source/UAccCOM/StdAfx.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/StdAfx.cpp
rename to winaccessibility/source/UAccCOM/StdAfx.cxx
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cpp b/winaccessibility/source/UAccCOM/UAccCOM.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/UAccCOM.cpp
rename to winaccessibility/source/UAccCOM/UAccCOM.cxx
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.cpp b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
similarity index 100%
rename from winaccessibility/source/UAccCOM/UNOXWrapper.cpp
rename to winaccessibility/source/UAccCOM/UNOXWrapper.cxx
commit 705e9fd454e17e7e2a7b8d53bc7f260a436d53b4
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 46813640423b9af5d5e99b9520f23a4585a0af19
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 f6615b8..155f0a0
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,accessibility,\
     Library_acc \
 ))
 
+ifneq ($(ENABLE_IA2),TRUE)
 ifneq ($(ENABLE_JAVA),)
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,accessibility,\
@@ -24,5 +25,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 7c59597..50e0e14
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -121,6 +121,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 e7f7812f..b994ae3
--- a/configure.ac
+++ b/configure.ac
@@ -1304,6 +1304,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 ===================================================================
@@ -11574,6 +11579,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