Hi Michael,
> Until then I'll reverting the patch, in case I forget later; we
> wouldn't like to accidentally license your code against your wishes.
sorry for inconvenience, I have sent the License statement email to the
mailing list so please feel free to reapply the patch.
Also, I attach a few more patches.
Thank you,
Tomas
>From da9fb395502bb2066db60dd4e69a6c69a5d8bb8f Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Thu, 15 Dec 2011 23:57:19 +0100
Subject: [PATCH 1/7] fix broken ifndef/define guard in idl
---
.../star/frame/DoubleInitializationException.idl | 4 ++--
.../sun/star/frame/IllegalArgumentIOException.idl | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index d225770..f716e3e 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -24,8 +24,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
-#define __com_sun_star_frame_TerminationVetoException_idl__
+#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
+#define __com_sun_star_frame_DoubleInitializationException_idl__
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index a0bef81..9c0ccd8 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -24,8 +24,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
-#define __com_sun_star_frame_TerminationVetoException_idl__
+#ifndef __com_sun_star_frame_IllegalArgumentIOException_idl__
+#define __com_sun_star_frame_IllegalArgumentIOException_idl__
#include <com/sun/star/io/IOException.idl>
--
1.7.0.4
>From 2172e7435d5b067e1bf25c8906852c74a1c3322c Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Sat, 17 Dec 2011 17:42:58 +0100
Subject: [PATCH 2/7] fix package in idl
---
offapi/com/sun/star/chart/XAxisSupplier.idl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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 );
};
}; }; }; };
--
1.7.0.4
>From 287b3f61c9d4930c26a1235e0e2cd1c1ac3dded1 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Sat, 17 Dec 2011 17:45:13 +0100
Subject: [PATCH 3/7] idl fix package names
---
offapi/com/sun/star/chart2/InterpretedData.idl | 2 +-
offapi/com/sun/star/chart2/ScaleData.idl | 2 +-
offapi/com/sun/star/chart2/XChartDocument.idl | 2 +-
offapi/com/sun/star/chart2/XChartTypeTemplate.idl | 4 ++--
offapi/com/sun/star/chart2/XDataInterpreter.idl | 4 ++--
offapi/com/sun/star/chart2/XDiagram.idl | 2 +-
.../com/sun/star/chart2/XInternalDataProvider.idl | 2 +-
.../com/sun/star/xml/sax/XFastSAXSerializable.idl | 8 ++++----
offapi/com/sun/star/xml/sax/XSAXSerializable.idl | 4 ++--
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/offapi/com/sun/star/chart2/InterpretedData.idl b/offapi/com/sun/star/chart2/InterpretedData.idl
index 0eedd9c..281bac9 100644
--- a/offapi/com/sun/star/chart2/InterpretedData.idl
+++ b/offapi/com/sun/star/chart2/InterpretedData.idl
@@ -50,7 +50,7 @@ struct InterpretedData
/**
*/
- data::XLabeledDataSequence Categories;
+ com::sun::star::chart2::data::XLabeledDataSequence Categories;
};
} ; // chart2
diff --git a/offapi/com/sun/star/chart2/ScaleData.idl b/offapi/com/sun/star/chart2/ScaleData.idl
index 9bb5100..bb3c2bd 100644
--- a/offapi/com/sun/star/chart2/ScaleData.idl
+++ b/offapi/com/sun/star/chart2/ScaleData.idl
@@ -59,7 +59,7 @@ struct ScaleData
XScaling Scaling;
- data::XLabeledDataSequence Categories;
+ com::sun::star::chart2::data::XLabeledDataSequence Categories;
/** describes the type of the axis.
diff --git a/offapi/com/sun/star/chart2/XChartDocument.idl b/offapi/com/sun/star/chart2/XChartDocument.idl
index 890b54a..4a611a1 100644
--- a/offapi/com/sun/star/chart2/XChartDocument.idl
+++ b/offapi/com/sun/star/chart2/XChartDocument.idl
@@ -104,7 +104,7 @@ interface XChartDocument : ::com::sun::star::frame::XModel
<member>XDataReceiver::attachDataProvider</member> has been
called.
*/
- data::XDataProvider getDataProvider();
+ com::sun::star::chart2::data::XDataProvider getDataProvider();
/** sets a new component that is able to create different chart
type templates (components of type
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index b03f51d..1f2cd23 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -67,7 +67,7 @@ interface XChartTypeTemplate : ::com::sun::star::uno::XInterface
<type>ChartTypeTemplate</type>.
*/
XDiagram createDiagramByDataSource(
- [in] data::XDataSource xDataSource,
+ [in] com::sun::star::chart2::data::XDataSource xDataSource,
[in] sequence< com::sun::star::beans::PropertyValue > aArguments );
/** @return
@@ -120,7 +120,7 @@ interface XChartTypeTemplate : ::com::sun::star::uno::XInterface
*/
void changeDiagramData(
[in] XDiagram xDiagram,
- [in] data::XDataSource xDataSource,
+ [in] com::sun::star::chart2::data::XDataSource xDataSource,
[in] sequence< com::sun::star::beans::PropertyValue > aArguments );
/** States whether the given diagram could have been created by
diff --git a/offapi/com/sun/star/chart2/XDataInterpreter.idl b/offapi/com/sun/star/chart2/XDataInterpreter.idl
index a5f6dc2..ede7bd9 100644
--- a/offapi/com/sun/star/chart2/XDataInterpreter.idl
+++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl
@@ -63,7 +63,7 @@ interface XDataInterpreter : ::com::sun::star::uno::XInterface
creating new ones.
*/
InterpretedData interpretDataSource(
- [in] data::XDataSource xSource,
+ [in] com::sun::star::chart2::data::XDataSource xSource,
[in] sequence< com::sun::star::beans::PropertyValue > aArguments,
[in] sequence< XDataSeries > aSeriesToReUse );
@@ -90,7 +90,7 @@ interface XDataInterpreter : ::com::sun::star::uno::XInterface
<member>interpretDataSource</member>( <code>xSource</code> ),
the result of this method should be <code>xSource</code>.</p>
*/
- data::XDataSource mergeInterpretedData( [in] InterpretedData aInterpretedData );
+ com::sun::star::chart2::data::XDataSource mergeInterpretedData( [in] InterpretedData aInterpretedData );
};
} ; // chart2
diff --git a/offapi/com/sun/star/chart2/XDiagram.idl b/offapi/com/sun/star/chart2/XDiagram.idl
index cfe57ab..530bf86 100644
--- a/offapi/com/sun/star/chart2/XDiagram.idl
+++ b/offapi/com/sun/star/chart2/XDiagram.idl
@@ -97,7 +97,7 @@ interface XDiagram : ::com::sun::star::uno::XInterface
service <type>StandardDiagramCreationParameters</type>.
</p>
*/
- void setDiagramData( [in] data::XDataSource xDataSource,
+ void setDiagramData( [in] com::sun::star::chart2::data::XDataSource xDataSource,
[in] sequence< com::sun::star::beans::PropertyValue > aArguments );
};
diff --git a/offapi/com/sun/star/chart2/XInternalDataProvider.idl b/offapi/com/sun/star/chart2/XInternalDataProvider.idl
index a1f9caa..a718e70 100644
--- a/offapi/com/sun/star/chart2/XInternalDataProvider.idl
+++ b/offapi/com/sun/star/chart2/XInternalDataProvider.idl
@@ -72,7 +72,7 @@ interface XInternalDataProvider : com::sun::star::chart2::data::XDataProvider
labeled data sequence was created by cloning an existing one,
it has to be explicitly registered via this method.</p>
*/
- void registerDataSequenceForChanges( [in] data::XDataSequence xSeq );
+ void registerDataSequenceForChanges( [in] com::sun::star::chart2::data::XDataSequence xSeq );
/** insert an additional sequence for categories nLevel>=1;
categories at level 0 are always present and cannot be inserted or deleted
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
index aa35a92..ee13998 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -76,10 +76,10 @@ interface XFastSAXSerializable
@throws com::sun::star::xml::sax::SAXException
if serializing the XML document fails
*/
- void fastSerialize([in] sax::XFastDocumentHandler handler,
- [in] sax::XFastTokenHandler tokenHandler,
- [in] sequence< beans::StringPair > namespaces,
- [in] sequence< beans::Pair<string, long> > registerNamespaces)
+ void fastSerialize([in] com::sun::star::xml::sax::XFastDocumentHandler handler,
+ [in] com::sun::star::xml::sax::XFastTokenHandler tokenHandler,
+ [in] sequence< com::sun::star::beans::StringPair > namespaces,
+ [in] sequence< com::sun::star::beans::Pair<string, long> > registerNamespaces)
raises( com::sun::star::xml::sax::SAXException );
};
diff --git a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
index 065fec0..b91a761 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -66,8 +66,8 @@ interface XSAXSerializable
@throws com::sun::star::xml::sax::SAXException
if serializing the XML document fails
*/
- void serialize([in] sax::XDocumentHandler handler,
- [in] sequence< beans::StringPair > namespaces)
+ void serialize([in] com::sun::star::xml::sax::XDocumentHandler handler,
+ [in] sequence< com::sun::star::beans::StringPair > namespaces)
raises( com::sun::star::xml::sax::SAXException );
};
--
1.7.0.4
>From 8574790df314b5a939c5ba949d8f4735ae9ad241 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Tue, 20 Dec 2011 23:45:50 +0100
Subject: [PATCH 5/7] chmod -x on java files
---
0 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
mode change 100755 => 100644 javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
old mode 100755
new mode 100644
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
old mode 100755
new mode 100644
--
1.7.0.4
>From e6d91f9995597b0d2a7e5136566085c146766886 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Wed, 21 Dec 2011 00:01:08 +0100
Subject: [PATCH 6/7] follow idl definition
---
.../sun/star/comp/loader/JavaLoaderFactory.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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
{
--
1.7.0.4
>From e63028b536490aa1e659e6bcb8186dacad5aa739 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Wed, 21 Dec 2011 00:08:23 +0100
Subject: [PATCH 7/7] JavaLoader actually implements XImplementationLoader
---
jurt/com/sun/star/comp/loader/JavaLoader.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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);
--
1.7.0.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
