Avoid reserved identifiers

Change-Id: I0e353e3d892e1d01155dd7e48f8d24597604d3c4

bridges/source/jni_uno/jni_data.cxx

@@ -411,7 +411,7 @@ void Bridge::map_to_uno(
         // type name
         JLocalAutoRef jo_type_name(
             jni, jni->GetObjectField(
-                java_data.l, getJniInfo()->m_field_Type__typeName ) );
+                java_data.l, getJniInfo()->m_field_Type_typeName ) );
         if (! jo_type_name.is())
         {
             throw BridgeRuntimeError(
@@ -466,7 +466,7 @@ void Bridge::map_to_uno(
         {
             // boxed any
             jo_type.reset( jni->GetObjectField(
-                               java_data.l, getJniInfo()->m_field_Any__type ) );
+                               java_data.l, getJniInfo()->m_field_Any_type ) );
             if (! jo_type.is())
             {
                 throw BridgeRuntimeError(
@@ -477,7 +477,7 @@ void Bridge::map_to_uno(
             // wrapped value
             jo_wrapped_holder.reset(
                 jni->GetObjectField(
-                    java_data.l, getJniInfo()->m_field_Any__object ) );
+                    java_data.l, getJniInfo()->m_field_Any_object ) );
             java_data.l = jo_wrapped_holder.get();
         }
         else
@@ -490,7 +490,7 @@ void Bridge::map_to_uno(
         // get type name
         JLocalAutoRef jo_type_name(
             jni, jni->GetObjectField(
-                jo_type.get(), getJniInfo()->m_field_Type__typeName ) );
+                jo_type.get(), getJniInfo()->m_field_Type_typeName ) );
         jni.ensure_no_exception();
         OUString type_name(
             jstring_to_oustring( jni, static_cast<jstring>(jo_type_name.get()) ) );

bridges/source/jni_uno/jni_info.cxx

@@ -673,10 +673,10 @@ JNI_info::JNI_info(
     jni.ensure_no_exception();
     assert( nullptr != m_ctor_Type_with_Name_TypeClass );
     // field Type._typeName
-    m_field_Type__typeName = jni->GetFieldID(
+    m_field_Type_typeName = jni->GetFieldID(
         static_cast<jclass>(jo_Type.get()), "_typeName", "Ljava/lang/String;" );
     jni.ensure_no_exception();
-    assert( nullptr != m_field_Type__typeName );
+    assert( nullptr != m_field_Type_typeName );
 
     // ctor Any( Type, Object )
     m_ctor_Any_with_Type_Object = jni->GetMethodID(
@@ -686,15 +686,15 @@ JNI_info::JNI_info(
     assert( nullptr != m_ctor_Any_with_Type_Object );
 
     // field Any._type
-    m_field_Any__type = jni->GetFieldID(
+    m_field_Any_type = jni->GetFieldID(
         static_cast<jclass>(jo_Any.get()), "_type", "Lcom/sun/star/uno/Type;" );
     jni.ensure_no_exception();
-    assert( nullptr != m_field_Any__type );
+    assert( nullptr != m_field_Any_type );
     // field Any._object
-    m_field_Any__object = jni->GetFieldID(
+    m_field_Any_object = jni->GetFieldID(
         static_cast<jclass>(jo_Any.get()), "_object", "Ljava/lang/Object;" );
     jni.ensure_no_exception();
-    assert( nullptr != m_field_Any__object );
+    assert( nullptr != m_field_Any_object );
 
     // method IEnvironment.getRegisteredInterface()
     m_method_IEnvironment_getRegisteredInterface = jni->GetMethodID(

bridges/source/jni_uno/jni_info.h

@@ -177,11 +177,11 @@ public:
     jmethodID                   m_method_UnoRuntime_generateOid;
     jmethodID                   m_method_UnoRuntime_queryInterface;
     jmethodID                   m_ctor_Any_with_Type_Object;
-    jfieldID                    m_field_Any__type;
-    jfieldID                    m_field_Any__object;
+    jfieldID                    m_field_Any_type;
+    jfieldID                    m_field_Any_object;
     jmethodID                   m_ctor_Type_with_Class;
     jmethodID                   m_ctor_Type_with_Name_TypeClass;
-    jfieldID                    m_field_Type__typeName;
+    jfieldID                    m_field_Type_typeName;
     jmethodID                   m_method_TypeClass_fromInt;
     jfieldID                    m_field_Enum_m_value;
 

bridges/source/jni_uno/jni_java2uno.cxx

@@ -412,7 +412,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
 
             JLocalAutoRef jo_type_name(
                 jni, jni->GetObjectField(
-                    jo_type.get(), jni_info->m_field_Type__typeName ) );
+                    jo_type.get(), jni_info->m_field_Type_typeName ) );
             if (! jo_type_name.is())
             {
                 throw BridgeRuntimeError(