Java cleanup, fix a couple of compile errors in old code

Change-Id: I5ceeaedb25ab8c9e6510e7fa88143670ae82703c

extensions/test/pgp/TestPGP.java

@@ -47,7 +47,9 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 
 import com.sun.star.uno.IBridge;
+import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XCurrentContext;
 import com.sun.star.uno.XInterface;
 import com.sun.star.uno.XNamingService;
 import com.sun.star.container.*;
@@ -121,7 +123,7 @@ public class TestPGP {
             String rootOid = "classic_uno";
               IBridge iBridge = UnoRuntime.getBridgeByName("java", null, "remote", null, new Object[]{"iiop", xConnection, null});
 
-            Object rInitialObject = iBridge.mapInterfaceFrom(rootOid, XInterface.class);
+            Object rInitialObject = iBridge.mapInterfaceFrom(rootOid, new Type(XInterface.class));
 //              Object rInitialObject = xBridge.getInstance("NamingService");
 
             if(rInitialObject != null) {

odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java

@@ -23,7 +23,7 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexContainer;
 import com.sun.star.form.FormComponentType;
 import com.sun.star.form.XForm;
-import com.sun.star.form.XFormController;
+import com.sun.star.form.runtime.XFormController;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;