Author: jim
Date: Mon Jan 14 22:46:03 2019
New Revision: 1851303
URL: http://svn.apache.org/viewvc?rev=1851303&view=rev
Log:
Backport tested patches from trunk to 4.2.x branch
Modified:
openoffice/branches/AOO42X/main/Repository.mk
openoffice/branches/AOO42X/main/basebmp/inc/basebmp/packedpixeliterator.hxx
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
openoffice/branches/AOO42X/main/bridges/java/java_uno/build.xml
openoffice/branches/AOO42X/main/bridges/java/java_uno/manifest
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
openoffice/branches/AOO42X/main/bridges/prj/build.lst
openoffice/branches/AOO42X/main/bridges/prj/d.lst
openoffice/branches/AOO42X/main/bridges/prj/makefile.mk
openoffice/branches/AOO42X/main/bridges/source/bridge_exports.map
openoffice/branches/AOO42X/main/bridges/source/cpp_uno/shared/component.cxx
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/makefile.mk
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest
openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_bridge.cxx
openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_data.cxx
openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_info.cxx
openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_java2uno.cxx
openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_uno2java.cxx
openoffice/branches/AOO42X/main/bridges/source/jni_uno/nativethreadpool.cxx
openoffice/branches/AOO42X/main/cpputools/prj/build.lst
openoffice/branches/AOO42X/main/cpputools/prj/d.lst
openoffice/branches/AOO42X/main/cpputools/prj/makefile.mk
openoffice/branches/AOO42X/main/dbaccess/source/ui/app/app.src
openoffice/branches/AOO42X/main/desktop/source/app/desktop.src
openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk
openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk
Modified: openoffice/branches/AOO42X/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/Repository.mk?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/Repository.mk (original)
+++ openoffice/branches/AOO42X/main/Repository.mk Mon Jan 14 22:46:03 2019
@@ -44,6 +44,8 @@ $(eval $(call gb_Helper_register_executa
))
$(eval $(call gb_Helper_register_executables,OOO, \
+ regsingleton \
+ sp2bv \
spadmin.bin \
))
@@ -58,8 +60,10 @@ $(eval $(call gb_Helper_register_executa
$(eval $(call gb_Helper_register_executables,UREBIN, \
javaldx \
+ regcomp \
regmerge \
regview \
+ uno \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
Modified:
openoffice/branches/AOO42X/main/basebmp/inc/basebmp/packedpixeliterator.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/basebmp/inc/basebmp/packedpixeliterator.hxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/basebmp/inc/basebmp/packedpixeliterator.hxx
(original)
+++ openoffice/branches/AOO42X/main/basebmp/inc/basebmp/packedpixeliterator.hxx
Mon Jan 14 22:46:03 2019
@@ -83,7 +83,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
private:
@@ -253,7 +253,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
private:
@@ -506,7 +506,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
// TODO(F2): direction of iteration (ImageIterator can be made to
Modified:
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
(original)
+++
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
Mon Jan 14 22:46:03 2019
@@ -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_bridges.hxx"
+
Modified:
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
(original)
+++
openoffice/branches/AOO42X/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
Mon Jan 14 22:46:03 2019
@@ -0,0 +1,144 @@
+/**************************************************************
+ *
+ * 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:31.967936
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "boost/static_assert.hpp"
+
+#include "com/sun/star/bridge/InvalidProtocolChangeException.hdl"
+#include "com/sun/star/bridge/InvalidProtocolChangeException.hpp"
+#include "com/sun/star/bridge/ProtocolProperty.hdl"
+#include "com/sun/star/bridge/ProtocolProperty.hpp"
+#include "com/sun/star/bridge/XBridge.hpp"
+#include "com/sun/star/bridge/XBridgeFactory.hpp"
+#include "com/sun/star/bridge/XInstanceProvider.hpp"
+#include "com/sun/star/bridge/XUnoUrlResolver.hpp"
+#include "com/sun/star/connection/ConnectionSetupException.hpp"
+#include "com/sun/star/connection/NoConnectException.hpp"
+#include "com/sun/star/connection/XAcceptor.hpp"
+#include "com/sun/star/connection/XConnection.hpp"
+#include "com/sun/star/connection/XConnector.hpp"
+#include "com/sun/star/frame/XComponentLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMain.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/registry/InvalidRegistryException.hpp"
+#include "com/sun/star/registry/XImplementationRegistration.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/text/XTextDocument.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hdl"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hdl"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/TypeClass.hdl"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hdl"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/genfunc.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "cppuhelper/weak.hxx"
+
+
+#include "osl/conditn.h"
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/doublecheckedlocking.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/mutex.h"
+#include "osl/mutex.hxx"
+#include "osl/process.h"
+#include "osl/semaphor.h"
+#include "osl/thread.h"
+#include "osl/thread.hxx"
+#include "osl/time.h"
+
+#include "rtl/alloc.h"
+#include "rtl/byteseq.h"
+#include "rtl/byteseq.hxx"
+#include "rtl/instance.hxx"
+#include "rtl/memory.h"
+#include "rtl/process.h"
+#include "rtl/random.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/unload.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sal/alloca.h"
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "sys/types.h"
+
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+#include "typelib/typedescription.hxx"
+
+#include "uno/any2.h"
+#include "uno/data.h"
+#include "uno/dispatcher.h"
+#include "uno/environment.h"
+#include "uno/environment.hxx"
+#include "uno/lbnames.h"
+#include "uno/mapping.h"
+#include "uno/mapping.hxx"
+#include "uno/sequence2.h"
+#include "uno/threadpool.h"
+//---MARKER---
+#endif
Modified: openoffice/branches/AOO42X/main/bridges/java/java_uno/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/java/java_uno/build.xml?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/java/java_uno/build.xml (original)
+++ openoffice/branches/AOO42X/main/bridges/java/java_uno/build.xml Mon Jan 14
22:46:03 2019
@@ -0,0 +1,41 @@
+<?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" default="main" basedir=".">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+ <property name="jar.classpath" value="jurt.jar ridl.jar ../../lib/
../bin/"/>
+ <property name="jar.manifest" value="manifest"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ </path>
+ </target>
+
+</project>
+
Modified: openoffice/branches/AOO42X/main/bridges/java/java_uno/manifest
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/java/java_uno/manifest?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/java/java_uno/manifest (original)
+++ openoffice/branches/AOO42X/main/bridges/java/java_uno/manifest Mon Jan 14
22:46:03 2019
@@ -0,0 +1 @@
+Sealed: true
Modified:
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
(original)
+++
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
Mon Jan 14 22:46:03 2019
@@ -0,0 +1,48 @@
+/**************************************************************
+ *
+ * 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.
+ *
+ *************************************************************/
+
+
+
+package com.sun.star.bridges.jni_uno;
+
+import com.sun.star.lib.util.NativeLibraryLoader;
+
+//==============================================================================
+public final class JNI_info_holder
+{
+ static {
+ NativeLibraryLoader.loadLibrary(JNI_info_holder.class.getClassLoader(),
+ "java_uno");
+ }
+
+ private static JNI_info_holder s_holder = new JNI_info_holder();
+
+ private static long s_jni_info_handle;
+
+
//__________________________________________________________________________
+ private native void finalize( long jni_info_handle );
+
+
//__________________________________________________________________________
+ protected void finalize()
+ {
+ finalize( s_jni_info_handle );
+ }
+}
Modified:
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
(original)
+++
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
Mon Jan 14 22:46:03 2019
@@ -0,0 +1,214 @@
+/**************************************************************
+ *
+ * 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.
+ *
+ *************************************************************/
+
+
+
+package com.sun.star.bridges.jni_uno;
+
+import com.sun.star.lib.util.AsynchronousFinalizer;
+import com.sun.star.lib.util.NativeLibraryLoader;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.IEnvironment;
+import com.sun.star.uno.IQueryInterface;
+
+
+//==============================================================================
+public final class JNI_proxy implements java.lang.reflect.InvocationHandler
+{
+ static {
+ NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(),
+ "java_uno");
+ }
+ protected static ClassLoader s_classloader =
+ JNI_proxy.class.getClassLoader();
+ protected static Class s_InvocationHandler [] =
+ new Class [] { java.lang.reflect.InvocationHandler.class };
+
+ protected long m_bridge_handle;
+ protected IEnvironment m_java_env;
+ protected long m_receiver_handle;
+ protected long m_td_handle;
+ protected Type m_type;
+ protected String m_oid;
+ protected Class m_class;
+
+
//__________________________________________________________________________
+ public static String get_stack_trace( Throwable throwable )
+ throws Throwable
+ {
+ boolean current_trace = false;
+ if (null == throwable)
+ {
+ throwable = new Throwable();
+ current_trace = true;
+ }
+ java.io.StringWriter string_writer =
+ new java.io.StringWriter();
+ java.io.PrintWriter print_writer =
+ new java.io.PrintWriter( string_writer, true );
+ throwable.printStackTrace( print_writer );
+ print_writer.flush();
+ print_writer.close();
+ string_writer.flush();
+ String trace = string_writer.toString();
+ if (current_trace)
+ {
+ // cut out first two lines
+ int n = trace.indexOf( '\n' );
+ n = trace.indexOf( '\n', n +1 );
+ trace = trace.substring( n +1 );
+ }
+ return "\njava stack trace:\n" + trace;
+ }
+
+
//__________________________________________________________________________
+ private native void finalize( long bridge_handle );
+
+
//__________________________________________________________________________
+ public void finalize()
+ {
+ AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() {
+ public void run() throws Throwable {
+ JNI_proxy.this.finalize( m_bridge_handle );
+ }
+ });
+ }
+
+
//__________________________________________________________________________
+ private JNI_proxy(
+ long bridge_handle, IEnvironment java_env,
+ long receiver_handle, long td_handle, Type type, String oid )
+ {
+ m_bridge_handle = bridge_handle;
+ m_java_env = java_env;
+ m_receiver_handle = receiver_handle;
+ m_td_handle = td_handle;
+ m_type = type;
+ m_oid = oid;
+ m_class = m_type.getZClass();
+ }
+
+
//__________________________________________________________________________
+ public static Object create(
+ long bridge_handle, IEnvironment java_env,
+ long receiver_handle, long td_handle, Type type, String oid,
+ java.lang.reflect.Constructor proxy_ctor )
+ throws Throwable
+ {
+ JNI_proxy handler = new JNI_proxy(
+ bridge_handle, java_env, receiver_handle, td_handle, type, oid );
+ Object proxy = proxy_ctor.newInstance( new Object [] { handler } );
+ return java_env.registerInterface( proxy, new String [] { oid }, type
);
+ }
+
+
//__________________________________________________________________________
+ public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz )
+ throws Throwable
+ {
+ Class proxy_class = java.lang.reflect.Proxy.getProxyClass(
+ s_classloader,
+ new Class [] { clazz, IQueryInterface.class,
+ com.sun.star.lib.uno.Proxy.class } );
+ return proxy_class.getConstructor( s_InvocationHandler );
+ }
+
+
//__________________________________________________________________________
+ private native Object dispatch_call(
+ long bridge_handle, String decl_class, String method, Object args [] )
+ throws Throwable;
+
+ // InvocationHandler impl
+
//__________________________________________________________________________
+ public Object invoke(
+ Object proxy, java.lang.reflect.Method method, Object args [] )
+ throws Throwable
+ {
+ Class decl_class = method.getDeclaringClass();
+ String method_name = method.getName();
+
+ if (Object.class.equals( decl_class ))
+ {
+ if (method_name.equals( "hashCode" ))
+ {
+ // int hashCode()
+ return Integer.valueOf( m_oid.hashCode() );
+ }
+ else if (method_name.equals( "equals" ))
+ {
+ // boolean equals( Object obj )
+ return isSame(args[0]);
+ }
+ else if (method_name.equals( "toString" ))
+ {
+ // String toString()
+ return this.toString() + " [oid=" + m_oid +
+ ", type=" + m_type.getTypeName() + "]";
+ }
+ }
+ // UNO interface call
+ else if (decl_class.isAssignableFrom( m_class ))
+ {
+ // dispatch interface call
+ return dispatch_call(
+ m_bridge_handle, decl_class.getName(), method_name, args );
+ }
+ // IQueryInterface impl
+ else if (IQueryInterface.class.equals( decl_class ))
+ {
+ if (method_name.equals( "queryInterface" ))
+ {
+ // Object queryInterface( Type type )
+ Object registered_proxy =
+ m_java_env.getRegisteredInterface( m_oid, (Type)args[ 0 ]
);
+ if (null == registered_proxy)
+ {
+ return dispatch_call(
+ m_bridge_handle,
+ "com.sun.star.uno.XInterface", method_name, args );
+ }
+ else
+ {
+ return registered_proxy;
+ }
+ }
+ else if (method_name.equals( "isSame" ))
+ {
+ // boolean isSame( Object object )
+ return isSame(args[0]);
+ }
+ else if (method_name.equals( "getOid" ))
+ {
+ // String getOid()
+ return m_oid;
+ }
+ }
+
+ throw new com.sun.star.uno.RuntimeException(
+ "[jni_uno bridge error] unexpected call on proxy " +
+ proxy.toString() + ": " + method.toString() );
+ }
+
+ private Boolean isSame(Object obj) {
+ return obj != null
+ && m_oid.equals(UnoRuntime.generateOid(obj));
+ }
+}
Modified:
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
(original)
+++
openoffice/branches/AOO42X/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
Mon Jan 14 22:46:03 2019
@@ -0,0 +1,49 @@
+#**************************************************************
+#
+# 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=bridges
+TARGET=java_uno
+PACKAGE=com$/sun$/star$/bridges$/jni_uno
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+JARFILES=jurt.jar ridl.jar
+JAVAFILES=$(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java
$(JAVACLASSFILES)))
+
+JAVACLASSFILES= \
+ $(CLASSDIR)$/$(PACKAGE)$/JNI_proxy.class \
+ $(CLASSDIR)$/$(PACKAGE)$/JNI_info_holder.class
+
+JARCLASSDIRS=$(PACKAGE)
+JARTARGET=$(TARGET).jar
+JARCOMPRESS=TRUE
+JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/
+CUSTOMMANIFESTFILE = manifest
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
Modified: openoffice/branches/AOO42X/main/bridges/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/prj/build.lst?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/prj/build.lst (original)
+++ openoffice/branches/AOO42X/main/bridges/prj/build.lst Mon Jan 14 22:46:03
2019
@@ -1,36 +1,2 @@
br bridges : cppuhelper jurt jvmaccess salhelper NULL
-br bridges
usr1 - all br_mkout NULL
-br bridges\inc
nmake - all br_inc NULL
-br bridges\unotypes nmake
- all br_unotypes NULL
-br bridges\source\cpp_uno\mingw_intel nmake - w
br_gcc3i br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci
br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_intel nmake - u
br_gcc3li br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_os2_intel nmake - p
br_gcc3os br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u
br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_x86-64 nmake - u
br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u
br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_powerpc nmake - u
br_gcc3fp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_powerpc64 nmake - u
br_gcc3fp_64 br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u
br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u
br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_mips nmake - u
br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_m68k nmake - u
br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u
br_gcc3l3 br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u
br_gcc3l3_64 br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_sparc nmake - u
br_gcc3ls br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_arm nmake - u
br_gcc3lr br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u
br_gcc3la br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u
br_gcc3lh br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u
br_gcc3ll br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_macosx_intel nmake
- u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake
- u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\s5abi_macosx_x86-64 nmake
- u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\cc50_solaris_sparc nmake
- u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64
br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\cc50_solaris_intel nmake
- u br_cc50soli br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_solaris_sparc nmake
- u br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_solaris_intel nmake
- u br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u
br_gccni br_unotypes br_inc NULL
-br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared
br_unotypes br_inc NULL
-br bridges\source\jni_uno nmake -
all br_jni_uno br_unotypes br_inc NULL
-br bridges\source\jni_uno\java\com\sun\star\bridges\jni_uno
nmake - all br_jni_uno_java br_unotypes br_inc NULL
+br bridges\prj
nmake - all br_prj NULL
Modified: openoffice/branches/AOO42X/main/bridges/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/prj/d.lst?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/bridges/prj/d.lst Mon Jan 14 22:46:03 2019
@@ -1,11 +0,0 @@
-..\%__SRC%\lib\libjava_uno* %_DEST%\lib%_EXT%\libjava_uno*
-..\%__SRC%\bin\java_uno* %_DEST%\bin%_EXT%\java_uno*
-..\%__SRC%\class\java_uno*.jar %_DEST%\bin%_EXT%\java_uno*.jar
-
-..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.*
-..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin%_EXT%\gcc3_uno.dll
-..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
-..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
-..\%__SRC%\lib\libs5abi_uno.* %_DEST%\lib%_EXT%\libs5abi_uno.*
-..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
-..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
Modified: openoffice/branches/AOO42X/main/bridges/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/prj/makefile.mk?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/prj/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/bridges/prj/makefile.mk Mon Jan 14 22:46:03
2019
@@ -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/branches/AOO42X/main/bridges/source/bridge_exports.map
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/bridge_exports.map?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/bridge_exports.map (original)
+++ openoffice/branches/AOO42X/main/bridges/source/bridge_exports.map Mon Jan
14 22:46:03 2019
@@ -23,6 +23,24 @@ UDK_3_0_0 {
component_canUnload;
uno_initEnvironment;
uno_ext_getMapping;
+
+
+ ###############################################
+ # C++ RTTI for exception handling:
+ ###############################################
+
+ # typeinfo for com::sun::star::uno::RuntimeException
+ _ZTIN3com3sun4star3uno16RuntimeExceptionE;
+
+ # typeinfo for com::sun::star::uno::Exception
+ _ZTIN3com3sun4star3uno9ExceptionE;
+
+ # typeinfo name for com::sun::star::uno::RuntimeException
+ _ZTSN3com3sun4star3uno16RuntimeExceptionE;
+
+ # typeinfo name for com::sun::star::uno::Exception
+ _ZTSN3com3sun4star3uno9ExceptionE;
+
local:
*;
};
Modified:
openoffice/branches/AOO42X/main/bridges/source/cpp_uno/shared/component.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/cpp_uno/shared/component.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/cpp_uno/shared/component.cxx
(original)
+++ openoffice/branches/AOO42X/main/bridges/source/cpp_uno/shared/component.cxx
Mon Jan 14 22:46:03 2019
@@ -192,12 +192,12 @@ static void SAL_CALL environmentDisposin
&bridges::cpp_uno::shared::g_moduleCount.modCnt );
}
-sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SAL_THROW_EXTERN_C() {
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(TimeValue * pTime)
SAL_THROW_EXTERN_C() {
return bridges::cpp_uno::shared::g_moduleCount.canUnload(
&bridges::cpp_uno::shared::g_moduleCount, pTime);
}
-void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv)
+SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment *
pCppEnv)
SAL_THROW_EXTERN_C()
{
OSL_ENSURE( pCppEnv->pExtEnv, "### expected extended environment!" );
@@ -215,7 +215,7 @@ void SAL_CALL uno_initEnvironment(uno_En
pCppEnv->environmentDisposing = environmentDisposing;
}
-void SAL_CALL uno_ext_getMapping(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo)
SAL_THROW_EXTERN_C()
{
Modified:
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
(original)
+++
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
Mon Jan 14 22:46:03 2019
@@ -1,48 +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.
- *
- *************************************************************/
-
-
-
-package com.sun.star.bridges.jni_uno;
-
-import com.sun.star.lib.util.NativeLibraryLoader;
-
-//==============================================================================
-public final class JNI_info_holder
-{
- static {
- NativeLibraryLoader.loadLibrary(JNI_info_holder.class.getClassLoader(),
- "java_uno");
- }
-
- private static JNI_info_holder s_holder = new JNI_info_holder();
-
- private static long s_jni_info_handle;
-
-
//__________________________________________________________________________
- private native void finalize( long jni_info_handle );
-
-
//__________________________________________________________________________
- protected void finalize()
- {
- finalize( s_jni_info_handle );
- }
-}
Modified:
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
(original)
+++
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
Mon Jan 14 22:46:03 2019
@@ -1,214 +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.
- *
- *************************************************************/
-
-
-
-package com.sun.star.bridges.jni_uno;
-
-import com.sun.star.lib.util.AsynchronousFinalizer;
-import com.sun.star.lib.util.NativeLibraryLoader;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.IEnvironment;
-import com.sun.star.uno.IQueryInterface;
-
-
-//==============================================================================
-public final class JNI_proxy implements java.lang.reflect.InvocationHandler
-{
- static {
- NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(),
- "java_uno");
- }
- protected static ClassLoader s_classloader =
- JNI_proxy.class.getClassLoader();
- protected static Class s_InvocationHandler [] =
- new Class [] { java.lang.reflect.InvocationHandler.class };
-
- protected long m_bridge_handle;
- protected IEnvironment m_java_env;
- protected long m_receiver_handle;
- protected long m_td_handle;
- protected Type m_type;
- protected String m_oid;
- protected Class m_class;
-
-
//__________________________________________________________________________
- public static String get_stack_trace( Throwable throwable )
- throws Throwable
- {
- boolean current_trace = false;
- if (null == throwable)
- {
- throwable = new Throwable();
- current_trace = true;
- }
- java.io.StringWriter string_writer =
- new java.io.StringWriter();
- java.io.PrintWriter print_writer =
- new java.io.PrintWriter( string_writer, true );
- throwable.printStackTrace( print_writer );
- print_writer.flush();
- print_writer.close();
- string_writer.flush();
- String trace = string_writer.toString();
- if (current_trace)
- {
- // cut out first two lines
- int n = trace.indexOf( '\n' );
- n = trace.indexOf( '\n', n +1 );
- trace = trace.substring( n +1 );
- }
- return "\njava stack trace:\n" + trace;
- }
-
-
//__________________________________________________________________________
- private native void finalize( long bridge_handle );
-
-
//__________________________________________________________________________
- public void finalize()
- {
- AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() {
- public void run() throws Throwable {
- JNI_proxy.this.finalize( m_bridge_handle );
- }
- });
- }
-
-
//__________________________________________________________________________
- private JNI_proxy(
- long bridge_handle, IEnvironment java_env,
- long receiver_handle, long td_handle, Type type, String oid )
- {
- m_bridge_handle = bridge_handle;
- m_java_env = java_env;
- m_receiver_handle = receiver_handle;
- m_td_handle = td_handle;
- m_type = type;
- m_oid = oid;
- m_class = m_type.getZClass();
- }
-
-
//__________________________________________________________________________
- public static Object create(
- long bridge_handle, IEnvironment java_env,
- long receiver_handle, long td_handle, Type type, String oid,
- java.lang.reflect.Constructor proxy_ctor )
- throws Throwable
- {
- JNI_proxy handler = new JNI_proxy(
- bridge_handle, java_env, receiver_handle, td_handle, type, oid );
- Object proxy = proxy_ctor.newInstance( new Object [] { handler } );
- return java_env.registerInterface( proxy, new String [] { oid }, type
);
- }
-
-
//__________________________________________________________________________
- public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz )
- throws Throwable
- {
- Class proxy_class = java.lang.reflect.Proxy.getProxyClass(
- s_classloader,
- new Class [] { clazz, IQueryInterface.class,
- com.sun.star.lib.uno.Proxy.class } );
- return proxy_class.getConstructor( s_InvocationHandler );
- }
-
-
//__________________________________________________________________________
- private native Object dispatch_call(
- long bridge_handle, String decl_class, String method, Object args [] )
- throws Throwable;
-
- // InvocationHandler impl
-
//__________________________________________________________________________
- public Object invoke(
- Object proxy, java.lang.reflect.Method method, Object args [] )
- throws Throwable
- {
- Class decl_class = method.getDeclaringClass();
- String method_name = method.getName();
-
- if (Object.class.equals( decl_class ))
- {
- if (method_name.equals( "hashCode" ))
- {
- // int hashCode()
- return new Integer( m_oid.hashCode() );
- }
- else if (method_name.equals( "equals" ))
- {
- // boolean equals( Object obj )
- return isSame(args[0]);
- }
- else if (method_name.equals( "toString" ))
- {
- // String toString()
- return this.toString() + " [oid=" + m_oid +
- ", type=" + m_type.getTypeName() + "]";
- }
- }
- // UNO interface call
- else if (decl_class.isAssignableFrom( m_class ))
- {
- // dispatch interface call
- return dispatch_call(
- m_bridge_handle, decl_class.getName(), method_name, args );
- }
- // IQueryInterface impl
- else if (IQueryInterface.class.equals( decl_class ))
- {
- if (method_name.equals( "queryInterface" ))
- {
- // Object queryInterface( Type type )
- Object registered_proxy =
- m_java_env.getRegisteredInterface( m_oid, (Type)args[ 0 ]
);
- if (null == registered_proxy)
- {
- return dispatch_call(
- m_bridge_handle,
- "com.sun.star.uno.XInterface", method_name, args );
- }
- else
- {
- return registered_proxy;
- }
- }
- else if (method_name.equals( "isSame" ))
- {
- // boolean isSame( Object object )
- return isSame(args[0]);
- }
- else if (method_name.equals( "getOid" ))
- {
- // String getOid()
- return m_oid;
- }
- }
-
- throw new com.sun.star.uno.RuntimeException(
- "[jni_uno bridge error] unexpected call on proxy " +
- proxy.toString() + ": " + method.toString() );
- }
-
- private Boolean isSame(Object obj) {
- return new Boolean(obj != null
- && m_oid.equals(UnoRuntime.generateOid(obj)));
- }
-}
Modified:
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/makefile.mk?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/makefile.mk
(original)
+++
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/makefile.mk
Mon Jan 14 22:46:03 2019
@@ -1,49 +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=bridges
-TARGET=java_uno
-PACKAGE=com$/sun$/star$/bridges$/jni_uno
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES=jurt.jar ridl.jar
-JAVAFILES=$(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java
$(JAVACLASSFILES)))
-
-JAVACLASSFILES= \
- $(CLASSDIR)$/$(PACKAGE)$/JNI_proxy.class \
- $(CLASSDIR)$/$(PACKAGE)$/JNI_info_holder.class
-
-JARCLASSDIRS=$(PACKAGE)
-JARTARGET=$(TARGET).jar
-JARCOMPRESS=TRUE
-JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/
-CUSTOMMANIFESTFILE = manifest
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
Modified:
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest
(original)
+++
openoffice/branches/AOO42X/main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest
Mon Jan 14 22:46:03 2019
@@ -1 +0,0 @@
-Sealed: true
Modified: openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_bridge.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_bridge.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_bridge.cxx
(original)
+++ openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_bridge.cxx Mon
Jan 14 22:46:03 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jni_bridge.h"
@@ -452,7 +452,7 @@ void SAL_CALL java_env_disposing( uno_En
}
//------------------------------------------------------------------------------
-void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
+JNIEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
SAL_THROW_EXTERN_C()
{
java_env->environmentDisposing = java_env_disposing;
@@ -466,7 +466,7 @@ void SAL_CALL uno_initEnvironment( uno_E
}
//------------------------------------------------------------------------------
-void SAL_CALL uno_ext_getMapping(
+JNIEXPORT void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
SAL_THROW_EXTERN_C()
{
@@ -557,7 +557,7 @@ void SAL_CALL uno_ext_getMapping(
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
+JNIEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
SAL_THROW_EXTERN_C()
{
return (*g_moduleCount.canUnload)( &g_moduleCount, pTime );
Modified: openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_data.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_data.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_data.cxx
(original)
+++ openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_data.cxx Mon Jan
14 22:46:03 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jni_bridge.h"
Modified: openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_info.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_info.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_info.cxx
(original)
+++ openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_info.cxx Mon Jan
14 22:46:03 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jni_bridge.h"
#include "com/sun/star/uno/RuntimeException.hpp"
Modified:
openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_java2uno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_java2uno.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_java2uno.cxx
(original)
+++ openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_java2uno.cxx Mon
Jan 14 22:46:03 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include <sal/alloca.h>
Modified:
openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_uno2java.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_uno2java.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_uno2java.cxx
(original)
+++ openoffice/branches/AOO42X/main/bridges/source/jni_uno/jni_uno2java.cxx Mon
Jan 14 22:46:03 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include <sal/alloca.h>
Modified:
openoffice/branches/AOO42X/main/bridges/source/jni_uno/nativethreadpool.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/bridges/source/jni_uno/nativethreadpool.cxx?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/bridges/source/jni_uno/nativethreadpool.cxx
(original)
+++ openoffice/branches/AOO42X/main/bridges/source/jni_uno/nativethreadpool.cxx
Mon Jan 14 22:46:03 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jvmaccess/virtualmachine.hxx"
#include "rtl/byteseq.h"
Modified: openoffice/branches/AOO42X/main/cpputools/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/cpputools/prj/build.lst?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/cpputools/prj/build.lst (original)
+++ openoffice/branches/AOO42X/main/cpputools/prj/build.lst Mon Jan 14 22:46:03
2019
@@ -1,7 +1,2 @@
pt cpputools : cppuhelper offapi LIBXML2:libxml2 NULL
-pt cpputools
usr1 - all pt_mkout NULL
-pt cpputools\prj get
- all pt_prj NULL
-pt cpputools\source\registercomponent nmake - all
pt_regcomp NULL
-pt cpputools\source\regsingleton nmake -
all pt_regsingleton NULL
-pt cpputools\source\unoexe nmake -
all pt_unoexe NULL
-pt cpputools\source\sp2bv nmake -
all pt_sp2bv NULL
+pt cpputools\prj nmake
- all pt_prj NULL
Modified: openoffice/branches/AOO42X/main/cpputools/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/cpputools/prj/d.lst?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/cpputools/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/cpputools/prj/d.lst Mon Jan 14 22:46:03 2019
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp.bin
-..\%__SRC%\bin\uno.exe %_DEST%\bin%_EXT%\uno.exe
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno.bin
-..\%__SRC%\bin\regsingleton.exe %_DEST%\bin%_EXT%\regsingleton.exe
-..\%__SRC%\bin\regsingleton %_DEST%\bin%_EXT%\regsingleton
-..\%__SRC%\bin\sp2bv.exe %_DEST%\bin%_EXT%\sp2bv.exe
-..\%__SRC%\bin\sp2bv %_DEST%\bin%_EXT%\sp2bv
Modified: openoffice/branches/AOO42X/main/cpputools/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/cpputools/prj/makefile.mk?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/cpputools/prj/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/cpputools/prj/makefile.mk Mon Jan 14
22:46:03 2019
@@ -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/branches/AOO42X/main/dbaccess/source/ui/app/app.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/dbaccess/source/ui/app/app.src?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/dbaccess/source/ui/app/app.src (original)
+++ openoffice/branches/AOO42X/main/dbaccess/source/ui/app/app.src Mon Jan 14
22:46:03 2019
@@ -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.
- *
+ *
*************************************************************/
@@ -39,7 +39,7 @@
#include "toolbox.hrc"
#endif
-#define MN_PROPS 25
+#define MN_PROPS 25
String RID_STR_NEW_FORM
@@ -106,59 +106,58 @@ Menu RID_MENU_APP_NEW
{
MenuItem
{
- Identifier = SID_APP_NEW_FORM;
- Command = ".uno:DBNewForm";
+ Identifier = SID_APP_NEW_FORM ;
+ Command = ".uno:DBNewForm" ;
Text [ en-US ] = "Form..." ;
};
MenuItem
{
- Identifier = SID_APP_NEW_REPORT;
- Command = ".uno:DBNewReport";
+ Identifier = SID_APP_NEW_REPORT ;
+ Command = ".uno:DBNewReport" ;
Text [ en-US ] = "Report..." ;
};
MenuItem
{
MID_DOCUMENT_CREATE_REPWIZ
- Command = ".uno:DBNewReportAutoPilot";
+ Command = ".uno:DBNewReportAutoPilot" ;
};
MenuItem
{
MID_QUERY_NEW_DESIGN
- Command = ".uno:DBNewQuery";
+ Command = ".uno:DBNewQuery" ;
};
MenuItem
{
MID_QUERY_NEW_SQL
- Command = ".uno:DBNewQuerySql";
+ Command = ".uno:DBNewQuerySql" ;
};
MenuItem
{
- Separator = TRUE;
+ Separator = TRUE ;
};
MenuItem
{
MID_NEW_TABLE_DESIGN
- Command = ".uno:DBNewTable";
+ Command = ".uno:DBNewTable" ;
};
MenuItem
{
MID_NEW_VIEW_DESIGN
- Command = ".uno:DBNewView";
+ Command = ".uno:DBNewView" ;
};
MenuItem
{
- Identifier = SID_DB_NEW_VIEW_SQL;
- Command = ".uno:DBNewViewSQL";
+ Identifier = SID_DB_NEW_VIEW_SQL ;
+ Command = ".uno:DBNewViewSQL" ;
Text [ en-US ] = "View (Simple)..." ;
};
-
};
};
Menu RID_MENU_APP_EDIT
{
- ItemList =
- {
+ ItemList =
+ {
MenuItem
{
ITEM_EDIT_COPY
@@ -169,9 +168,9 @@ Menu RID_MENU_APP_EDIT
};
MenuItem
{
- Identifier = SID_DB_APP_PASTE_SPECIAL;
- Text[ en-US ] = "Paste Special...";
- Command = ".uno:PasteSpecial";
+ Identifier = SID_DB_APP_PASTE_SPECIAL ;
+ Text [ en-US ] = "Paste Special..." ;
+ Command = ".uno:PasteSpecial" ;
};
MenuItem
{
@@ -179,58 +178,57 @@ Menu RID_MENU_APP_EDIT
};
MenuItem
{
- Identifier = SID_DB_APP_DELETE;
- Text[ en-US ] = "Delete";
- Command = ".uno:DBDelete";
+ Identifier = SID_DB_APP_DELETE ;
+ Text [ en-US ] = "Delete" ;
+ Command = ".uno:DBDelete" ;
};
MenuItem
{
- Identifier = SID_DB_APP_RENAME;
- Text[ en-US ] = "Rename";
- Command = ".uno:DBRename";
+ Identifier = SID_DB_APP_RENAME ;
+ Text [ en-US ] = "Rename" ;
+ Command = ".uno:DBRename" ;
};
MenuItem
{
- Identifier = SID_DB_APP_EDIT;
- Text[ en-US ] = "Edit";
- Command = ".uno:DBEdit";
+ Identifier = SID_DB_APP_EDIT ;
+ Text [ en-US ] = "Edit" ;
+ Command = ".uno:DBEdit" ;
};
MenuItem
{
- Identifier = SID_DB_APP_EDIT_SQL_VIEW;
- Text [ en-US ] = "Edit in SQL View...";
- Command = ".uno:DBEditSqlView";
+ Identifier = SID_DB_APP_EDIT_SQL_VIEW ;
+ Text [ en-US ] = "Edit in SQL View..." ;
+ Command = ".uno:DBEditSqlView" ;
};
MenuItem
{
- Identifier = SID_DB_APP_OPEN;
- Text[ en-US ] = "Open";
- Command = ".uno:DBOpen";
+ Identifier = SID_DB_APP_OPEN ;
+ Text [ en-US ] = "Open" ;
+ Command = ".uno:DBOpen" ;
};
MenuItem
{
- Identifier = SID_DB_APP_CONVERTTOVIEW;
- Text[ en-US ] = "Create as View";
- Command = ".uno:DBConvertToView";
+ Identifier = SID_DB_APP_CONVERTTOVIEW ;
+ Text [ en-US ] = "Create as View" ;
+ Command = ".uno:DBConvertToView" ;
};
MenuItem
{
- Identifier = SID_FORM_CREATE_REPWIZ_PRE_SEL;
- Text [ en-US ] = "Form Wizard...";
- Command = ".uno:DBNewFormAutoPilotWithPreSelection";
+ Identifier = SID_FORM_CREATE_REPWIZ_PRE_SEL ;
+ Text [ en-US ] = "Form Wizard..." ;
+ Command = ".uno:DBNewFormAutoPilotWithPreSelection" ;
};
- MenuItem
+ MenuItem
{
- Identifier = SID_APP_NEW_REPORT_PRE_SEL;
- Command = ".uno:DBNewReportWithPreSelection";
+ Identifier = SID_APP_NEW_REPORT_PRE_SEL ;
+ Command = ".uno:DBNewReportWithPreSelection" ;
Text [ en-US ] = "Report..." ;
};
MenuItem
{
Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ;
- Text[ en-US ] = "Report Wizard...";
-
- Command = ".uno:DBNewReportAutoPilotWithPreSelection";
+ Text [ en-US ] = "Report Wizard..." ;
+ Command = ".uno:DBNewReportAutoPilotWithPreSelection" ;
};
MenuItem
{
@@ -238,9 +236,9 @@ Menu RID_MENU_APP_EDIT
};
MenuItem
{
- Identifier = SID_SELECTALL;
- Text[ en-US ] = "Select All";
- Command = ".uno:SelectAll";
+ Identifier = SID_SELECTALL ;
+ Text [ en-US ] = "Select All" ;
+ Command = ".uno:SelectAll" ;
};
MenuItem
{
@@ -248,29 +246,29 @@ Menu RID_MENU_APP_EDIT
};
MenuItem
{
- Identifier = MN_PROPS;
- Text[ en-US ] = "~Database";
+ Identifier = MN_PROPS ;
+ Text [ en-US ] = "~Database" ;
SubMenu = Menu
{
ItemList =
{
MenuItem
{
- Identifier = SID_DB_APP_DSPROPS;
- Text[ en-US ] = "Properties...";
- Command = ".uno:DBDSProperties";
+ Identifier = SID_DB_APP_DSPROPS
;
+ Text [ en-US ] =
"Properties..." ;
+ Command = ".uno:DBDSProperties"
;
};
MenuItem
{
- Identifier =
SID_DB_APP_DSCONNECTION_TYPE;
- Text[ en-US ] = "Connection
Type...";
- Command =
".uno:DBDSConnectionType";
+ Identifier =
SID_DB_APP_DSCONNECTION_TYPE ;
+ Text [ en-US ] = "Connection
Type..." ;
+ Command =
".uno:DBDSConnectionType" ;
};
MenuItem
{
- Identifier =
SID_DB_APP_DSADVANCED_SETTINGS;
- Text[ en-US ] = "Advanced
Settings...";
- Command =
".uno:DBDSAdvancedSettings";
+ Identifier =
SID_DB_APP_DSADVANCED_SETTINGS ;
+ Text [ en-US ] = "Advanced
Settings..." ;
+ Command =
".uno:DBDSAdvancedSettings" ;
};
};
};
@@ -372,41 +370,41 @@ Menu RID_MENU_APP_PREVIEW
{
MenuItem
{
- Identifier = SID_DB_APP_DISABLE_PREVIEW;
- Text[ en-US ] = "None";
- Command = ".uno:DBDisablePreview";
- Checkable = TRUE;
- RadioCheck = TRUE;
- AutoCheck = TRUE;
+ Identifier = SID_DB_APP_DISABLE_PREVIEW ;
+ Text [ en-US ] = "None" ;
+ Command = ".uno:DBDisablePreview" ;
+ Checkable = TRUE ;
+ RadioCheck = TRUE ;
+ AutoCheck = TRUE ;
};
MenuItem
{
- Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
- Text[ en-US ] = "Document Information";
- Command = ".uno:DBShowDocInfoPreview";
- Checkable = TRUE;
- RadioCheck = TRUE;
- AutoCheck = TRUE;
+ Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW ;
+ Text [ en-US ] = "Document Information" ;
+ Command = ".uno:DBShowDocInfoPreview" ;
+ Checkable = TRUE ;
+ RadioCheck = TRUE ;
+ AutoCheck = TRUE ;
};
MenuItem
{
- Identifier = SID_DB_APP_VIEW_DOC_PREVIEW;
- Text[ en-US ] = "Document";
- Command = ".uno:DBShowDocPreview";
- Checkable = TRUE;
- RadioCheck = TRUE;
- AutoCheck = TRUE;
+ Identifier = SID_DB_APP_VIEW_DOC_PREVIEW ;
+ Text [ en-US ] = "Document" ;
+ Command = ".uno:DBShowDocPreview" ;
+ Checkable = TRUE ;
+ RadioCheck = TRUE ;
+ AutoCheck = TRUE ;
};
};
};
String RID_STR_FORM
{
- Text [ en-US ] = "Form";
+ Text [ en-US ] = "Form" ;
};
String RID_STR_REPORT
{
- Text [ en-US ] = "Report";
+ Text [ en-US ] = "Report" ;
};
String STR_FRM_LABEL
{
@@ -424,23 +422,25 @@ String STR_FOLDER_LABEL
String STR_SUB_DOCS_WITH_SCRIPTS
{
- Text [ en-US ] = "The document contains forms or reports with embedded
macros.";
+ Text [ en-US ] = "The document contains forms or reports with embedded
macros." ;
};
String STR_SUB_DOCS_WITH_SCRIPTS_DETAIL
{
- Text [ en-US ] = "Macros should be embedded into the database document
itself.\n\nYou can continue to use your document as before, however, you are
encouraged to migrate your macros. The menu item 'Tools / Migrate Macros ...'
will assist you with this.\n\nNote that you won't be able to embed macros into
the database document itself until this migration is done. ";
+ Text [ en-US ] = "Macros should be embedded into the database document
itself.\n\nYou can continue to use your document as before, however, you are
encouraged to migrate your macros. The menu item 'Tools - Migrate Macros...'
will assist you with this.\n\nNote that you won't be able to embed macros into
the database document itself until this migration is done." ;
};
String RID_STR_EMBEDDED_DATABASE
{
- Text [ en-US ] = "Embedded database";
+ Text [ en-US ] = "Embedded database" ;
};
String RID_STR_NO_DIFF_CAT
{
- Text [ en-US ] = "You cannot select different categories.";
+ Text [ en-US ] = "You cannot select different categories." ;
};
String RID_STR_UNSUPPORTED_OBJECT_TYPE
{
- Text [ en-US ] = "Unsupported object type found ($type$).";
+ Text [ en-US ] = "Unsupported object type found ($type$)." ;
};
+
+// ********************************************************************** EOF
Modified: openoffice/branches/AOO42X/main/desktop/source/app/desktop.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/desktop/source/app/desktop.src?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/desktop/source/app/desktop.src (original)
+++ openoffice/branches/AOO42X/main/desktop/source/app/desktop.src Mon Jan 14
22:46:03 2019
@@ -136,7 +136,7 @@ String STR_BOOTSTRAP_ERR_CFG_DATAACCESS
String STR_INTERNAL_ERRMSG
{
- Text [ en-US ] = "The following internal error has occurred : " ;
+ Text [ en-US ] = "The following internal error has occurred: " ;
};
QueryBox QBX_USERDATALOCKED
@@ -163,9 +163,9 @@ ModalDialog DLG_CMDLINEHELP
HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP" ;
Text = "%PRODUCTNAME Commandline Help" ;
Size = MAP_APPFONT ( 275, 380 ) ;
- Border = True ;
- SVLook = True ;
- Moveable = True ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Moveable = TRUE ;
FixedText TXT_DLG_CMDLINEHELP_HEADER
{
Modified: openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk Mon Jan 14 22:46:03
2019
@@ -167,7 +167,7 @@ LINK*=$(CXX)
LINKC*=$(CC)
###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
-EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad,ff
+EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad_max_install_names
LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'
LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO=-install_name '@_______OOO/$(@:f)'
Modified: openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk?rev=1851303&r1=1851302&r2=1851303&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk Mon Jan 14 22:46:03
2019
@@ -186,7 +186,7 @@ LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/l
LINK*=$(CXX)
LINKC*=$(CC)
-LINKFLAGSDEFS*=-Wl,-headerpad,ff,-multiply_defined,suppress
+LINKFLAGSDEFS*=-Wl,-headerpad_max_install_names,-multiply_defined,suppress
# assure backwards-compatibility
EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'
