summaryrefslogtreecommitdiff
path: root/bridges/source/jni_uno/jni_bridge.h
diff options
context:
space:
mode:
Diffstat (limited to 'bridges/source/jni_uno/jni_bridge.h')
-rw-r--r--bridges/source/jni_uno/jni_bridge.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h
index e1a2aadecbb6..8a216e01c46d 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -21,7 +21,6 @@
#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BRIDGE_H
#include "jni_base.h"
-#include "jni_info.h"
#include "jni_helper.h"
#include "osl/diagnose.h"
@@ -36,13 +35,15 @@
namespace jni_uno
{
-//==== holds environments and mappings =========================================
+class JNI_info;
struct Bridge;
+
struct Mapping : public uno_Mapping
{
Bridge * m_bridge;
};
+// Holds environments and mappings:
struct Bridge
{
mutable oslInterlockedCount m_ref;
@@ -54,8 +55,6 @@ struct Bridge
Mapping m_uno2java;
bool m_registered_java2uno;
- JNI_info const * m_jni_info;
-
~Bridge();
explicit Bridge(
uno_Environment * java_env, uno_ExtEnvironment * uno_env,
@@ -107,6 +106,8 @@ struct Bridge
uno_Interface * map_to_uno(
JNI_context const & jni,
jobject javaI, JNI_interface_type_info const * info ) const;
+
+ JNI_info const * getJniInfo() const;
};
}