Author: damjan
Date: Sat Mar 24 00:00:51 2018
New Revision: 1827614
URL: http://svn.apache.org/viewvc?rev=1827614&view=rev
Log:
Port main/jvmaccess to gbuild.
Patch by: me
Added:
openoffice/trunk/main/jvmaccess/Library_jvmaccess.mk
openoffice/trunk/main/jvmaccess/Makefile
openoffice/trunk/main/jvmaccess/Module_jvmaccess.mk
openoffice/trunk/main/jvmaccess/Package_inc.mk
openoffice/trunk/main/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h
openoffice/trunk/main/jvmaccess/prj/makefile.mk
Removed:
openoffice/trunk/main/jvmaccess/source/makefile.mk
openoffice/trunk/main/jvmaccess/util/makefile.mk
Modified:
openoffice/trunk/main/jvmaccess/inc/jvmaccess/classpath.hxx
openoffice/trunk/main/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
openoffice/trunk/main/jvmaccess/inc/jvmaccess/virtualmachine.hxx
openoffice/trunk/main/jvmaccess/prj/build.lst
openoffice/trunk/main/jvmaccess/prj/d.lst
openoffice/trunk/main/jvmaccess/util/gcc3.map
openoffice/trunk/main/jvmaccess/util/mingw.map
Added: openoffice/trunk/main/jvmaccess/Library_jvmaccess.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/Library_jvmaccess.mk?rev=1827614&view=auto
==============================================================================
--- openoffice/trunk/main/jvmaccess/Library_jvmaccess.mk (added)
+++ openoffice/trunk/main/jvmaccess/Library_jvmaccess.mk Sat Mar 24 00:00:51
2018
@@ -0,0 +1,70 @@
+#**************************************************************
+#
+# 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,jvmaccess))
+
+ifeq ($(COMNAME),msci)
+$(eval $(call
gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/msvc_win32_intel.map))
+else ifeq ($(COMNAME),sunpro5)
+$(eval $(call
gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/cc5_solaris_sparc.map))
+else ifeq ($(GUI)$(COM),WNTGCC)
+$(eval $(call
gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/mingw.map))
+else ifeq ($(COMNAME),gcc3)
+$(eval $(call
gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/gcc3.map))
+endif
+
+$(eval $(call gb_Library_set_include,jvmaccess,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/jvmaccess/inc \
+))
+
+$(eval $(call gb_Library_add_api,jvmaccess,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,jvmaccess,\
+ -DJVMACCESS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jvmaccess,\
+ cppu \
+ sal \
+ salhelper \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,jvmaccess,\
+ advapi32 \
+))
+endif
+
+
+$(eval $(call gb_Library_add_exception_objects,jvmaccess,\
+ jvmaccess/source/classpath \
+ jvmaccess/source/unovirtualmachine \
+ jvmaccess/source/virtualmachine \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/jvmaccess/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/Makefile?rev=1827614&view=auto
==============================================================================
--- openoffice/trunk/main/jvmaccess/Makefile (added)
+++ openoffice/trunk/main/jvmaccess/Makefile Sat Mar 24 00:00:51 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:
Added: openoffice/trunk/main/jvmaccess/Module_jvmaccess.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/Module_jvmaccess.mk?rev=1827614&view=auto
==============================================================================
--- openoffice/trunk/main/jvmaccess/Module_jvmaccess.mk (added)
+++ openoffice/trunk/main/jvmaccess/Module_jvmaccess.mk Sat Mar 24 00:00:51 2018
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# 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,jvmaccess))
+
+$(eval $(call gb_Module_add_targets,jvmaccess,\
+ Library_jvmaccess \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/jvmaccess/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/Package_inc.mk?rev=1827614&view=auto
==============================================================================
--- openoffice/trunk/main/jvmaccess/Package_inc.mk (added)
+++ openoffice/trunk/main/jvmaccess/Package_inc.mk Sat Mar 24 00:00:51 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_Package_Package,jvmaccess_inc,$(SRCDIR)/jvmaccess/inc/jvmaccess))
+
+$(eval $(call
gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/classpath.hxx,classpath.hxx))
+$(eval $(call
gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/jvmaccessdllapi.h,jvmaccessdllapi.h))
+$(eval $(call
gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/unovirtualmachine.hxx,unovirtualmachine.hxx))
+$(eval $(call
gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/virtualmachine.hxx,virtualmachine.hxx))
Modified: openoffice/trunk/main/jvmaccess/inc/jvmaccess/classpath.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/inc/jvmaccess/classpath.hxx?rev=1827614&r1=1827613&r2=1827614&view=diff
==============================================================================
--- openoffice/trunk/main/jvmaccess/inc/jvmaccess/classpath.hxx (original)
+++ openoffice/trunk/main/jvmaccess/inc/jvmaccess/classpath.hxx Sat Mar 24
00:00:51 2018
@@ -26,6 +26,7 @@
#include "sal/config.h"
#include "com/sun/star/uno/Reference.hxx"
+#include "jvmaccess/jvmaccessdllapi.h"
#if defined SOLAR_JAVA
#include "jni.h"
@@ -130,12 +131,12 @@ private:
// that their mangled C++ names do not depend on the JDK version used at
// compile time:
- static void * doTranslateToUrls(
+ JVMACCESS_DLLPUBLIC static void * doTranslateToUrls(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
void * environment, ::rtl::OUString const & classPath);
- static void * doLoadClass(
+ JVMACCESS_DLLPUBLIC static void * doLoadClass(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
void * environment, ::rtl::OUString const & classPath,
Added: openoffice/trunk/main/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h?rev=1827614&view=auto
==============================================================================
--- openoffice/trunk/main/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h (added)
+++ openoffice/trunk/main/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h Sat Mar 24
00:00:51 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_JVMACCESSDLLAPI_H
+#define INCLUDED_JVMACCESSDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(JVMACCESS_DLLIMPLEMENTATION)
+#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMACCESS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_JVMACCESSDLLAPI_H */
+
Modified: openoffice/trunk/main/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx?rev=1827614&r1=1827613&r2=1827614&view=diff
==============================================================================
--- openoffice/trunk/main/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
(original)
+++ openoffice/trunk/main/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx Sat Mar
24 00:00:51 2018
@@ -27,6 +27,7 @@
#include "sal/config.h"
#include "salhelper/simplereferenceobject.hxx"
#include "rtl/ref.hxx"
+#include "jvmaccess/jvmaccessdllapi.h"
namespace jvmaccess {
@@ -35,11 +36,11 @@ class VirtualMachine;
/** An encapsulating wrapper around a Java virtual machine and an appropriate
UNO class loader.
*/
-class UnoVirtualMachine: public salhelper::SimpleReferenceObject {
+class JVMACCESS_DLLPUBLIC UnoVirtualMachine: public
salhelper::SimpleReferenceObject {
public:
/** An exception indicating failure to create a UnoVirtualMachine.
*/
- class CreationException
+ class JVMACCESS_DLLPUBLIC CreationException
{
public:
CreationException();
Modified: openoffice/trunk/main/jvmaccess/inc/jvmaccess/virtualmachine.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/inc/jvmaccess/virtualmachine.hxx?rev=1827614&r1=1827613&r2=1827614&view=diff
==============================================================================
--- openoffice/trunk/main/jvmaccess/inc/jvmaccess/virtualmachine.hxx (original)
+++ openoffice/trunk/main/jvmaccess/inc/jvmaccess/virtualmachine.hxx Sat Mar 24
00:00:51 2018
@@ -26,6 +26,7 @@
#include "rtl/ref.hxx"
#include "salhelper/simplereferenceobject.hxx"
+#include "jvmaccess/jvmaccessdllapi.h"
#ifdef SOLAR_JAVA
#include "jni.h"
@@ -40,7 +41,7 @@ namespace jvmaccess {
/** An encapsulating wrapper around a Java virtual machine.
*/
-class VirtualMachine: public salhelper::SimpleReferenceObject
+class JVMACCESS_DLLPUBLIC VirtualMachine: public
salhelper::SimpleReferenceObject
{
public:
/** A helper to attach a thread to a Java virtual machine.
@@ -53,12 +54,12 @@ public:
detach the thread from the virtual machine upon destruction of the
guard
at the bottom of the stack).
*/
- class AttachGuard
+ class JVMACCESS_DLLPUBLIC AttachGuard
{
public:
/** An exception indicating failure to create an AttachGuard.
*/
- class CreationException
+ class JVMACCESS_DLLPUBLIC CreationException
{
public:
CreationException();
Modified: openoffice/trunk/main/jvmaccess/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/prj/build.lst?rev=1827614&r1=1827613&r2=1827614&view=diff
==============================================================================
--- openoffice/trunk/main/jvmaccess/prj/build.lst (original)
+++ openoffice/trunk/main/jvmaccess/prj/build.lst Sat Mar 24 00:00:51 2018
@@ -1,4 +1,2 @@
jv jvmaccess : offapi ridljar cppu sal salhelper NULL
-jv jvmaccess usr1 - all jv_mkout NULL
-jv jvmaccess\source nmake - all jv_source NULL
-jv jvmaccess\util nmake - all jv_util jv_source NULL
+jv jvmaccess\prj nmake - all jv_prj NULL
Modified: openoffice/trunk/main/jvmaccess/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/prj/d.lst?rev=1827614&r1=1827613&r2=1827614&view=diff
==============================================================================
--- openoffice/trunk/main/jvmaccess/prj/d.lst (original)
+++ openoffice/trunk/main/jvmaccess/prj/d.lst Sat Mar 24 00:00:51 2018
@@ -1,9 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\jvmaccess
-..\inc\jvmaccess\classpath.hxx %_DEST%\inc%_EXT%\jvmaccess\classpath.hxx
-..\inc\jvmaccess\unovirtualmachine.hxx
%_DEST%\inc%_EXT%\jvmaccess\unovirtualmachine.hxx
-..\inc\jvmaccess\virtualmachine.hxx
%_DEST%\inc%_EXT%\jvmaccess\virtualmachine.hxx
-..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib
-..\%__SRC%\lib\jvmaccess*.lib %_DEST%\lib%_EXT%\jvmaccess*.lib
-..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib%_EXT%\*
-linklib: libjvmaccess*.*.*
Added: openoffice/trunk/main/jvmaccess/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/prj/makefile.mk?rev=1827614&view=auto
==============================================================================
--- openoffice/trunk/main/jvmaccess/prj/makefile.mk (added)
+++ openoffice/trunk/main/jvmaccess/prj/makefile.mk Sat Mar 24 00:00:51 2018
@@ -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
Modified: openoffice/trunk/main/jvmaccess/util/gcc3.map
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/util/gcc3.map?rev=1827614&r1=1827613&r2=1827614&view=diff
==============================================================================
--- openoffice/trunk/main/jvmaccess/util/gcc3.map (original)
+++ openoffice/trunk/main/jvmaccess/util/gcc3.map Sat Mar 24 00:00:51 2018
@@ -28,8 +28,8 @@ UDK_3.1 {
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_;
#
jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException
const &)
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; #
jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_;
# jvmaccess::VirtualMachine::AttachGuard::CreationException::operator
=(CreationException const &)
- # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
- # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
_ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE;
# jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference<
VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE;
# jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference<
VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; #
jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
@@ -68,8 +68,8 @@ UDK_3.3 {
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; #
jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; #
jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; #
jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException
const &)
- # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
for jvmaccess::UnoVirtualMachine::CreationException
- # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
name for jvmaccess::UnoVirtualMachine::CreationException
+ _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for
jvmaccess::UnoVirtualMachine::CreationException
+ _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
name for jvmaccess::UnoVirtualMachine::CreationException
_ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv;
# jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference<
jvmaccess::VirtualMachine > const &, void *)
_ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv;
# jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference<
jvmaccess::VirtualMachine > const &, void *)
_ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; #
jvmaccess::UnoVirtualMachine::getVirtualMachine() const
Modified: openoffice/trunk/main/jvmaccess/util/mingw.map
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmaccess/util/mingw.map?rev=1827614&r1=1827613&r2=1827614&view=diff
==============================================================================
--- openoffice/trunk/main/jvmaccess/util/mingw.map (original)
+++ openoffice/trunk/main/jvmaccess/util/mingw.map Sat Mar 24 00:00:51 2018
@@ -28,8 +28,8 @@ UDK_3_0_0 {
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_;
#
jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException
const &)
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; #
jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_;
# jvmaccess::VirtualMachine::AttachGuard::CreationException::operator
=(CreationException const &)
- # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
- # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
_ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE;
# jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference<
VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE;
# jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference<
VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; #
jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
@@ -52,8 +52,8 @@ UDK_3_0_0 {
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; #
jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; #
jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; #
jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException
const &)
- # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
for jvmaccess::UnoVirtualMachine::CreationException
- # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
name for jvmaccess::UnoVirtualMachine::CreationException
+ _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for
jvmaccess::UnoVirtualMachine::CreationException
+ _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
name for jvmaccess::UnoVirtualMachine::CreationException
_ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv;
# jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference<
jvmaccess::VirtualMachine > const &, void *)
_ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv;
# jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference<
jvmaccess::VirtualMachine > const &, void *)
_ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; #
jvmaccess::UnoVirtualMachine::getVirtualMachine() const
