[Libreoffice-commits] core.git: bridges/source

[Stephan Bergmann]

 bridges/source/jni_uno/jni_data.cxx |   26 --------------------------
 1 file changed, 26 deletions(-)

New commits:
commit ddbeaada1c7abb0fee88e709f3d6d824f06b39e0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 3 14:36:18 2013 +0100

    BRIDGES_JNI_UNO_FORCE_BOXED_ANY is undefined
    
    ...ever since its inception in 4afcc7135e0bef66e7a218141bc93a6aa6128fd8
    "MWS_SRX644: migrate branch mws_srx644 -> HEAD."
    
    Change-Id: I82d3158b813fec89567fd94ed9ccc05944228161

diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index 2a24f58..cece43a 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -1618,31 +1618,6 @@ void Bridge::map_to_java(
         if (in_param)
         {
             uno_Any const * pAny = (uno_Any const *)uno_data;
-
-#if defined BRIDGES_JNI_UNO_FORCE_BOXED_ANY
-            if (typelib_TypeClass_VOID == pAny->pType->eTypeClass)
-            {
-                jo_any.reset(
-                    jni->NewLocalRef( m_jni_info->m_object_Any_VOID ) );
-            }
-            else
-            {
-                jvalue args[ 2 ];
-                map_to_java(
-                    jni, &args[ 1 ], pAny->pData, pAny->pType, 0,
-                    true /* in */, false /* no out */,
-                    true /* create integral wrappers */ );
-                jo_any.reset( args[ 1 ].l );
-                // build up com.sun.star.uno.Any
-                JLocalAutoRef jo_type( jni, create_type( jni, pAny->pType ) );
-                args[ 0 ].l = jo_type.get();
-                jo_any.reset(
-                    jni->NewObjectA(
-                        m_jni_info->m_class_Any,
-                        m_jni_info->m_ctor_Any_with_Type_Object, args ) );
-                jni.ensure_no_exception();
-            }
-#else
             switch (pAny->pType->eTypeClass)
             {
             case typelib_TypeClass_VOID:
@@ -1832,7 +1807,6 @@ void Bridge::map_to_java(
                 break;
             }
             }
-#endif
         }
 
         if (out_param)