[Libreoffice-commits] .: 4 commits - javaunohelper/com offapi/com
Michael Stahl
mst at kemper.freedesktop.org
Thu Jan 5 05:11:11 PST 2012
offapi/com/sun/star/chart2/InterpretedData.idl | 2 +-
offapi/com/sun/star/chart2/ScaleData.idl | 2 +-
offapi/com/sun/star/chart2/XAxis.idl | 4 ++--
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 +-
offapi/com/sun/star/chart2/XInternalDataProvider.idl | 2 +-
offapi/com/sun/star/frame/DoubleInitializationException.idl | 4 ++--
offapi/com/sun/star/frame/IllegalArgumentIOException.idl | 4 ++--
offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl | 8 ++++----
offapi/com/sun/star/xml/sax/XSAXSerializable.idl | 4 ++--
12 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 4732d156e701432ee056513aa75add6e9c0c4b4c
Author: Tomas Hlavaty <tom at logand.com>
Date: Tue Dec 20 23:45:50 2011 +0100
chmod -x on java files
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
commit 887b7f34fef7aae99e54aee049b38d2d0229ad00
Author: Tomas Hlavaty <tom at logand.com>
Date: Sat Dec 17 17:45:13 2011 +0100
idl fix package names
diff --git a/offapi/com/sun/star/chart2/InterpretedData.idl b/offapi/com/sun/star/chart2/InterpretedData.idl
index a64f853..250237a 100644
--- a/offapi/com/sun/star/chart2/InterpretedData.idl
+++ b/offapi/com/sun/star/chart2/InterpretedData.idl
@@ -51,7 +51,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 2c11810..0bb2f83 100644
--- a/offapi/com/sun/star/chart2/ScaleData.idl
+++ b/offapi/com/sun/star/chart2/ScaleData.idl
@@ -60,7 +60,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 7585747..26a2ab8 100644
--- a/offapi/com/sun/star/chart2/XChartDocument.idl
+++ b/offapi/com/sun/star/chart2/XChartDocument.idl
@@ -105,7 +105,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 348c93c..2be37ac 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -68,7 +68,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
@@ -121,7 +121,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 547d9c3..f00d590 100644
--- a/offapi/com/sun/star/chart2/XDataInterpreter.idl
+++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl
@@ -64,7 +64,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 );
@@ -91,7 +91,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 e18ded5..9580d91 100644
--- a/offapi/com/sun/star/chart2/XDiagram.idl
+++ b/offapi/com/sun/star/chart2/XDiagram.idl
@@ -98,7 +98,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 ebda040..532d338 100644
--- a/offapi/com/sun/star/chart2/XInternalDataProvider.idl
+++ b/offapi/com/sun/star/chart2/XInternalDataProvider.idl
@@ -73,7 +73,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 3e65bfa..a9a4974 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -77,10 +77,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 0e00a46..4556508 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -67,8 +67,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 );
};
commit 405f7ac2fde0a9c60d9af2fa1501c56ef08ffb60
Author: Tomas Hlavaty <tom at logand.com>
Date: Thu Dec 15 23:57:19 2011 +0100
fix broken ifndef/define guard in idl
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index 7e04e02..12f5ca6 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -25,8 +25,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 a8016fe..c3a2058 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -25,8 +25,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>
commit 45652af4e2215ee83c22267dd782918be3e9abb9
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 5 13:59:33 2012 +0100
offapi: css.chart2.XAxis: fix include guard conflict
diff --git a/offapi/com/sun/star/chart2/XAxis.idl b/offapi/com/sun/star/chart2/XAxis.idl
index 338f261..840c276 100644
--- a/offapi/com/sun/star/chart2/XAxis.idl
+++ b/offapi/com/sun/star/chart2/XAxis.idl
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef com_sun_star_chart_XAxis_idl
-#define com_sun_star_chart_XAxis_idl
+#ifndef com_sun_star_chart2_XAxis_idl
+#define com_sun_star_chart2_XAxis_idl
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/XPropertySet.idl>
More information about the Libreoffice-commits
mailing list