summaryrefslogtreecommitdiff
path: root/javaunohelper
diff options
context:
space:
mode:
Diffstat (limited to 'javaunohelper')
-rw-r--r--javaunohelper/com/sun/star/comp/helper/Bootstrap.java20
-rw-r--r--javaunohelper/com/sun/star/comp/helper/ComponentContext.java12
-rw-r--r--javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java2
-rw-r--r--javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java4
-rw-r--r--javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/Factory.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java94
-rw-r--r--javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java4
-rw-r--r--javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java2
-rw-r--r--javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java10
-rw-r--r--javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java6
-rw-r--r--javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java8
14 files changed, 82 insertions, 88 deletions
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index c5037b2f1566..d80b8a6b9df0 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -67,7 +67,7 @@ import java.util.Random;
Other services can be inserted into the service manager by
using its XSet interface:
<pre>
- XSet xSet = (XSet)UnoRuntime.queryInterface( XSet.class, aMultiComponentFactory );
+ XSet xSet = UnoRuntime.queryInterface( XSet.class, aMultiComponentFactory );
// insert the service manager
xSet.insert( aSingleComponentFactory );
</pre>
@@ -108,20 +108,20 @@ public class Bootstrap {
static public XComponentContext createInitialComponentContext( Hashtable context_entries )
throws Exception
{
- XImplementationLoader xImpLoader = (XImplementationLoader)UnoRuntime.queryInterface(
+ XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
XImplementationLoader.class, new JavaLoader() );
// Get the factory of the ServiceManager
- XSingleComponentFactory smgr_fac = (XSingleComponentFactory)UnoRuntime.queryInterface(
+ XSingleComponentFactory smgr_fac = UnoRuntime.queryInterface(
XSingleComponentFactory.class, xImpLoader.activate(
"com.sun.star.comp.servicemanager.ServiceManager", null, null, null ) );
// Create an instance of the ServiceManager
- XMultiComponentFactory xSMgr = (XMultiComponentFactory)UnoRuntime.queryInterface(
+ XMultiComponentFactory xSMgr = UnoRuntime.queryInterface(
XMultiComponentFactory.class, smgr_fac.createInstanceWithContext( null ) );
// post init loader
- XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(
+ XInitialization xInit = UnoRuntime.queryInterface(
XInitialization.class, xImpLoader );
Object[] args = new Object [] { xSMgr };
xInit.initialize( args );
@@ -137,12 +137,12 @@ public class Bootstrap {
XComponentContext xContext = new ComponentContext( context_entries, null );
// post init smgr
- xInit = (XInitialization)UnoRuntime.queryInterface(
+ xInit = UnoRuntime.queryInterface(
XInitialization.class, xSMgr );
args = new Object [] { null, xContext }; // no registry, default context
xInit.initialize( args );
- XSet xSet = (XSet)UnoRuntime.queryInterface( XSet.class, xSMgr );
+ XSet xSet = UnoRuntime.queryInterface( XSet.class, xSMgr );
// insert the service manager
xSet.insert( smgr_fac );
// and basic jurt factories
@@ -159,7 +159,7 @@ public class Bootstrap {
*/
static public XMultiServiceFactory createSimpleServiceManager() throws Exception
{
- return (XMultiServiceFactory)UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XMultiServiceFactory.class, createInitialComponentContext( null ).getServiceManager() );
}
@@ -206,7 +206,7 @@ public class Bootstrap {
NativeLibraryLoader.loadLibrary( Bootstrap.class.getClassLoader(), "juh" );
m_loaded_juh = true;
}
- return (XComponentContext)UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XComponentContext.class,
cppuhelper_bootstrap(
ini_file, pairs, Bootstrap.class.getClassLoader() ) );
@@ -283,7 +283,7 @@ public class Bootstrap {
try {
// try to connect to office
Object context = xUrlResolver.resolve( sConnect );
- xContext = (XComponentContext) UnoRuntime.queryInterface(
+ xContext = UnoRuntime.queryInterface(
XComponentContext.class, context);
if ( xContext == null )
throw new BootstrapException( "no component context!" );
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 938cc0543901..1c3df0d4844b 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -101,7 +101,7 @@ public class ComponentContext implements XComponentContext, XComponent
{
o = ((ComponentContextEntry)o).m_value;
}
- m_xSMgr = (XMultiComponentFactory)UnoRuntime.queryInterface(
+ m_xSMgr = UnoRuntime.queryInterface(
XMultiComponentFactory.class, o );
}
if (m_xSMgr != null)
@@ -114,7 +114,7 @@ public class ComponentContext implements XComponentContext, XComponent
}
// listen for delegate
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(
+ XComponent xComp = UnoRuntime.queryInterface(
XComponent.class, m_xDelegate );
if (xComp != null)
{
@@ -154,7 +154,7 @@ public class ComponentContext implements XComponentContext, XComponent
else
{
XSingleComponentFactory xCompFac =
- (XSingleComponentFactory)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XSingleComponentFactory.class, entry.m_lateInit );
if (xCompFac != null)
{
@@ -185,7 +185,7 @@ public class ComponentContext implements XComponentContext, XComponent
else // inited in the meantime
{
// dispose fresh service instance
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(
+ XComponent xComp = UnoRuntime.queryInterface(
XComponent.class, xInstance );
if (xComp != null)
{
@@ -253,7 +253,7 @@ public class ComponentContext implements XComponentContext, XComponent
o = ((ComponentContextEntry)o).m_value;
}
- XComponent xComp = (XComponent)UnoRuntime.queryInterface( XComponent.class, o );
+ XComponent xComp = UnoRuntime.queryInterface( XComponent.class, o );
if (xComp != null)
{
if (name.equals( TDMGR_NAME ))
@@ -272,7 +272,7 @@ public class ComponentContext implements XComponentContext, XComponent
// smgr
if (m_bDisposeSMgr)
{
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(
+ XComponent xComp = UnoRuntime.queryInterface(
XComponent.class, m_xSMgr );
if (xComp != null)
{
diff --git a/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java b/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
index 4b5db3753da3..9523fbba7716 100644
--- a/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
+++ b/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
@@ -124,7 +124,7 @@ public class RegistryServiceFactory {
Object obj = createRegistryServiceFactory(
writeRegistryFile, readRegistryFile, readOnly,
RegistryServiceFactory.class.getClassLoader() );
- return (XMultiServiceFactory) UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XMultiServiceFactory.class, obj );
}
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index eda51f8cb1f7..a1bf4d3a168c 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -85,7 +85,7 @@ public class SharedLibraryLoader {
XMultiServiceFactory smgr,
XRegistryKey regKey )
{
- return (XSingleServiceFactory) UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XSingleServiceFactory.class,
component_getFactory(
DEFAULT_LIBRARY, DEFAULT_IMPLEMENTATION, smgr, regKey,
@@ -110,7 +110,7 @@ public class SharedLibraryLoader {
XMultiServiceFactory smgr,
XRegistryKey regKey )
{
- return (XSingleServiceFactory) UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XSingleServiceFactory.class,
component_getFactory(
libName, impName, smgr, regKey,
diff --git a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java b/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
index cafa7e0a412d..a508a209ad2c 100644
--- a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
+++ b/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
@@ -119,7 +119,6 @@ class InteractionImpl implements com.sun.star.task.XInteractionHandler
if (approve)
{
com.sun.star.task.XInteractionApprove xApprove =
- (com.sun.star.task.XInteractionApprove)
UnoRuntime.queryInterface(com.sun.star.task.XInteractionApprove.class, conts[i]);
if (xApprove != null)
xApprove.select();
@@ -129,7 +128,6 @@ class InteractionImpl implements com.sun.star.task.XInteractionHandler
else if (abort)
{
com.sun.star.task.XInteractionAbort xAbort =
- (com.sun.star.task.XInteractionAbort)
UnoRuntime.queryInterface(com.sun.star.task.XInteractionAbort.class, conts[i]);
if (xAbort != null)
xAbort.select();
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index 6eb261ff0eb8..5842c8eaf7f4 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@ -210,7 +210,7 @@ public class Factory
throws com.sun.star.uno.Exception
{
Object inst = instantiate( xContext );
- XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(
+ XInitialization xInit = UnoRuntime.queryInterface(
XInitialization.class, inst );
if (null == xInit)
{
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 44a6be5e5f7a..d7bc61cbcbad 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -715,7 +715,7 @@ public class InterfaceContainer implements Cloneable
try
{
Object o= aIt.next();
- XEventListener evtListener= (XEventListener) UnoRuntime.queryInterface(
+ XEventListener evtListener= UnoRuntime.queryInterface(
XEventListener.class, o);
if( evtListener != null )
evtListener.disposing( evt );
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index b4b2d02ab148..d77c1600def3 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -671,7 +671,7 @@ XMultiPropertySet
// We try to get an XInterface of setVal and set an XInterface type.
if (setVal instanceof XInterface)
{
- XInterface xint= (XInterface) UnoRuntime.queryInterface(XInterface.class, setVal);
+ XInterface xint= UnoRuntime.queryInterface(XInterface.class, setVal);
if (xint != null)
convObj= new Any(new Type(XInterface.class), xint);
}
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
index af33c5ea3ee9..40c69a90f8a6 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
@@ -143,13 +143,13 @@ public final class PropertySetMixin {
idlClass = getReflection(type.getTypeName());
XTypeDescription ifc;
try {
- ifc = (XTypeDescription) UnoRuntime.queryInterface(
+ ifc = UnoRuntime.queryInterface(
XTypeDescription.class,
- (((XHierarchicalNameAccess) UnoRuntime.queryInterface(
- XHierarchicalNameAccess.class,
- context.getValueByName(
- "/singletons/com.sun.star.reflection."
- + "theTypeDescriptionManager"))).
+ (UnoRuntime.queryInterface(
+ XHierarchicalNameAccess.class,
+ context.getValueByName(
+ "/singletons/com.sun.star.reflection."
+ + "theTypeDescriptionManager")).
getByHierarchicalName(type.getTypeName())));
} catch (NoSuchElementException e) {
throw new RuntimeException(
@@ -585,7 +585,7 @@ public final class PropertySetMixin {
private XIdlClass getReflection(String typeName) {
XIdlReflection refl;
try {
- refl = (XIdlReflection) UnoRuntime.queryInterface(
+ refl = UnoRuntime.queryInterface(
XIdlReflection.class,
context.getServiceManager().createInstanceWithContext(
"com.sun.star.reflection.CoreReflection", context));
@@ -599,8 +599,7 @@ public final class PropertySetMixin {
try {
return refl.forName(typeName);
} finally {
- XComponent comp = (XComponent) UnoRuntime.queryInterface(
- XComponent.class, refl);
+ XComponent comp = UnoRuntime.queryInterface(XComponent.class, refl);
if (comp != null) {
comp.dispose();
}
@@ -610,9 +609,8 @@ public final class PropertySetMixin {
private void initProperties(
XTypeDescription type, HashMap map, ArrayList handleNames, HashSet seen)
{
- XInterfaceTypeDescription2 ifc = (XInterfaceTypeDescription2)
- UnoRuntime.queryInterface(
- XInterfaceTypeDescription2.class, resolveTypedefs(type));
+ XInterfaceTypeDescription2 ifc = UnoRuntime.queryInterface(
+ XInterfaceTypeDescription2.class, resolveTypedefs(type));
if (seen.add(ifc.getName())) {
XTypeDescription[] bases = ifc.getBaseTypes();
for (int i = 0; i < bases.length; ++i) {
@@ -622,11 +620,10 @@ public final class PropertySetMixin {
for (int i = 0; i < members.length; ++i) {
if (members[i].getTypeClass() == TypeClass.INTERFACE_ATTRIBUTE)
{
- XInterfaceAttributeTypeDescription2 attr
- = ((XInterfaceAttributeTypeDescription2)
- UnoRuntime.queryInterface(
- XInterfaceAttributeTypeDescription2.class,
- members[i]));
+ XInterfaceAttributeTypeDescription2 attr =
+ UnoRuntime.queryInterface(
+ XInterfaceAttributeTypeDescription2.class,
+ members[i]);
short attrAttribs = 0;
if (attr.isBound()) {
attrAttribs |= PropertyAttribute.BOUND;
@@ -685,7 +682,7 @@ public final class PropertySetMixin {
break;
}
attrAttribs |= n;
- t = ((XStructTypeDescription) UnoRuntime.queryInterface(
+ t = (UnoRuntime.queryInterface(
XStructTypeDescription.class, t)).
getTypeArguments()[0];
}
@@ -747,14 +744,14 @@ public final class PropertySetMixin {
object, illegalArgumentPosition);
}
- XIdlField2 f = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2 f = UnoRuntime.queryInterface(
XIdlField2.class, idlClass.getField(name));
Object[] o = new Object[] {
new Any(type, UnoRuntime.queryInterface(type, object)) };
Object v = wrapValue(
value,
- ((XIdlField2) UnoRuntime.queryInterface(
- XIdlField2.class, idlClass.getField(name))).getType(),
+ UnoRuntime.queryInterface(
+ XIdlField2.class, idlClass.getField(name)).getType(),
(p.property.Attributes & PropertyAttribute.MAYBEAMBIGUOUS) != 0,
isAmbiguous,
(p.property.Attributes & PropertyAttribute.MAYBEDEFAULT) != 0,
@@ -807,7 +804,7 @@ public final class PropertySetMixin {
if (p == null) {
throw new UnknownPropertyException(name, object);
}
- XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2 field = UnoRuntime.queryInterface(
XIdlField2.class, idlClass.getField(name));
Object value;
try {
@@ -848,12 +845,12 @@ public final class PropertySetMixin {
XIdlClass ambiguous = getReflection(typeName);
try {
isAmbiguous = AnyConverter.toBoolean(
- ((XIdlField2) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XIdlField2.class,
- ambiguous.getField("IsAmbiguous"))).get(value));
- value = ((XIdlField2) UnoRuntime.queryInterface(
- XIdlField2.class,
- ambiguous.getField("Value"))).get(value);
+ ambiguous.getField("IsAmbiguous")).get(value));
+ value = UnoRuntime.queryInterface(
+ XIdlField2.class,
+ ambiguous.getField("Value")).get(value);
} catch (com.sun.star.lang.IllegalArgumentException e) {
throw new RuntimeException(
"unexpected"
@@ -867,12 +864,12 @@ public final class PropertySetMixin {
XIdlClass defaulted = getReflection(typeName);
try {
isDefaulted = AnyConverter.toBoolean(
- ((XIdlField2) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XIdlField2.class,
- defaulted.getField("IsDefaulted"))).get(value));
- value = ((XIdlField2) UnoRuntime.queryInterface(
- XIdlField2.class,
- defaulted.getField("Value"))).get(value);
+ defaulted.getField("IsDefaulted")).get(value));
+ value = UnoRuntime.queryInterface(
+ XIdlField2.class,
+ defaulted.getField("Value")).get(value);
} catch (com.sun.star.lang.IllegalArgumentException e) {
throw new RuntimeException(
"unexpected"
@@ -886,16 +883,16 @@ public final class PropertySetMixin {
XIdlClass optional = getReflection(typeName);
try {
boolean present = AnyConverter.toBoolean(
- ((XIdlField2) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XIdlField2.class,
- optional.getField("IsPresent"))).get(value));
+ optional.getField("IsPresent")).get(value));
if (!present) {
value = Any.VOID;
break;
}
- value = ((XIdlField2) UnoRuntime.queryInterface(
- XIdlField2.class,
- optional.getField("Value"))).get(value);
+ value = UnoRuntime.queryInterface(
+ XIdlField2.class,
+ optional.getField("Value")).get(value);
} catch (com.sun.star.lang.IllegalArgumentException e) {
throw new RuntimeException(
"unexpected"
@@ -932,15 +929,15 @@ public final class PropertySetMixin {
Object[] strct = new Object[1];
type.createObject(strct);
try {
- XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2 field = UnoRuntime.queryInterface(
XIdlField2.class, type.getField("Value"));
field.set(
strct,
wrapValue(
value, field.getType(), false, false, wrapDefaulted,
isDefaulted, wrapOptional));
- ((XIdlField2) UnoRuntime.queryInterface(
- XIdlField2.class, type.getField("IsAmbiguous"))).set(
+ UnoRuntime.queryInterface(
+ XIdlField2.class, type.getField("IsAmbiguous")).set(
strct, new Boolean(isAmbiguous));
} catch (com.sun.star.lang.IllegalArgumentException e) {
throw new RuntimeException(
@@ -959,15 +956,15 @@ public final class PropertySetMixin {
Object[] strct = new Object[1];
type.createObject(strct);
try {
- XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2 field = UnoRuntime.queryInterface(
XIdlField2.class, type.getField("Value"));
field.set(
strct,
wrapValue(
value, field.getType(), wrapAmbiguous, isAmbiguous,
false, false, wrapOptional));
- ((XIdlField2) UnoRuntime.queryInterface(
- XIdlField2.class, type.getField("IsDefaulted"))).set(
+ UnoRuntime.queryInterface(
+ XIdlField2.class, type.getField("IsDefaulted")).set(
strct, new Boolean(isDefaulted));
} catch (com.sun.star.lang.IllegalArgumentException e) {
throw new RuntimeException(
@@ -986,11 +983,11 @@ public final class PropertySetMixin {
type.createObject(strct);
boolean present = !AnyConverter.isVoid(value);
try {
- ((XIdlField2) UnoRuntime.queryInterface(
- XIdlField2.class, type.getField("IsPresent"))).set(
+ UnoRuntime.queryInterface(
+ XIdlField2.class, type.getField("IsPresent")).set(
strct, new Boolean(present));
if (present) {
- XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2 field = UnoRuntime.queryInterface(
XIdlField2.class, type.getField("Value"));
field.set(
strct,
@@ -1018,9 +1015,8 @@ public final class PropertySetMixin {
private static XTypeDescription resolveTypedefs(XTypeDescription type) {
while (type.getTypeClass() == TypeClass.TYPEDEF) {
- type = ((XIndirectTypeDescription) UnoRuntime.queryInterface(
- XIndirectTypeDescription.class, type)).
- getReferencedType();
+ type = UnoRuntime.queryInterface(
+ XIndirectTypeDescription.class, type).getReferencedType();
}
return type;
}
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index 9c330539e620..b94b85771d8d 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -62,7 +62,7 @@ public class Bootstrap_Test {
"no /singletons/com.sun.star.reflection.theTypeDescriptionManager!" );
}
- XMultiServiceFactory msf = (XMultiServiceFactory)UnoRuntime.queryInterface(
+ XMultiServiceFactory msf = UnoRuntime.queryInterface(
XMultiServiceFactory.class, xContext.getServiceManager() );
String services[] = msf.getAvailableServiceNames();
System.out.println("Available services are:");
@@ -74,7 +74,7 @@ public class Bootstrap_Test {
for ( int i=0; i<services.length; i++ )
System.out.println(services[i]);
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(
+ XComponent xComp = UnoRuntime.queryInterface(
XComponent.class, xContext );
xComp.dispose();
diff --git a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
index 1188f8752135..f88864f2d3ba 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
@@ -88,7 +88,7 @@ public class ComponentContext_Test {
System.err.println( "### bootstrap context test failed: 2!" );
}
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(
+ XComponent xComp = UnoRuntime.queryInterface(
XComponent.class, xInitialContext );
xComp.dispose();
}
diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index d12e1accf797..fc4c2c06f463 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -91,7 +91,7 @@ public class SharedLibraryLoader_Test {
if ( ! test_getSharedLibraryLoaderFactory() )
return false;
- sharedLibraryLoader = (XImplementationLoader) UnoRuntime.queryInterface(
+ sharedLibraryLoader = UnoRuntime.queryInterface(
XImplementationLoader.class, sharedLibraryLoaderFactory.createInstance() );
System.out.print("Test - ");
@@ -115,11 +115,11 @@ public class SharedLibraryLoader_Test {
System.err.println("- get the native ServiceManger factory");
XSingleServiceFactory aSMgrFac =
- (XSingleServiceFactory) UnoRuntime.queryInterface( XSingleServiceFactory.class,
+ UnoRuntime.queryInterface( XSingleServiceFactory.class,
sharedLibraryLoader.activate(NATIVE_SERVICE_MANAGER_IMP_NAME, null, NATIVE_SERVICE_MANAGER_LIB_NAME, null));
System.err.println("- instantiate the native ServiceManger");
- nativeServiceManager = (XMultiServiceFactory) UnoRuntime.queryInterface( XMultiServiceFactory.class, aSMgrFac.createInstance() );
+ nativeServiceManager = UnoRuntime.queryInterface( XMultiServiceFactory.class, aSMgrFac.createInstance() );
System.out.print("Test - ");
System.out.println(nativeServiceManager == null? "failed" : "successfull");
@@ -141,12 +141,12 @@ public class SharedLibraryLoader_Test {
System.err.println("- get factory of the Registry");
XSingleServiceFactory aRegFac =
- (XSingleServiceFactory) UnoRuntime.queryInterface( XSingleServiceFactory.class,
+ UnoRuntime.queryInterface( XSingleServiceFactory.class,
sharedLibraryLoader.activate(NATIVE_REGISTRY_IMP_NAME, null, NATIVE_REGISTRY_LIB_NAME, null)
);
System.err.println("- instantiate the Registry");
simpleRegistry =
- (XSimpleRegistry) UnoRuntime.queryInterface( XSimpleRegistry.class, aRegFac.createInstance() );
+ UnoRuntime.queryInterface( XSimpleRegistry.class, aRegFac.createInstance() );
System.out.print("Test - ");
System.out.println(simpleRegistry == null? "failed" : "successfull");
System.out.println("*******************************************************************");
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
index 1629920ad481..46e7f60b7def 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
@@ -67,9 +67,9 @@ public class ComponentBase_Test
comp.addEventListener(obj1);
comp.addEventListener(obj2);
comp.addEventListener(obj3);
- comp.addEventListener((XEventListener) UnoRuntime.queryInterface(XEventListener.class, proxyObj1Weak1));
- comp.addEventListener((XEventListener) UnoRuntime.queryInterface(XEventListener.class, proxyObj3Weak2));
- comp.addEventListener((XEventListener) UnoRuntime.queryInterface(XEventListener.class, proxyObj3TypeProv));
+ comp.addEventListener(UnoRuntime.queryInterface(XEventListener.class, proxyObj1Weak1));
+ comp.addEventListener(UnoRuntime.queryInterface(XEventListener.class, proxyObj3Weak2));
+ comp.addEventListener(UnoRuntime.queryInterface(XEventListener.class, proxyObj3TypeProv));
obj1.nDisposingCalled = 0;
obj2.nDisposingCalled = 0;
obj3.nDisposingCalled = 0;
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
index 2732fa54331a..732db947b97a 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -120,7 +120,7 @@ public class Factory_Test
//==============================================================================================
static void service_info_test( Object inst )
{
- XServiceInfo xInfo = (XServiceInfo)UnoRuntime.queryInterface( XServiceInfo.class, inst );
+ XServiceInfo xInfo = UnoRuntime.queryInterface( XServiceInfo.class, inst );
if (! xInfo.getImplementationName().equals( m_impl_name ))
{
@@ -159,7 +159,7 @@ public class Factory_Test
// bootstrap service manager
XMultiServiceFactory xMgr = RegistryServiceFactory.create( rdb );
- XPropertySet xProps = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xProps = UnoRuntime.queryInterface(
XPropertySet.class, xMgr );
XComponentContext xContext = (XComponentContext)AnyConverter.toObject(
new Type( XComponentContext.class ), xProps.getPropertyValue( "DefaultContext" ) );
@@ -172,7 +172,7 @@ public class Factory_Test
new Type( XSimpleRegistry.class ), xProps.getPropertyValue( "Registry" ) );
// register impl
XImplementationRegistration xImpReg =
- (XImplementationRegistration)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XImplementationRegistration.class,
xContext.getServiceManager().createInstanceWithContext(
"com.sun.star.registry.ImplementationRegistration", xContext ) );
@@ -196,7 +196,7 @@ public class Factory_Test
m_supported_services[ nPos ], xContext ) );
}
- XComponent xComp = (XComponent)UnoRuntime.queryInterface( XComponent.class, xContext );
+ XComponent xComp = UnoRuntime.queryInterface( XComponent.class, xContext );
xComp.dispose();
}
catch (Exception exc)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 02:50:09 +0000