Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h Sun Nov 3 15:42:11 2013 @@ -34,9 +34,6 @@ #ifndef __ACCCOMMON_H_ #include "acccommon.h" #endif -#ifndef __AccessibleApplication_h__ -#include "AccessibleApplication.h" -#endif #ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> #endif
Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp Sun Nov 3 15:42:11 2013 @@ -25,17 +25,7 @@ #include "UAccCOM2.h" #include "UAccCOM_i.c" -#include "Accessible2_i.c" -#include "AccessibleComponent_i.c" -#include "AccessibleText_i.c" -#include "AccessibleEditableText_i.c" -#include "AccessibleImage_i.c" -#include "AccessibleTable_i.c" -#include "AccessibleAction_i.c" -#include "AccessibleValue_i.c" -#include "AccessibleHyperText_i.c" -#include "AccessibleRelation_i.c" -#include "AccessibleHyperLink_i.c" +#include "ia2_api_all_i.c" #include "MAccessible.h" #include "EnumVariant.h" Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk Sun Nov 3 15:42:11 2013 @@ -97,24 +97,20 @@ EXCEPTIONSFILES= \ SHL1TARGET=$(TARGET) SHL1STDLIBS=\ - oleacc.lib\ - icuuc.lib\ - icuin.lib\ + $(ICUUCLIB)\ + $(ICUINLIB)\ $(CPPULIB)\ $(VCLLIB) \ $(SALLIB)\ - kernel32.lib \ - user32.lib \ - advapi32.lib \ - ole32.lib \ - oleaut32.lib \ - delayimp.lib \ - shlwapi.lib \ - uuid.lib + $(KERNEL32LIB) \ + $(USER32LIB) \ + $(ADVAPI32LIB) \ + $(OLE32LIB) \ + $(OLEAUT32LIB) \ + $(SHLWAPILIB) \ + $(UUIDLIB) \ + oleacc.lib -LINKFLAGS += /delayload:sal3.dll \ - /delayload:cppu3.dll - .IF "$(COM)"!="GCC" .IF "$(CCNUMVER)" > "001300000000" .IF "$(USE_STLP_DEBUG)" != "" @@ -136,3 +132,11 @@ DEF1NAME= $(TARGET) # --- Targets ---------------------------------- .INCLUDE : target.mk + +ALLTAR : \ + $(MISC)/$(TARGET).manifest \ + +$(MISC)/$(TARGET).manifest: $(BIN)$/$(TARGET)$(DLLPOST) + cat *.rgs > $(MISC)$/$(TARGET).rgs + mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb -dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest + mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97 \ No newline at end of file Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl Sun Nov 3 15:42:11 2013 @@ -21,19 +21,9 @@ import "oaidl.idl"; import "ocidl.idl"; -import "Accessible2.idl"; + +import "ia2_api_all.idl"; import "defines.idl"; -import "AccessibleComponent.idl"; -import "AccessibleAction.idl"; -import "AccessibleRelation.idl"; -import "AccessibleTable.idl"; -import "AccessibleText.idl"; -import "AccessibleHyperlink.idl"; -import "AccessibleEditableText.idl"; -import "AccessibleValue.idl"; -import "AccessibleImage.idl"; -import "AccessibleValue.idl"; -import "AccessibleHypertext.idl"; [ object, Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk Sun Nov 3 15:42:11 2013 @@ -31,193 +31,68 @@ TARGET=UAccComIDL # --- Targets ---------------------------------- -ALL : $(MISC)$/Accessible2 \ - $(MISC)$/AccessibleAction \ - $(MISC)$/AccessibleApplication \ - $(MISC)$/AccessibleComponent \ - $(MISC)$/AccessibleEditableText \ - $(MISC)$/AccessibleEventId \ - $(MISC)$/AccessibleHyperlink \ - $(MISC)$/AccessibleHypertext \ - $(MISC)$/AccessibleImage \ +ALL : $(MISC)$/ia2_api_all \ $(MISC)$/AccessibleKeyBinding \ $(MISC)$/AccessibleKeyStroke \ - $(MISC)$/AccessibleRelation \ - $(MISC)$/AccessibleRole \ - $(MISC)$/AccessibleStates \ - $(MISC)$/AccessibleTable \ - $(MISC)$/AccessibleText \ - $(MISC)$/AccessibleValue \ $(MISC)$/Charset \ $(MISC)$/defines \ - $(MISC)$/IA2CommonTypes \ - $(MISC)$/IA2TypeLibrary \ $(MISC)$/UAccCOM MTL=midl.exe MTL_PROJ= -SOURCE=Accessible2.idl -SOURCE1=AccessibleAction.idl -SOURCE2=AccessibleApplication.idl -SOURCE3=AccessibleComponent.idl -SOURCE4=AccessibleEditableText.idl -SOURCE5=AccessibleEventId.idl -SOURCE6=AccessibleHyperlink.idl -SOURCE7=AccessibleHypertext.idl -SOURCE8=AccessibleImage.idl -SOURCE9=AccessibleKeyBinding.idl -SOURCE10=AccessibleKeyStroke.idl -SOURCE11=AccessibleRelation.idl -SOURCE12=AccessibleRole.idl -SOURCE13=AccessibleStates.idl -SOURCE14=AccessibleTable.idl -SOURCE15=AccessibleText.idl -SOURCE16=AccessibleValue.idl -SOURCE17=Charset.idl -SOURCE18=defines.idl -SOURCE19=IA2CommonTypes.idl -SOURCE20=IA2TypeLibrary.idl -SOURCE21=UAccCOM.idl - -MTL_SWITCHES=-tlb $(MISC)$/Accessible2.tlb -h $(MISC)$/Accessible2.h -iid $(MISC)$/Accessible2_i.c -proxy $(MISC)$/Accessible2_p.c -Oicf -MTL_SWITCHES1=-tlb $(MISC)$/AccessibleAction.tlb -h $(MISC)$/AccessibleAction.h -iid $(MISC)$/AccessibleAction_i.c -proxy $(MISC)$/AccessibleAction_p.c -Oicf -MTL_SWITCHES2=-tlb $(MISC)$/AccessibleApplication.tlb -h $(MISC)$/AccessibleApplication.h -iid $(MISC)$/AccessibleApplication_i.c -proxy $(MISC)$/AccessibleApplication_p.c -Oicf -MTL_SWITCHES3=-tlb $(MISC)$/AccessibleComponent.tlb -h $(MISC)$/AccessibleComponent.h -iid $(MISC)$/AccessibleComponent_i.c -proxy $(MISC)$/AccessibleComponent_p.c -Oicf -MTL_SWITCHES4=-tlb $(MISC)$/AccessibleEditableText.tlb -h $(MISC)$/AccessibleEditableText.h -iid $(MISC)$/AccessibleEditableText_i.c -proxy $(MISC)$/AccessibleEditableText_p.c -Oicf -MTL_SWITCHES5=-tlb $(MISC)$/AccessibleEventId.tlb -h $(MISC)$/AccessibleEventId.h -iid $(MISC)$/AccessibleEventId_i.c -proxy $(MISC)$/AccessibleEventId_p.c -Oicf -MTL_SWITCHES6=-tlb $(MISC)$/AccessibleHyperlink.tlb -h $(MISC)$/AccessibleHyperlink.h -iid $(MISC)$/AccessibleHyperlink_i.c -proxy $(MISC)$/AccessibleHyperlink_p.c -Oicf -MTL_SWITCHES7=-tlb $(MISC)$/AccessibleHypertext.tlb -h $(MISC)$/AccessibleHypertext.h -iid $(MISC)$/AccessibleHypertext_i.c -proxy $(MISC)$/AccessibleHypertext_p.c -Oicf -MTL_SWITCHES8=-tlb $(MISC)$/AccessibleImage.tlb -h $(MISC)$/AccessibleImage.h -iid $(MISC)$/AccessibleImage_i.c -proxy $(MISC)$/AccessibleImage_p.c -Oicf -MTL_SWITCHES9=-tlb $(MISC)$/AccessibleKeyBinding.tlb -h $(MISC)$/AccessibleKeyBinding.h -iid $(MISC)$/AccessibleKeyBinding_i.c -proxy $(MISC)$/AccessibleKeyBinding_p.c -Oicf -MTL_SWITCHES10=-tlb $(MISC)$/AccessibleKeyStroke.tlb -h $(MISC)$/AccessibleKeyStroke.h -iid $(MISC)$/AccessibleKeyStroke_i.c -proxy $(MISC)$/AccessibleKeyStroke_p.c -Oicf -MTL_SWITCHES11=-tlb $(MISC)$/AccessibleRelation.tlb -h $(MISC)$/AccessibleRelation.h -iid $(MISC)$/AccessibleRelation_i.c -proxy $(MISC)$/AccessibleRelation_p.c -Oicf -MTL_SWITCHES12=-tlb $(MISC)$/AccessibleRole.tlb -h $(MISC)$/AccessibleRole.h -iid $(MISC)$/AccessibleRole_i.c -proxy $(MISC)$/AccessibleRole_p.c -Oicf -MTL_SWITCHES13=-tlb $(MISC)$/AccessibleStates.tlb -h $(MISC)$/AccessibleStates.h -iid $(MISC)$/AccessibleStates_i.c -proxy $(MISC)$/AccessibleStates_p.c -Oicf -MTL_SWITCHES14=-tlb $(MISC)$/AccessibleTable.tlb -h $(MISC)$/AccessibleTable.h -iid $(MISC)$/AccessibleTable_i.c -proxy $(MISC)$/AccessibleTable_p.c -Oicf -MTL_SWITCHES15=-tlb $(MISC)$/AccessibleText.tlb -h $(MISC)$/AccessibleText.h -iid $(MISC)$/AccessibleText_i.c -proxy $(MISC)$/AccessibleText_p.c -Oicf -MTL_SWITCHES16=-tlb $(MISC)$/AccessibleValue.tlb -h $(MISC)$/AccessibleValue.h -iid $(MISC)$/AccessibleValue_i.c -proxy $(MISC)$/AccessibleValue_p.c -Oicf -MTL_SWITCHES17=-tlb $(MISC)$/Charset.tlb -h $(MISC)$/Charset.h -iid $(MISC)$/Charset_i.c -proxy $(MISC)$/Charset_p.c -Oicf -MTL_SWITCHES18=-tlb $(MISC)$/defines.tlb -h $(MISC)$/defines.h -iid $(MISC)$/defines_i.c -proxy $(MISC)$/defines_p.c -Oicf -MTL_SWITCHES19=-tlb $(MISC)$/IA2CommonTypes.tlb -h $(MISC)$/IA2CommonTypes.h -iid $(MISC)$/IA2CommonTypes_i.c -proxy $(MISC)$/IA2CommonTypes_p.c -Oicf -MTL_SWITCHES20=-tlb $(MISC)$/IA2TypeLibrary.tlb -h $(MISC)$/IA2TypeLibrary.h -iid $(MISC)$/IA2TypeLibrary_i.c -proxy $(MISC)$/IA2TypeLibrary_p.c -Oicf -MTL_SWITCHES21=-tlb $(MISC)$/UAccCOM.tlb -h $(MISC)$/UAccCOM.h -iid $(MISC)$/UAccCOM_i.c -proxy $(MISC)$/UAccCOM_p.c -Oicf +SOURCE=AccessibleKeyBinding.idl +SOURCE1=AccessibleKeyStroke.idl +SOURCE2=Charset.idl +SOURCE3=defines.idl +SOURCE4=UAccCOM.idl +SOURCE5=ia2_api_all.idl + +MTL_SWITCHES=-tlb $(MISC)$/AccessibleKeyBinding.tlb -h $(MISC)$/AccessibleKeyBinding.h -iid $(MISC)$/AccessibleKeyBinding_i.c -proxy $(MISC)$/AccessibleKeyBinding_p.c -Oicf +MTL_SWITCHES1=-tlb $(MISC)$/AccessibleKeyStroke.tlb -h $(MISC)$/AccessibleKeyStroke.h -iid $(MISC)$/AccessibleKeyStroke_i.c -proxy $(MISC)$/AccessibleKeyStroke_p.c -Oicf +MTL_SWITCHES2=-tlb $(MISC)$/Charset.tlb -h $(MISC)$/Charset.h -iid $(MISC)$/Charset_i.c -proxy $(MISC)$/Charset_p.c -Oicf +MTL_SWITCHES3=-tlb $(MISC)$/defines.tlb -h $(MISC)$/defines.h -iid $(MISC)$/defines_i.c -proxy $(MISC)$/defines_p.c -Oicf +MTL_SWITCHES4=-tlb $(MISC)$/UAccCOM.tlb -h $(MISC)$/UAccCOM.h -iid $(MISC)$/UAccCOM_i.c -proxy $(MISC)$/UAccCOM_p.c -Oicf +MTL_SWITCHES5=-tlb $(MISC)$/ia2_api_all.tlb -h $(MISC)$/ia2_api_all.h -iid $(MISC)$/ia2_api_all_i.c -proxy $(MISC)$/ia2_api_all_p.c -Oicf .IF "$(COM)"=="GCC" -MTL_SWITCHES+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES1+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES2+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES3+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES4+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES5+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES6+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES7+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES8+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES9+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES10+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES11+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES12+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES13+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES14+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES15+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES16+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES17+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES18+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES19+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES20+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -MTL_SWITCHES21+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" -$(MISC)$/Accessible2 : $(SOURCE) +MTL_SWITCHESCOMMON=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" +MTL_SWITCHES+=MTL_SWITCHESCOMMON +MTL_SWITCHES1+=MTL_SWITCHESCOMMON +MTL_SWITCHES2+=MTL_SWITCHESCOMMON +MTL_SWITCHES3+=MTL_SWITCHESCOMMON +MTL_SWITCHES4+=MTL_SWITCHESCOMMON +MTL_SWITCHES5+=MTL_SWITCHESCOMMON + +$(MISC)$/AccessibleKeyBinding : $(SOURCE) $(MTL) $(MTL_SWITCHES) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE) -$(MISC)$/AccessibleAction : $(SOURCE1) +$(MISC)$/AccessibleKeyStroke : $(SOURCE1) $(MTL) $(MTL_SWITCHES1) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE1) -$(MISC)$/AccessibleApplication : $(SOURCE2) - $(MTL) $(MTL_SWITCHES2) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE2) -$(MISC)$/AccessibleComponent : $(SOURCE3) - $(MTL) $(MTL_SWITCHES3) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE3) -$(MISC)$/AccessibleEditableText : $(SOURCE4) - $(MTL) $(MTL_SWITCHES4) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE4) -$(MISC)$/AccessibleEventId : $(SOURCE5) - $(MTL) $(MTL_SWITCHES5) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE5) -$(MISC)$/AccessibleHyperlink : $(SOURCE6) - $(MTL) $(MTL_SWITCHES6) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE6) -$(MISC)$/AccessibleHypertext : $(SOURCE7) - $(MTL) $(MTL_SWITCHES7) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE7) -$(MISC)$/AccessibleImage : $(SOURCE8) - $(MTL) $(MTL_SWITCHES8) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE8) -$(MISC)$/AccessibleKeyBinding : $(SOURCE9) - $(MTL) $(MTL_SWITCHES9) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE9) -$(MISC)$/AccessibleKeyStroke : $(SOURCE10) - $(MTL) $(MTL_SWITCHES10) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE10) -$(MISC)$/AccessibleRelation : $(SOURCE11) - $(MTL) $(MTL_SWITCHES11) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE11) -$(MISC)$/AccessibleRole : $(SOURCE12) - $(MTL) $(MTL_SWITCHES12) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE12) -$(MISC)$/AccessibleStates : $(SOURCE13) - $(MTL) $(MTL_SWITCHES13) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE13) -$(MISC)$/AccessibleTable : $(SOURCE14) - $(MTL) $(MTL_SWITCHES14) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE14) -$(MISC)$/AccessibleText : $(SOURCE15) - $(MTL) $(MTL_SWITCHES15) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE15) -$(MISC)$/AccessibleValue : $(SOURCE16) - $(MTL) $(MTL_SWITCHES16) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE16) -$(MISC)$/Charset : $(SOURCE17) - $(MTL) $(MTL_SWITCHES17) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE17) -$(MISC)$/defines : $(SOURCE18) - $(MTL) $(MTL_SWITCHES18) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE18) -$(MISC)$/IA2CommonTypes : $(SOURCE19) - $(MTL) $(MTL_SWITCHES19) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE19) -$(MISC)$/IA2TypeLibrary : $(SOURCE20) - $(MTL) $(MTL_SWITCHES20) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE20) -$(MISC)$/UAccCOM : $(SOURCE21) - $(MTL) $(MTL_SWITCHES21) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE21) +$(MISC)$/Charset : $(SOURCE2) + $(MTL) $(MTL_SWITCHES2) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE2) +$(MISC)$/defines : $(SOURCE3) + $(MTL) $(MTL_SWITCHES3) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE3) +$(MISC)$/UAccCOM : $(SOURCE4) + $(MTL) $(MTL_SWITCHES4) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE4) +$(MISC)$/ia2_api_all : $(SOURCE5) + $(MTL) $(MTL_SWITCHES5) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE5) .ELSE -$(MISC)$/Accessible2 : $(SOURCE) + +$(MISC)$/AccessibleKeyBinding : $(SOURCE) $(WRAPCMD) $(MTL) $(MTL_SWITCHES) $(INCLUDE) $(SOURCE) && $(TOUCH) $@ -$(MISC)$/AccessibleAction : $(SOURCE1) +$(MISC)$/AccessibleKeyStroke : $(SOURCE1) $(WRAPCMD) $(MTL) $(MTL_SWITCHES1) $(INCLUDE) $(SOURCE1) && $(TOUCH) $@ -$(MISC)$/AccessibleApplication : $(SOURCE2) +$(MISC)$/Charset : $(SOURCE2) $(WRAPCMD) $(MTL) $(MTL_SWITCHES2) $(INCLUDE) $(SOURCE2) && $(TOUCH) $@ -$(MISC)$/AccessibleComponent : $(SOURCE3) +$(MISC)$/defines : $(SOURCE3) $(WRAPCMD) $(MTL) $(MTL_SWITCHES3) $(INCLUDE) $(SOURCE3) && $(TOUCH) $@ -$(MISC)$/AccessibleEditableText : $(SOURCE4) +$(MISC)$/UAccCOM : $(SOURCE4) $(WRAPCMD) $(MTL) $(MTL_SWITCHES4) $(INCLUDE) $(SOURCE4) && $(TOUCH) $@ -$(MISC)$/AccessibleEventId : $(SOURCE5) +$(MISC)$/ia2_api_all : $(SOURCE5) $(WRAPCMD) $(MTL) $(MTL_SWITCHES5) $(INCLUDE) $(SOURCE5) && $(TOUCH) $@ -$(MISC)$/AccessibleHyperlink : $(SOURCE6) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES6) $(INCLUDE) $(SOURCE6) && $(TOUCH) $@ -$(MISC)$/AccessibleHypertext : $(SOURCE7) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES7) $(INCLUDE) $(SOURCE7) && $(TOUCH) $@ -$(MISC)$/AccessibleImage : $(SOURCE8) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES8) $(INCLUDE) $(SOURCE8) && $(TOUCH) $@ -$(MISC)$/AccessibleKeyBinding : $(SOURCE9) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES9) $(INCLUDE) $(SOURCE9) && $(TOUCH) $@ -$(MISC)$/AccessibleKeyStroke : $(SOURCE10) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES10) $(INCLUDE) $(SOURCE10) && $(TOUCH) $@ -$(MISC)$/AccessibleRelation : $(SOURCE11) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES11) $(INCLUDE) $(SOURCE11) && $(TOUCH) $@ -$(MISC)$/AccessibleRole : $(SOURCE12) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES12) $(INCLUDE) $(SOURCE12) && $(TOUCH) $@ -$(MISC)$/AccessibleStates : $(SOURCE13) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES13) $(INCLUDE) $(SOURCE13) && $(TOUCH) $@ -$(MISC)$/AccessibleTable : $(SOURCE14) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES14) $(INCLUDE) $(SOURCE14) && $(TOUCH) $@ -$(MISC)$/AccessibleText : $(SOURCE15) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES15) $(INCLUDE) $(SOURCE15) && $(TOUCH) $@ -$(MISC)$/AccessibleValue : $(SOURCE16) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES16) $(INCLUDE) $(SOURCE16) && $(TOUCH) $@ -$(MISC)$/Charset : $(SOURCE17) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES17) $(INCLUDE) $(SOURCE17) && $(TOUCH) $@ -$(MISC)$/defines : $(SOURCE18) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES18) $(INCLUDE) $(SOURCE18) && $(TOUCH) $@ -$(MISC)$/IA2CommonTypes : $(SOURCE19) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES19) $(INCLUDE) $(SOURCE19) && $(TOUCH) $@ -$(MISC)$/IA2TypeLibrary : $(SOURCE20) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES20) $(INCLUDE) $(SOURCE20) && $(TOUCH) $@ -$(MISC)$/UAccCOM : $(SOURCE21) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES21) $(INCLUDE) $(SOURCE21) && $(TOUCH) $@ .ENDIF .ENDIF Modified: openoffice/branches/ia2/main/winaccessibility/source/service/AccObject.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/AccObject.cxx?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/service/AccObject.cxx (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/AccObject.cxx Sun Nov 3 15:42:11 2013 @@ -37,8 +37,8 @@ #include "AccEventListener.hxx" #include "UAccCOM_i.c" #include "AccResource.hxx" -#include "AccessibleRole.h" +#include "act.hxx" using namespace std; using namespace com::sun::star::uno; @@ -154,9 +154,11 @@ void AccObject::UpdateValidWindow() */ sal_Bool AccObject::ImplInitilizeCreateObj() { + ActivateActContext(); HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL , IID_IMAccessible, (void **)&m_pIMAcc); + DeactivateActContext(); if ( S_OK != hr ) { Modified: openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectWinManager.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectWinManager.cxx?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectWinManager.cxx (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectWinManager.cxx Sun Nov 3 15:42:11 2013 @@ -44,9 +44,6 @@ #include "AccTreeEventListener.hxx" #include "AccTableEventListener.hxx" #include "AccObject.hxx" -#include "AccessibleEventId.h" -#include "AccessibleApplication.h" -#include "AccessibleApplication_i.c" #include "unomsaaevent.hxx" #include "checkmt.hxx" @@ -90,7 +87,6 @@ AccObjectWinManager::AccObjectWinManager pAgent( Agent ), oldFocus( NULL ) { - m_bBridgeRegistered =IsBridgeRegisteredAcc(); } /** @@ -223,10 +219,6 @@ sal_Bool AccObjectWinManager::NotifyAccE { vos::OGuard aGuard(aNotifyMutex); - if (!m_bBridgeRegistered) - { - return sal_False; - } if (!IsInMainThread()) { return sal_False; @@ -728,10 +720,6 @@ void AccObjectWinManager::InsertAccChild */ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pParentXAcc,HWND pWnd ) { - if (!m_bBridgeRegistered) - { - return sal_False; - } XIdToAccObjHash::iterator itXacc = XIdAccList.find( (void*)pXAcc ); if (itXacc != XIdAccList.end() ) { Modified: openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.cxx?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.cxx (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.cxx Sun Nov 3 15:42:11 2013 @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. * - *************************************************************/ - + *************************************************************/ + #include "checkmt.hxx" #include <vcl/svapp.hxx> @@ -34,7 +34,3 @@ vos::IMutex& GetSolarMutex() { return Application::GetSolarMutex(); } -bool IsBridgeRegisteredAcc() -{ - return IsBridgeRegistered(); -} Modified: openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.hxx?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.hxx (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.hxx Sun Nov 3 15:42:11 2013 @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. * - *************************************************************/ - + *************************************************************/ + #pragma once #include <vos/mutex.hxx> @@ -26,4 +26,3 @@ bool IsInMainThread(); vos::IMutex& GetSolarMutex(); -bool IsBridgeRegisteredAcc(); Modified: openoffice/branches/ia2/main/winaccessibility/source/service/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/makefile.mk?rev=1538382&r1=1538381&r2=1538382&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/service/makefile.mk (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/makefile.mk Sun Nov 3 15:42:11 2013 @@ -77,16 +77,16 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(TOOLSLIB) \ $(TKLIB) \ - uwinapi.lib \ - gdi32.lib \ - winspool.lib \ - ole32.lib \ - shell32.lib \ - advapi32.lib \ - imm32.lib \ - uuid.lib \ - oleacc.lib \ $(VOSLIB) \ + $(UWINAPILIB) \ + $(GDI32LIB) \ + $(WINSPOOLLIB) \ + $(OLE32LIB) \ + $(SHELL32LIB) \ + $(ADVAPI32LIB) \ + $(IMM32LIB) \ + $(UUIDLIB) \ + oleacc.lib SHL1OBJS=$(SLOFILES) SHL1VERSIONOBJ=
