fdo#46808, Adapt chart2::data::LabeledDataSequence UNO service to new style

Change-Id: I98bfbc8e143b9ad9d486f97380186fde9b4423ec

3 files changed, 80 insertions, 30 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8a5266157ab6..a8d540a6879a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
 	DatabaseDataProvider \
+    LabeledDataSequence \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\
     ReadOnlyAccess \
@@ -546,7 +547,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/
 	DataSequence \
 	DataSink \
 	DataSource \
-	LabeledDataSequence \
 	RangeHighlighter \
 	RangeHighlightListener \
 	TabularDataProviderArguments \
@@ -1975,6 +1975,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\
 	XDataSource \
 	XDatabaseDataProvider \
 	XLabeledDataSequence \
+	XLabeledDataSequence2 \
 	XNumericalDataSequence \
 	XRangeHighlighter \
 	XRangeXMLConversion \
diff --git a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
index c7b701c9b0a4..58d78598a595 100644
--- a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
@@ -19,9 +19,7 @@
 #ifndef com_sun_star_chart2_data_LabeledDataSequence_idl
 #define com_sun_star_chart2_data_LabeledDataSequence_idl
 
-#include <com/sun/star/util/XCloneable.idl>
-#include <com/sun/star/util/XModifyBroadcaster.idl>
-#include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
+#include <com/sun/star/chart2/data/XLabeledDataSequence2.idl>
 
 module com
 {
@@ -37,32 +35,7 @@ module data
 /** describes a container for a sequence pair of value-sequences, one
     for a label and one for the associated data.
   */
-service LabeledDataSequence
-{
-    /** provides read- and write-access to the underlying data.
-     */
-    interface XLabeledDataSequence;
-
-    /** is used to broadcast when the sequence for labels or values
-        change their identity, or their content changes.
-
-        <p>The LabeledDataSequence should add itself at its
-        XDataSequences for values and labels, and forward any change
-        events coming from there.</p>
-     */
-    interface com::sun::star::util::XModifyBroadcaster;
-
-    /** Allows creating copies of data sequences.  If this interface
-        is not supported, the same object will be shared if used by
-        multiple objects.
-
-        <p>If a <type>LabeledDataSequence</type> is cloned, it has to
-        query its contents for the
-        <type scope="com::sun::star::util">XCloneable</type> interface
-        and use it if available.</p>
-    */
-    [optional] interface ::com::sun::star::util::XCloneable;
-};
+service LabeledDataSequence : XLabeledDataSequence2;
 
 } ; // data
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/data/XLabeledDataSequence2.idl b/offapi/com/sun/star/chart2/data/XLabeledDataSequence2.idl
new file mode 100644
index 000000000000..40e6ab4d8264
--- /dev/null
+++ b/offapi/com/sun/star/chart2/data/XLabeledDataSequence2.idl
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef com_sun_star_chart2_data_XLabeledDataSequence2_idl
+#define com_sun_star_chart2_data_XLabeledDataSequence2_idl
+
+#include <com/sun/star/util/XCloneable.idl>
+#include <com/sun/star/util/XModifyBroadcaster.idl>
+#include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
+
+module com
+{
+module sun
+{
+module star
+{
+module chart2
+{
+module data
+{
+
+/**
+    @since LibreOffice 4.1
+  */
+interface XLabeledDataSequence2
+{
+    /** provides read- and write-access to the underlying data.
+     */
+    interface XLabeledDataSequence;
+
+    /** is used to broadcast when the sequence for labels or values
+        change their identity, or their content changes.
+
+        <p>The LabeledDataSequence should add itself at its
+        XDataSequences for values and labels, and forward any change
+        events coming from there.</p>
+     */
+    interface com::sun::star::util::XModifyBroadcaster;
+
+    /** Allows creating copies of data sequences.  If this interface
+        is not supported, the same object will be shared if used by
+        multiple objects.
+
+        <p>If a <type>LabeledDataSequence</type> is cloned, it has to
+        query its contents for the
+        <type scope="com::sun::star::util">XCloneable</type> interface
+        and use it if available.</p>
+    */
+    interface ::com::sun::star::util::XCloneable;
+};
+
+} ; // data
+} ; // chart2
+} ; // com
+} ; // sun
+} ; // star
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */