svn commit: r1847589 - in /openoffice/trunk/main: ./ accessibility/ accessibility/bridge/org/ accessibility/bridge/source/java/ accessibility/inc/ accessibility/inc/accessibility/helper/ accessibility/inc/pch/ accessibility/java/ accessibility/java/jav...

d***@apache.org

2018-11-27 19:16:04 UTC

Author: damjan
Date: Tue Nov 27 19:16:03 2018
New Revision: 1847589

URL: http://svn.apache.org/viewvc?rev=1847589&view=rev
Log:
Port main/accessibility to gbuild.

Get rid of the java_accessibility.jar which did nothing.

Patch by: me

Added:
openoffice/trunk/main/accessibility/AllLangResTarget_acc.mk
openoffice/trunk/main/accessibility/Ant_java_uno_accessbridge.mk
openoffice/trunk/main/accessibility/Library_acc.mk
openoffice/trunk/main/accessibility/Library_java_uno_accessbridge.mk
openoffice/trunk/main/accessibility/Makefile (with props)
openoffice/trunk/main/accessibility/Module_accessibility.mk
openoffice/trunk/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h (with props)
openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx
openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx
openoffice/trunk/main/accessibility/java/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/build.xml (with props)
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/java_uno_accessbridge.component
- copied unchanged from r1847416, openoffice/trunk/main/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/manifest
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/
- copied from r1847416, openoffice/trunk/main/accessibility/bridge/org/openoffice/accessibility/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/
- copied from r1847416, openoffice/trunk/main/accessibility/bridge/org/openoffice/java/
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java.old
- copied unchanged from r1847416, openoffice/trunk/main/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
Removed:
openoffice/trunk/main/accessibility/bridge/org/
openoffice/trunk/main/accessibility/bridge/source/java/exports.dxp
openoffice/trunk/main/accessibility/bridge/source/java/makefile.mk
openoffice/trunk/main/accessibility/inc/makefile.mk
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/java_uno_accessbridge.component
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/makefile.mk
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/manifest
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
openoffice/trunk/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/makefile.mk
openoffice/trunk/main/accessibility/source/extended/makefile.mk
openoffice/trunk/main/accessibility/source/helper/makefile.mk
openoffice/trunk/main/accessibility/source/standard/makefile.mk
openoffice/trunk/main/accessibility/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
openoffice/trunk/main/accessibility/inc/accessibility/helper/acc_factory.hxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1847589&r1=1847588&r2=1847589&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Tue Nov 27 19:16:03 2018
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
UnoControls \
+ accessibility \
animations \
autodoc \
automation \

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1847589&r1=1847588&r2=1847589&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Tue Nov 27 19:16:03 2018
@@ -69,6 +69,7 @@ $(eval $(call gb_Helper_register_executa
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
AppleRemote \
MacOSXSpell \
+ acc \
adabas \
adabasui \
agg \
@@ -118,6 +119,7 @@ $(eval $(call gb_Helper_register_librari
fwm \
guesslang \
i18npaper \
+ java_uno_accessbridge \
juh \
juhx \
lng \

Added: openoffice/trunk/main/accessibility/AllLangResTarget_acc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/AllLangResTarget_acc.mk?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/AllLangResTarget_acc.mk (added)
+++ openoffice/trunk/main/accessibility/AllLangResTarget_acc.mk Tue Nov 27 19:16:03 2018
@@ -0,0 +1,43 @@
+#**************************************************************
+#
+# 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_AllLangResTarget_AllLangResTarget,acc))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,acc,accessibility))
+
+$(eval $(call gb_AllLangResTarget_add_srs,acc,acc/res))
+
+$(eval $(call gb_SrsTarget_SrsTarget,acc/res))
+
+$(eval $(call gb_SrsTarget_set_include,acc/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/accessibility/inc \
+ -I$(SRCDIR)/accessibility/source/inc \
+))
+
+# 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:

Added: openoffice/trunk/main/accessibility/Ant_java_uno_accessbridge.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/Ant_java_uno_accessbridge.mk?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/Ant_java_uno_accessbridge.mk (added)
+++ openoffice/trunk/main/accessibility/Ant_java_uno_accessbridge.mk Tue Nov 27 19:16:03 2018
@@ -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:
+

Added: openoffice/trunk/main/accessibility/Library_acc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/Library_acc.mk?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/Library_acc.mk (added)
+++ openoffice/trunk/main/accessibility/Library_acc.mk Tue Nov 27 19:16:03 2018
@@ -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:
+

Added: openoffice/trunk/main/accessibility/Library_java_uno_accessbridge.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/Library_java_uno_accessbridge.mk?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/Library_java_uno_accessbridge.mk (added)
+++ openoffice/trunk/main/accessibility/Library_java_uno_accessbridge.mk Tue Nov 27 19:16:03 2018
@@ -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:
+

Added: openoffice/trunk/main/accessibility/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/Makefile?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/Makefile (added)
+++ openoffice/trunk/main/accessibility/Makefile Tue Nov 27 19:16:03 2018
@@ -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:

Propchange: openoffice/trunk/main/accessibility/Makefile
------------------------------------------------------------------------------
svn:eol-style = native

Added: openoffice/trunk/main/accessibility/Module_accessibility.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/Module_accessibility.mk?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/Module_accessibility.mk (added)
+++ openoffice/trunk/main/accessibility/Module_accessibility.mk Tue Nov 27 19:16:03 2018
@@ -0,0 +1,39 @@
+#**************************************************************
+#
+# 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_Module_Module,accessibility))
+
+$(eval $(call gb_Module_add_targets,accessibility,\
+ AllLangResTarget_acc \
+ Library_acc \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,accessibility,\
+ Ant_java_uno_accessbridge \
+ Library_java_uno_accessbridge \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx?rev=1847589&r1=1847588&r2=1847589&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx (original)
+++ openoffice/trunk/main/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx Tue Nov 27 19:16:03 2018
@@ -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>

Modified: openoffice/trunk/main/accessibility/inc/accessibility/helper/acc_factory.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/helper/acc_factory.hxx?rev=1847589&r1=1847588&r2=1847589&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/helper/acc_factory.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/helper/acc_factory.hxx Tue Nov 27 19:16:03 2018
@@ -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 getStandardAcc
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

Added: openoffice/trunk/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h (added)
+++ openoffice/trunk/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h Tue Nov 27 19:16:03 2018
@@ -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 */
+

Propchange: openoffice/trunk/main/accessibility/inc/accessibility/helper/accessibilitydllapi.h
------------------------------------------------------------------------------
svn:eol-style = native

Added: openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx (added)
+++ openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx Tue Nov 27 19:16:03 2018
@@ -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"
+

Added: openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx (added)
+++ openoffice/trunk/main/accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx Tue Nov 27 19:16:03 2018
@@ -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

Added: openoffice/trunk/main/accessibility/java/java_uno_accessbridge/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/java/java_uno_accessbridge/build.xml?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/java/java_uno_accessbridge/build.xml (added)
+++ openoffice/trunk/main/accessibility/java/java_uno_accessbridge/build.xml Tue Nov 27 19:16:03 2018
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<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>
+

Propchange: openoffice/trunk/main/accessibility/java/java_uno_accessbridge/build.xml
------------------------------------------------------------------------------
svn:eol-style = native

Added: openoffice/trunk/main/accessibility/java/java_uno_accessbridge/manifest
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/java/java_uno_accessbridge/manifest?rev=1847589&view=auto
==============================================================================
--- openoffice/trunk/main/accessibility/java/java_uno_accessbridge/manifest (added)
+++ openoffice/trunk/main/accessibility/java/java_uno_accessbridge/manifest Tue Nov 27 19:16:03 2018
@@ -0,0 +1,2 @@
+RegistrationClassName: org.openoffice.accessibility.AccessBridge
+UNO-Type-Path:

Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1847589&r1=1847588&r2=1847589&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Tue Nov 27 19:16:03 2018
@@ -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