Module_ooo.mk
| 1
Repository.mk
| 2
accessibility/AllLangResTarget_acc.mk
| 34 --
accessibility/Ant_java_uno_accessbridge.mk
| 29 ++
accessibility/Library_acc.mk
| 142 ++++++++++
accessibility/Library_java_uno_accessbridge.mk
| 61 ++++
accessibility/Makefile
| 32 ++
accessibility/Module_accessibility.mk
| 39 ++
accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
| 111 -------
accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
| 4
accessibility/bridge/source/java/exports.dxp
| 4
accessibility/bridge/source/java/makefile.mk
| 66 ----
accessibility/inc/accessibility/helper/acc_factory.hxx
| 5
accessibility/inc/accessibility/helper/accessibilitydllapi.h
| 37 ++
accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx
| 25 +
accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx
| 33 ++
accessibility/java/java_uno_accessbridge/build.xml
| 67 ++++
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/java_uno_accessbridge.component
| 28 +
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java.old
| 20 -
accessibility/prj/build.lst
| 18 -
accessibility/prj/d.lst
| 8
accessibility/prj/makefile.mk
| 41 +-
accessibility/source/extended/makefile.mk
| 77 -----
accessibility/source/standard/makefile.mk
| 74 -----
accessibility/util/makefile.mk
| 82 -----
postprocess/packcomponents/makefile.mk
| 2
26 files changed, 547 insertions(+), 495 deletions(-)
New commits:
commit 41624b9b261a22a0e6f1d9848cdb8456dd4dfb6c
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Tue Nov 27 19:21:36 2018 +0000
Commit: Damjan Jovanovic <dam...@apache.org>
CommitDate: Tue Nov 27 19:21:36 2018 +0000
Complete my previous patch.
Patch by: me
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index 5c823b6f9b6b..28b42bc52479 100644
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,18 +1,2 @@
ac accessibility : L10N:l10n tools jurt offapi unoil vcl
javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
-ac accessibility usr1 -
all ac_mkout NULL
-ac accessibility\inc nmake -
all ac_inc NULL
-ac accessibility\bridge\org\openoffice\java\accessibility nmake -
w ac_ooja ac_inc NULL
-ac accessibility\bridge\org\openoffice\accessibility nmake -
w ac_ooa ac_ooja.w ac_inc NULL
-ac accessibility\bridge\source\java nmake -
w ac_ooan ac_ooa.w ac_inc NULL
-ac accessibility\inc get - all
ac_inc NULL
-ac accessibility\source\helper nmake - all
ac_helper ac_inc NULL
-ac accessibility\source\standard nmake - all
ac_standard ac_helper ac_inc NULL
-ac accessibility\source\extended nmake - all
ac_extended ac_inc NULL
-ac accessibility\util nmake - all
ac_util ac_helper ac_standard ac_extended NULL
-ac accessibility\workben\org\openoffice\accessibility\awb nmake -
all ac_awb_main ac_awb_misc ac_awb_canvas ac_awb_view ac_awb_tree NULL
-ac accessibility\workben\org\openoffice\accessibility\misc nmake -
all ac_awb_misc NULL
-ac accessibility\workben\org\openoffice\accessibility\awb\canvas nmake -
all ac_awb_canvas ac_awb_tree NULL
-ac accessibility\workben\org\openoffice\accessibility\awb\tree nmake -
all ac_awb_tree ac_awb_misc NULL
-ac accessibility\workben\org\openoffice\accessibility\awb\view nmake -
all ac_awb_view ac_awb_view_text NULL
-# dependency on ac_awb_misc to avoid concurrent creation of java_ver.mk
-ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake -
all ac_awb_view_text ac_awb_misc NULL
+ac accessibility\prj nmake -
all ac_prj NULL
diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst
index 662373c7c487..e69de29bb2d1 100644
--- a/accessibility/prj/d.lst
+++ b/accessibility/prj/d.lst
@@ -1,8 +0,0 @@
-..\%__SRC%\class\java_uno_accessbridge.jar
%_DEST%\bin%_EXT%\java_uno_accessbridge.jar
-..\%__SRC%\class\java_accessibility.jar
%_DEST%\bin%_EXT%\java_accessibility.jar
-
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\java_uno_accessbridge.component
%_DEST%\xml\java_uno_accessbridge.component
diff --git a/accessibility/prj/makefile.mk b/accessibility/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/accessibility/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
$(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
commit daf973719c3c79f4824a992a1129c26d956a218f
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Tue Nov 27 19:16:03 2018 +0000
Commit: Damjan Jovanovic <dam...@apache.org>
CommitDate: Tue Nov 27 19:16:03 2018 +0000
Port main/accessibility to gbuild.
Get rid of the java_accessibility.jar which did nothing.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 976467d53858..3a4e4f17539b 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
UnoControls \
+ accessibility \
animations \
autodoc \
automation \
diff --git a/Repository.mk b/Repository.mk
index 690144ea9bad..503f6423521b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Helper_register_executables,UREBIN, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
AppleRemote \
MacOSXSpell \
+ acc \
adabas \
adabasui \
agg \
@@ -118,6 +119,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwm \
guesslang \
i18npaper \
+ java_uno_accessbridge \
juh \
juhx \
lng \
diff --git a/accessibility/source/helper/makefile.mk
b/accessibility/AllLangResTarget_acc.mk
similarity index 62%
rename from accessibility/source/helper/makefile.mk
rename to accessibility/AllLangResTarget_acc.mk
index 656752476f4c..a0e605bc8c54 100644
--- a/accessibility/source/helper/makefile.mk
+++ b/accessibility/AllLangResTarget_acc.mk
@@ -21,29 +21,23 @@
-PRJ=..$/..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,acc))
-PRJNAME=accessibility
-TARGET=helper
+$(eval $(call gb_AllLangResTarget_set_reslocation,acc,accessibility))
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_AllLangResTarget_add_srs,acc,acc/res))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,acc/res))
-.INCLUDE : settings.mk
+$(eval $(call gb_SrsTarget_set_include,acc/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/accessibility/inc \
+ -I$(SRCDIR)/accessibility/source/inc \
+))
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/acc_factory.obj \
- $(SLO)$/accresmgr.obj \
- $(SLO)$/characterattributeshelper.obj \
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
- accessiblestrings.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,acc/res,\
+ accessibility/source/helper/accessiblestrings.src \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/accessibility/Ant_java_uno_accessbridge.mk
b/accessibility/Ant_java_uno_accessbridge.mk
new file mode 100644
index 000000000000..0ab4d55250e6
--- /dev/null
+++ b/accessibility/Ant_java_uno_accessbridge.mk
@@ -0,0 +1,29 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call
gb_Ant_Ant,java_uno_accessbridge,$(SRCDIR)/accessibility/java/java_uno_accessbridge/build.xml))
+
+$(eval $(call
gb_Ant_set_componentfile,java_uno_accessbridge,accessibility/java/java_uno_accessbridge/java_uno_accessbridge,OOO))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
new file mode 100644
index 000000000000..cba266c62461
--- /dev/null
+++ b/accessibility/Library_acc.mk
@@ -0,0 +1,142 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,acc))
+
+$(eval $(call
gb_Library_add_precompiled_header,acc,$(SRCDIR)/accessibility/inc/pch/precompiled_accessibility))
+
+$(eval $(call gb_Library_set_include,acc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/accessibility/inc \
+ -I$(SRCDIR)/accessibility/inc/pch \
+ -I$(SRCDIR)/accessibility/source/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,acc, \
+ offapi \
+ udkapi \
+))
+
+
+$(eval $(call gb_Library_add_defs,acc,\
+ -DACCESSIBILITY_DLLIMPLEMENTATION \
+))
+
+$(eval $(call
gb_Library_set_versionmap,acc,$(SRCDIR)/accessibility/util/acc.map))
+
+$(eval $(call gb_Library_add_linked_libs,acc,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ ootk \
+ sal \
+ sot \
+ stl \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,acc,\
+ accessibility/source/standard/accessiblemenubasecomponent \
+ accessibility/source/standard/accessiblemenucomponent \
+ accessibility/source/standard/accessiblemenuitemcomponent \
+ accessibility/source/standard/floatingwindowaccessible \
+ accessibility/source/standard/vclxaccessiblebox \
+ accessibility/source/standard/vclxaccessiblebutton \
+ accessibility/source/standard/vclxaccessiblecheckbox \
+ accessibility/source/standard/vclxaccessiblecombobox \
+ accessibility/source/standard/vclxaccessibledropdowncombobox \
+ accessibility/source/standard/vclxaccessibledropdownlistbox \
+ accessibility/source/standard/vclxaccessibleedit \
+ accessibility/source/standard/vclxaccessiblefixedhyperlink \
+ accessibility/source/standard/vclxaccessiblefixedtext \
+ accessibility/source/standard/vclxaccessiblelist \
+ accessibility/source/standard/vclxaccessiblelistbox \
+ accessibility/source/standard/vclxaccessiblelistitem \
+ accessibility/source/standard/vclxaccessiblemenu \
+ accessibility/source/standard/vclxaccessiblemenubar \
+ accessibility/source/standard/vclxaccessiblemenuitem \
+ accessibility/source/standard/vclxaccessiblemenuseparator \
+ accessibility/source/standard/vclxaccessiblepopupmenu \
+ accessibility/source/standard/vclxaccessibleradiobutton \
+ accessibility/source/standard/vclxaccessiblescrollbar \
+ accessibility/source/standard/vclxaccessiblestatusbar \
+ accessibility/source/standard/vclxaccessiblestatusbaritem \
+ accessibility/source/standard/vclxaccessibletabcontrol \
+ accessibility/source/standard/vclxaccessibletabpage \
+ accessibility/source/standard/vclxaccessibletabpagewindow \
+ accessibility/source/standard/vclxaccessibletextcomponent \
+ accessibility/source/standard/vclxaccessibletextfield \
+ accessibility/source/standard/vclxaccessibletoolbox \
+ accessibility/source/standard/vclxaccessibletoolboxitem \
+ accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell \
+ accessibility/source/extended/AccessibleBrowseBoxBase \
+ accessibility/source/extended/AccessibleBrowseBox \
+ accessibility/source/extended/AccessibleBrowseBoxTableCell \
+ accessibility/source/extended/AccessibleBrowseBoxHeaderCell \
+ accessibility/source/extended/AccessibleBrowseBoxTableBase \
+ accessibility/source/extended/AccessibleBrowseBoxTable \
+ accessibility/source/extended/AccessibleBrowseBoxHeaderBar \
+ accessibility/source/extended/accessibleiconchoicectrl \
+ accessibility/source/extended/accessibleiconchoicectrlentry \
+ accessibility/source/extended/accessiblelistbox \
+ accessibility/source/extended/accessiblelistboxentry \
+ accessibility/source/extended/accessibletabbarbase \
+ accessibility/source/extended/accessibletabbar \
+ accessibility/source/extended/accessibletabbarpage \
+ accessibility/source/extended/accessibletabbarpagelist \
+ accessibility/source/extended/accessibletablistbox \
+ accessibility/source/extended/accessibletablistboxtable \
+ accessibility/source/extended/listboxaccessible \
+ accessibility/source/extended/accessiblebrowseboxcell \
+ accessibility/source/extended/accessibleeditbrowseboxcell \
+ accessibility/source/extended/textwindowaccessibility \
+ accessibility/source/extended/AccessibleGridControlBase \
+ accessibility/source/extended/AccessibleGridControl \
+ accessibility/source/extended/AccessibleGridControlTableBase \
+ accessibility/source/extended/AccessibleGridControlHeader \
+ accessibility/source/extended/AccessibleGridControlTableCell \
+ accessibility/source/extended/AccessibleGridControlHeaderCell \
+ accessibility/source/extended/AccessibleGridControlTable \
+ accessibility/source/extended/AccessibleToolPanelDeck \
+ accessibility/source/extended/AccessibleToolPanelDeckTabBar \
+ accessibility/source/extended/AccessibleToolPanelDeckTabBarItem \
+ accessibility/source/helper/acc_factory \
+ accessibility/source/helper/accresmgr \
+ accessibility/source/helper/characterattributeshelper \
+))
+
+
+ifeq ($(OS)$(COM),SOLARISI)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ accessibility/source/extended/accessibletabbarpagelist,
$(gb_COMPILERNOOPTFLAGS) \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/accessibility/Library_java_uno_accessbridge.mk
b/accessibility/Library_java_uno_accessbridge.mk
new file mode 100644
index 000000000000..c8876b68b417
--- /dev/null
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -0,0 +1,61 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,java_uno_accessbridge))
+
+$(eval $(call
gb_Library_add_precompiled_header,java_uno_accessbridge,$(SRCDIR)/accessibility/inc/pch/precompiled_accessibility_accessbridge))
+
+$(eval $(call gb_Library_set_include,java_uno_accessbridge,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/accessibility/inc \
+ -I$(SRCDIR)/accessibility/inc/pch \
+ -I$(SRCDIR)/accessibility/source/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,java_uno_accessbridge, \
+ offapi \
+ udkapi \
+))
+
+
+#$(eval $(call gb_Library_add_defs,java_uno_accessbridge,\
+# -DFORMULA_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_add_linked_libs,java_uno_accessbridge,\
+ cppu \
+ jvmaccess \
+ sal \
+ stl \
+ vcl \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\
+ accessibility/bridge/source/java/WindowsAccessBridgeAdapter \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/accessibility/Makefile b/accessibility/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/accessibility/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/accessibility/inc/makefile.mk
b/accessibility/Module_accessibility.mk
similarity index 68%
rename from accessibility/inc/makefile.mk
rename to accessibility/Module_accessibility.mk
index 875b3b5fdd4e..6ebe4b561050 100644
--- a/accessibility/inc/makefile.mk
+++ b/accessibility/Module_accessibility.mk
@@ -20,24 +20,20 @@
#**************************************************************
-PRJ=..
-PRJNAME=accessibility
-TARGET=inc
+$(eval $(call gb_Module_Module,accessibility))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_add_targets,accessibility,\
+ AllLangResTarget_acc \
+ Library_acc \
+))
-.INCLUDE : settings.mk
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,accessibility,\
+ Ant_java_uno_accessbridge \
+ Library_java_uno_accessbridge \
+))
+endif
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+# vim: set noet sw=4 ts=4:
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
deleted file mode 100644
index 6ea8beda90d0..000000000000
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJNAME = accessibility
-PRJ = ..$/..$/..$/..$/..
-TARGET = java_accessibility
-PACKAGE = org$/openoffice$/java$/accessibility
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JAVADIR = $(OUT)$/misc$/java
-JARFILES = jurt.jar unoil.jar ridl.jar
-JAVAFILES = \
- logging$/XAccessibleEventLog.java \
- logging$/XAccessibleHypertextLog.java \
- logging$/XAccessibleTextLog.java \
- AbstractButton.java \
- AccessibleActionImpl.java \
- AccessibleComponentImpl.java \
- AccessibleEditableTextImpl.java \
- AccessibleExtendedState.java \
- AccessibleHypertextImpl.java \
- AccessibleIconImpl.java \
- AccessibleKeyBinding.java \
- AccessibleObjectFactory.java \
- AccessibleRoleAdapter.java \
- AccessibleSelectionImpl.java \
- AccessibleStateAdapter.java \
- AccessibleTextImpl.java \
- AccessibleValueImpl.java \
- Alert.java \
- Application.java \
- Button.java \
- CheckBox.java \
- ComboBox.java \
- Component.java \
- Container.java \
- DescendantManager.java \
- Dialog.java \
- FocusTraversalPolicy.java \
- Frame.java \
- Icon.java \
- Label.java \
- List.java \
- Menu.java \
- MenuItem.java \
- MenuContainer.java \
- NativeFrame.java \
- Paragraph.java \
- RadioButton.java \
- ScrollBar.java \
- Separator.java \
- Table.java \
- TextComponent.java \
- ToggleButton.java \
- ToolTip.java \
- Tree.java \
- Window.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES)
$(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
$(CLASSDIR)$/$(PACKAGE)$/Build.class
-
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-JARCLASSDIRS = $(PACKAGE)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# Enable logging in non-product only
-.IF "$(PRODUCT)"!=""
-DEBUGSWITCH = false
-PRODUCTSWITCH = true
-.ELSE
-PRODUCTSWITCH = false
-DEBUGSWITCH = true
-.ENDIF
-
-$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
- @@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE)
- @-echo package org.openoffice.java.accessibility\; > $@
- @-echo public class Build { >> $@
- @-echo public static final boolean DEBUG = $(DEBUGSWITCH)\; >> $@
- @-echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; >> $@
- @-echo } >> $@
-
-$(CLASSDIR)$/$(PACKAGE)$/Build.class : $(JAVADIR)$/$(PACKAGE)$/Build.java
- -$(JAVAC) -d $(CLASSDIR) $(JAVADIR)$/$(PACKAGE)$/Build.java
-
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index e294b0baf338..2864719c92cf 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -22,14 +22,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_accessibility.hxx"
+#include "precompiled_accessibility_accessbridge.hxx"
//------------------------------------------------------------------------
// includes
//------------------------------------------------------------------------
-#include <WindowsAccessBridgeAdapter.h>
-
#include <tools/prewin.h>
#include <wtypes.h>
#include <tools/postwin.h>
diff --git a/accessibility/bridge/source/java/exports.dxp
b/accessibility/bridge/source/java/exports.dxp
deleted file mode 100644
index c97dba7d0047..000000000000
--- a/accessibility/bridge/source/java/exports.dxp
+++ /dev/null
@@ -1,4 +0,0 @@
-JNI_OnLoad
-JNI_OnUnload
-Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID
-Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping
diff --git a/accessibility/bridge/source/java/makefile.mk
b/accessibility/bridge/source/java/makefile.mk
deleted file mode 100644
index d19f88f45260..000000000000
--- a/accessibility/bridge/source/java/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-PRJNAME=accessibility
-TARGET=accessbridge
-LIBTARGET=NO
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VERSIONOBJ=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-
-SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj
-
-SHL1TARGET=java_uno_accessbridge
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(JVMACCESSLIB) $(CPPULIB) $(SALLIB)
-SHL1OBJS=$(SLOFILES)
-SHL1VERSIONOBJ=
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h
-
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(GUI)"=="WNT"
-
-$(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER)
-
-$(SHL1HEADER) :
- javah -classpath
"$(OUT)$/class;$(OUTDIR)$/bin/ridl.jar;$(OUTDIR)$/bin/unoil.jar;$(CLASSPATH)"
-o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
-
-.ENDIF # "$(GUI)"=="WNT"
diff --git a/accessibility/inc/accessibility/helper/acc_factory.hxx
b/accessibility/inc/accessibility/helper/acc_factory.hxx
index d6718d90265e..a588f8b79fb7 100644
--- a/accessibility/inc/accessibility/helper/acc_factory.hxx
+++ b/accessibility/inc/accessibility/helper/acc_factory.hxx
@@ -26,6 +26,7 @@
#include <toolkit/helper/accessiblefactory.hxx>
#include <svtools/accessiblefactory.hxx>
+#include "accessibilitydllapi.h"
/** this is the entry point to retrieve a factory for the toolkit-level
Accessible/Contexts supplied
by this library
@@ -33,7 +34,7 @@
This function implements the factory function needed in toolkit
(of type GetStandardAccComponentFactory).
*/
-extern "C" void* SAL_CALL getStandardAccessibleFactory();
+extern "C" ACCESSIBILITY_DLLPUBLIC void* SAL_CALL
getStandardAccessibleFactory();
/** this is the entry point to retrieve a factory for the svtools-level
Accessible/Contexts supplied
by this library
@@ -41,6 +42,6 @@ extern "C" void* SAL_CALL getStandardAccessibleFactory();
This function implements the factory function needed in svtools
(of type GetSvtAccessibilityComponentFactory).
*/
-extern "C" void* SAL_CALL getSvtAccessibilityComponentFactory();
+extern "C" ACCESSIBILITY_DLLPUBLIC void* SAL_CALL
getSvtAccessibilityComponentFactory();
#endif // ACCESSIBILITY_HELPER_FACTORY_HXX
diff --git a/accessibility/inc/accessibility/helper/accessibilitydllapi.h
b/accessibility/inc/accessibility/helper/accessibilitydllapi.h
new file mode 100644
index 000000000000..289e87dea57a
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/accessibilitydllapi.h
@@ -0,0 +1,37 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef INCLUDED_ACCESSIBILITYDLLAPI_H
+#define INCLUDED_ACCESSIBILITYDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(ACCESSIBILITY_DLLIMPLEMENTATION)
+#define ACCESSIBILITY_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define ACCESSIBILITY_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define ACCESSIBILITY_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_ACCESSIBILITYDLLAPI_H */
+
diff --git a/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx
b/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx
new file mode 100644
index 000000000000..db1429729dff
--- /dev/null
+++ b/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx
@@ -0,0 +1,25 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#include "precompiled_accessibility.hxx"
+
diff --git a/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx
b/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx
new file mode 100644
index 000000000000..feb28aae7abd
--- /dev/null
+++ b/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx
@@ -0,0 +1,33 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:28.952369
+
+#ifdef PRECOMPILED_HEADERS
+
+//---MARKER---
+
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include "vcl/window.hxx"
+#endif
diff --git a/accessibility/java/java_uno_accessbridge/build.xml
b/accessibility/java/java_uno_accessbridge/build.xml
new file mode 100644
index 000000000000..19c61b687b37
--- /dev/null
+++ b/accessibility/java/java_uno_accessbridge/build.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="java_uno_accessbridge" default="main" xmlns:if="ant:if"
xmlns:unless="ant:unless">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+ <property name="jar.manifest" value="manifest"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ </path>
+ </target>
+
+ <target name="generate-build-class" extensionOf="pre-compile"
depends="prepare">
+ <mkdir
dir="${main.build.dir}/generated/org/openoffice/java/accessibility"/>
+
+ <property name="product.switch" value="true" unless:blank="PRODUCT"/>
+ <property name="product.switch" value="false"/>
+ <property name="debug.switch" value="true" if:blank="PRODUCT"/>
+ <property name="debug.switch" value="false"/>
+
+ <echo
file="${main.build.dir}/generated/org/openoffice/java/accessibility/Build.java">
+ package org.openoffice.java.accessibility;
+
+ public class Build {
+ public static final boolean DEBUG = ${debug.switch};
+ public static final boolean PRODUCT = ${product.switch};
+ }
+ </echo>
+
+ <javac srcdir="${main.build.dir}/generated"
+ destdir="${main.build.dir}"
+ source="${java.baseline.version}"
+ target="${java.baseline.version}"
+ debug="${main.debug}"
+ debuglevel="lines,vars,source"
+ deprecation="${main.deprecation}"
+ includeantruntime="false"/>
+ </target>
+
+</project>
+
diff --git
a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
b/accessibility/java/java_uno_accessbridge/java_uno_accessbridge.component
similarity index 100%
rename from
accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
rename to
accessibility/java/java_uno_accessbridge/java_uno_accessbridge.component
diff --git a/accessibility/bridge/org/openoffice/accessibility/manifest
b/accessibility/java/java_uno_accessbridge/manifest
similarity index 100%
rename from accessibility/bridge/org/openoffice/accessibility/manifest
rename to accessibility/java/java_uno_accessbridge/manifest
diff --git
a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
diff --git a/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/KeyHandler.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/accessibility/KeyHandler.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/KeyHandler.java
diff --git a/accessibility/bridge/org/openoffice/accessibility/PopupWindow.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/PopupWindow.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/accessibility/PopupWindow.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/PopupWindow.java
diff --git
a/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
diff --git
a/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/java_uno_accessbridge.component
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/java_uno_accessbridge.component
new file mode 100644
index 000000000000..1efe849849da
--- /dev/null
+++
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/java_uno_accessbridge.component
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="org.openoffice.accessibility.AccessBridge">
+ <service name="com.sun.star.accessibility.AccessBridge"/>
+ </implementation>
+</component>
diff --git a/accessibility/bridge/org/openoffice/accessibility/makefile.mk
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/makefile.mk
similarity index 100%
rename from accessibility/bridge/org/openoffice/accessibility/makefile.mk
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/makefile.mk
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AbstractButton.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AbstractButton.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleActionImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleActionImpl.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleComponentImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleComponentImpl.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleExtendedState.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleExtendedState.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleIconImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleIconImpl.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleKeyBinding.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleKeyBinding.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleObjectFactory.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleObjectFactory.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java.old
similarity index 94%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java.old
index 8558c76a7d92..0c60373b8ad8 100644
---
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
+++
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java.old
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -27,11 +27,11 @@ import javax.accessibility.Accessible;
import com.sun.star.accessibility.AccessibleRelation;
import com.sun.star.accessibility.XAccessible;
-/**
+/**
*/
public abstract class AccessibleRelationTypeMap {
-
- final static String[] data = {
+
+ final static String[] data = {
null,
javax.accessibility.AccessibleRelation.CONTROLLED_BY,
javax.accessibility.AccessibleRelation.CONTROLLED_BY,
@@ -44,14 +44,14 @@ public abstract class AccessibleRelationTypeMap {
javax.accessibility.AccessibleRelation.MEMBER_OF,
javax.accessibility.AccessibleRelation.MEMBER_OF
};
-
+
public static void
fillAccessibleRelationSet(javax.accessibility.AccessibleRelationSet s,
AccessibleRelation[] relations) {
AccessibleObjectFactory factory = AccessibleObjectFactory.getDefault();
for(int i=0; i<relations.length; i++) {
if( relations[i].RelationType < data.length &&
data[relations[i].RelationType] != null ) {
- javax.accessibility.AccessibleRelation r =
+ javax.accessibility.AccessibleRelation r =
new
javax.accessibility.AccessibleRelation(data[relations[i].RelationType]);
-
+
r.setTarget(factory.getAccessibleObjectSet(relations[i].TargetSet));
s.add(r);
}
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRoleAdapter.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRoleAdapter.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleStateAdapter.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleStateAdapter.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleValueImpl.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleValueImpl.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Alert.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Alert.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Alert.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Alert.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/Application.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Application.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/Application.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Application.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Button.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Button.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Button.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Button.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/CheckBox.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/CheckBox.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ComboBox.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ComboBox.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/Component.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Component.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/Component.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Component.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/Container.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Container.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/Container.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Container.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/DescendantManager.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/DescendantManager.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Dialog.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Dialog.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/FocusTraversalPolicy.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/FocusTraversalPolicy.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Frame.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Frame.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Frame.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Icon.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Icon.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Icon.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Icon.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Label.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Label.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Label.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Label.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/List.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/List.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/List.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/List.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Menu.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Menu.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Menu.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuContainer.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuContainer.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuItem.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuItem.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/NativeFrame.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/NativeFrame.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Paragraph.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Paragraph.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/RadioButton.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/RadioButton.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ScrollBar.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ScrollBar.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/Separator.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Separator.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/Separator.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Separator.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Table.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Table.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Table.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Table.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/TextComponent.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/TextComponent.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToggleButton.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToggleButton.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToolTip.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToolTip.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Tree.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Tree.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Tree.java
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Window.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Window.java
similarity index 100%
rename from accessibility/bridge/org/openoffice/java/accessibility/Window.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Window.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
b/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
similarity index 100%
rename from
accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
rename to
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
diff --git a/accessibility/source/extended/makefile.mk
b/accessibility/source/extended/makefile.mk
deleted file mode 100644
index f50173e6716f..000000000000
--- a/accessibility/source/extended/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=accessibility
-TARGET=extended
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-.IF "$(OS)$(COM)"=="SOLARISI"
-NOOPTFILES=$(SLO)$/accessibletabbarpagelist.obj
-.ENDIF # "$(OS)$(COM)"=="SOLARISI"
-
-SLOFILES=\
- $(SLO)$/AccessibleBrowseBoxCheckBoxCell.obj \
- $(SLO)$/AccessibleBrowseBoxBase.obj \
- $(SLO)$/AccessibleBrowseBox.obj \
- $(SLO)$/AccessibleBrowseBoxTableCell.obj \
- $(SLO)$/AccessibleBrowseBoxHeaderCell.obj \
- $(SLO)$/AccessibleBrowseBoxTableBase.obj \
- $(SLO)$/AccessibleBrowseBoxTable.obj \
- $(SLO)$/AccessibleBrowseBoxHeaderBar.obj \
- $(SLO)$/accessibleiconchoicectrl.obj \
- $(SLO)$/accessibleiconchoicectrlentry.obj \
- $(SLO)$/accessiblelistbox.obj \
- $(SLO)$/accessiblelistboxentry.obj \
- $(SLO)$/accessibletabbarbase.obj \
- $(SLO)$/accessibletabbar.obj \
- $(SLO)$/accessibletabbarpage.obj \
- $(SLO)$/accessibletabbarpagelist.obj \
- $(SLO)$/accessibletablistbox.obj \
- $(SLO)$/accessibletablistboxtable.obj \
- $(SLO)$/listboxaccessible.obj \
- $(SLO)$/accessiblebrowseboxcell.obj \
- $(SLO)$/accessibleeditbrowseboxcell.obj \
- $(SLO)$/textwindowaccessibility.obj \
- $(SLO)$/AccessibleGridControlBase.obj \
- $(SLO)$/AccessibleGridControl.obj \
- $(SLO)$/AccessibleGridControlTableBase.obj \
- $(SLO)$/AccessibleGridControlHeader.obj \
- $(SLO)$/AccessibleGridControlTableCell.obj \
- $(SLO)$/AccessibleGridControlHeaderCell.obj \
- $(SLO)$/AccessibleGridControlTable.obj \
- $(SLO)$/AccessibleToolPanelDeck.obj \
- $(SLO)$/AccessibleToolPanelDeckTabBar.obj \
- $(SLO)$/AccessibleToolPanelDeckTabBarItem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/accessibility/source/standard/makefile.mk
b/accessibility/source/standard/makefile.mk
deleted file mode 100644
index 47cb111ce333..000000000000
--- a/accessibility/source/standard/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=accessibility
-TARGET=standard
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/accessiblemenubasecomponent.obj \
- $(SLO)$/accessiblemenucomponent.obj \
- $(SLO)$/accessiblemenuitemcomponent.obj \
- $(SLO)$/floatingwindowaccessible.obj \
- $(SLO)$/vclxaccessiblebox.obj \
- $(SLO)$/vclxaccessiblebutton.obj \
- $(SLO)$/vclxaccessiblecheckbox.obj \
- $(SLO)$/vclxaccessiblecombobox.obj \
- $(SLO)$/vclxaccessibledropdowncombobox.obj \
- $(SLO)$/vclxaccessibledropdownlistbox.obj \
- $(SLO)$/vclxaccessibleedit.obj \
- $(SLO)$/vclxaccessiblefixedhyperlink.obj \
- $(SLO)$/vclxaccessiblefixedtext.obj \
- $(SLO)$/vclxaccessiblelist.obj \
- $(SLO)$/vclxaccessiblelistbox.obj \
- $(SLO)$/vclxaccessiblelistitem.obj \
- $(SLO)$/vclxaccessiblemenu.obj \
- $(SLO)$/vclxaccessiblemenubar.obj \
- $(SLO)$/vclxaccessiblemenuitem.obj \
- $(SLO)$/vclxaccessiblemenuseparator.obj \
- $(SLO)$/vclxaccessiblepopupmenu.obj \
- $(SLO)$/vclxaccessibleradiobutton.obj \
- $(SLO)$/vclxaccessiblescrollbar.obj \
- $(SLO)$/vclxaccessiblestatusbar.obj \
- $(SLO)$/vclxaccessiblestatusbaritem.obj \
- $(SLO)$/vclxaccessibletabcontrol.obj \
- $(SLO)$/vclxaccessibletabpage.obj \
- $(SLO)$/vclxaccessibletabpagewindow.obj \
- $(SLO)$/vclxaccessibletextcomponent.obj \
- $(SLO)$/vclxaccessibletextfield.obj \
- $(SLO)$/vclxaccessibletoolbox.obj \
- $(SLO)$/vclxaccessibletoolboxitem.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/accessibility/util/makefile.mk b/accessibility/util/makefile.mk
deleted file mode 100644
index 31407a122d6a..000000000000
--- a/accessibility/util/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..
-PRJNAME=accessibility
-TARGET=acc
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-#.INCLUDE : svpre.mk
-#.INCLUDE : settings.mk
-#.INCLUDE : sv.mk
-
-LDUMP=ldump2.exe
-
-# --- Library -----------------------------------
-# --- acc ---------------------------------------
-LIB1TARGET=$(SLB)$/$(PRJNAME).lib
-LIB1FILES=\
- $(SLB)$/standard.lib \
- $(SLB)$/extended.lib \
- $(SLB)$/helper.lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(VCLLIB) \
- $(COMPHELPERLIB) \
- $(SOTLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(TKLIB) \
- $(TOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(SALLIB)
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEPN=$(LIB1TARGET) \
- makefile.mk
-
-
-SHL1VERSIONMAP= $(TARGET).map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-# === .res file ==========================================================
-
-RES1FILELIST=\
- $(SRS)$/helper.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index 542029196c65..74de6301a6cb 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -323,6 +323,7 @@ my_components += \
.IF "$(OS)" == "WNT"
my_components += \
ado \
+ component/accessibility/java/java_uno_accessbridge/java_uno_accessbridge \
component/avmedia/source/win/avmediawin \
component/dtrans/source/generic/dtrans \
component/dtrans/util/dnd \
@@ -330,7 +331,6 @@ my_components += \
component/dtrans/util/sysdtrans \
component/fpicker/util/fop \
component/fpicker/util/fps \
- java_uno_accessbridge \
sysmail \
winaccessibility \
wininetbe1
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
