On 01/04/2012 11:09 PM, Tomas Hlavaty wrote:
diff --git a/offapi/com/sun/star/chart/XAxisSupplier.idl
b/offapi/com/sun/star/chart/XAxisSupplier.idl
index f87d245..cfb42b6 100644
--- a/offapi/com/sun/star/chart/XAxisSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisSupplier.idl
@@ -27,7 +27,7 @@
#ifndef com_sun_star_chart_XAxisSupplier_idl
#define com_sun_star_chart_XAxisSupplier_idl
-#include <com/sun/star/chart/XAxis.idl>
+#include <com/sun/star/chart2/XAxis.idl>
module com { module sun { module star { module chart {
@@ -43,7 +43,7 @@ interface XAxisSupplier : ::com::sun::star::uno::XInterface
@param nDimensionIndex
Parameter nDimensionIndex says wether it is a x, y or z-axis (0
for x).
*/
- com::sun::star::chart::XAxis getAxis( [in] long nDimensionIndex );
+ com::sun::star::chart2::XAxis getAxis( [in] long nDimensionIndex );
/** @returns
the secondary axis of the specified dimension. The returned object supports
service <type>ChartAxis</type>.
@@ -51,7 +51,7 @@ interface XAxisSupplier : ::com::sun::star::uno::XInterface
@param nDimensionIndex
Parameter nDimensionIndex says wether it is a x, y or z-axis (0
for x).
*/
- com::sun::star::chart::XAxis getSecondaryAxis( [in] long nDimensionIndex );
+ com::sun::star::chart2::XAxis getSecondaryAxis( [in] long nDimensionIndex
);
};
}; }; }; };
Are you sure that this is right, using chart2 entities from within
chart? I always intuitively thought that chart2 was a second attempt,
to replace chart.
diff --git a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
b/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
index 22981f2..eb45e7e 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
@@ -56,14 +56,14 @@ public class JavaLoaderFactory implements
XSingleServiceFactory, XServiceInfo {
multiServiceFactory = factory;
}
- public java.lang.Object createInstance()
+ public com.sun.star.uno.XInterface createInstance()
throws com.sun.star.uno.Exception,
com.sun.star.uno.RuntimeException
{
return new JavaLoader(multiServiceFactory);
}
- public java.lang.Object createInstanceWithArguments( java.lang.Object[]
args )
+ public com.sun.star.uno.XInterface createInstanceWithArguments(
java.lang.Object[] args )
throws com.sun.star.uno.Exception,
com.sun.star.uno.RuntimeException
{
and
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java
b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 25fc90b..3648fad 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -255,7 +255,7 @@ public class JavaLoader implements XImplementationLoader,
* @see com.sun.star.lang.XImplementationLoader
* @see com.sun.star.com.loader.RegistrationClassFinder
*/
- public java.lang.Object activate( String implementationName,
+ public com.sun.star.uno.XInterface activate( String implementationName,
String implementationLoaderUrl,
String locationUrl,
XRegistryKey xKey )
@@ -264,7 +264,7 @@ public class JavaLoader implements XImplementationLoader,
{
locationUrl = expand_url( locationUrl );
- Object returnObject = null;
+ com.sun.star.uno.XInterface returnObject = null;
Class clazz ;
DEBUG("try to get factory for " + implementationName);
UNO XInterface maps to Java Object, see
<http://wiki.services.openoffice.org/wiki/Uno/Java/Specifications/Type_Mapping>.
Also, signatures of these methods must not be changed to avoid
backward incompatibility.
Stephan
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
