API CHANGE: remove com.sun.star.xml.UserDefinedAttributeSupplier

This service is deprecated and has been replaced by
com.sun.star.xml.UserDefinedAttributesSupplier in OpenOffice.org 2.0.4.

Adapt all services including the removed service to use the replacement.
This should have no impact on client code as this service is just
glorified documentation anyway.

Change-Id: Ie3db10dc34a53d77fa426b5f3bb39dc78d21b946
EXISTENCE: published key "/UCR/com/sun/star/xml/UserDefinedAttributeSupplier" exists only in registry 1
SERVICE: /UCR/com/sun/star/chart/ChartArea
incompatible change: Reference 2 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/ChartAxis
incompatible change: Reference 2 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/ChartDataPointProperties
incompatible change: Reference 3 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/ChartDataRowProperties
incompatible change: Reference 2 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/ChartDocument
incompatible change: Reference 0 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/ChartGrid
incompatible change: Reference 1 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/ChartLegend
incompatible change: Reference 2 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/ChartTitle
incompatible change: Reference 1 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2'
SERVICE: /UCR/com/sun/star/chart/Diagram
incompatible change: Reference 5 ('UserDefinedAttributeSupplier') in 'r1' is not longer a reference of this service in 'r2

12 files changed, 18 insertions, 82 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e671800e9ae6..16f261764900 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1494,7 +1494,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
 	NamespaceContainer \
 	ParaUserDefinedAttributesSupplier \
 	TextUserDefinedAttributesSupplier \
-	UserDefinedAttributeSupplier \
 	UserDefinedAttributesSupplier \
 	XMLExportFilter \
 	XMLImportFilter \
diff --git a/offapi/com/sun/star/chart/ChartArea.idl b/offapi/com/sun/star/chart/ChartArea.idl
index a6856852602e..9abfa8f1b3b7 100644
--- a/offapi/com/sun/star/chart/ChartArea.idl
+++ b/offapi/com/sun/star/chart/ChartArea.idl
@@ -24,7 +24,7 @@
 #include <com/sun/star/drawing/LineProperties.idl>
 
 #include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
  module com {  module sun {  module star {  module chart {
@@ -45,7 +45,7 @@ published service ChartArea
 
     @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
     interface com::sun::star::beans::XPropertySet;
 };
diff --git a/offapi/com/sun/star/chart/ChartAxis.idl b/offapi/com/sun/star/chart/ChartAxis.idl
index 33789cc991cb..e0b240bc78c1 100644
--- a/offapi/com/sun/star/chart/ChartAxis.idl
+++ b/offapi/com/sun/star/chart/ChartAxis.idl
@@ -32,7 +32,7 @@
 #include <com/sun/star/chart/ChartAxisType.idl>
 #include <com/sun/star/chart/TimeIncrement.idl>
 #include <com/sun/star/chart/XAxis.idl>
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
  module com {  module sun {  module star {  module chart {
@@ -60,7 +60,7 @@ published service ChartAxis
 
         @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
     /** Access to the sub elements of an axis like title and grids.
         @since OOo 3.4
diff --git a/offapi/com/sun/star/chart/ChartDataPointProperties.idl b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
index ed504947a107..51dbb0096bcf 100644
--- a/offapi/com/sun/star/chart/ChartDataPointProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
@@ -28,7 +28,7 @@
 #include <com/sun/star/chart/Chart3DBarProperties.idl>
 
 #include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
  module com {  module sun {  module star {  module chart {
@@ -64,7 +64,7 @@ published service ChartDataPointProperties
 
     @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
 
     /** is only available if the chart is of type
diff --git a/offapi/com/sun/star/chart/ChartDataRowProperties.idl b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
index 9d940d8861a4..3fedbdcb7d16 100644
--- a/offapi/com/sun/star/chart/ChartDataRowProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
@@ -25,7 +25,7 @@
 
 #include <com/sun/star/beans/XPropertySet.idl>
 
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
  module com {  module sun {  module star {  module chart {
@@ -55,7 +55,7 @@ published service ChartDataRowProperties
 
     @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
     interface com::sun::star::beans::XPropertySet;
 
diff --git a/offapi/com/sun/star/chart/ChartDocument.idl b/offapi/com/sun/star/chart/ChartDocument.idl
index f26614d6859d..c8d091f8cf03 100644
--- a/offapi/com/sun/star/chart/ChartDocument.idl
+++ b/offapi/com/sun/star/chart/ChartDocument.idl
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/chart/XChartDocument.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 #include <com/sun/star/drawing/XDrawPageSupplier.idl>
 
 
@@ -47,7 +47,7 @@ published service ChartDocument
 
     @since OOo 1.1.2
      */
-    [optional] service ::com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service ::com::sun::star::xml::UserDefinedAttributesSupplier;
 
     interface ::com::sun::star::chart::XChartDocument;
     interface ::com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/chart/ChartGrid.idl b/offapi/com/sun/star/chart/ChartGrid.idl
index 6445d35ec57b..be4bbac9c513 100644
--- a/offapi/com/sun/star/chart/ChartGrid.idl
+++ b/offapi/com/sun/star/chart/ChartGrid.idl
@@ -23,7 +23,7 @@
 
 #include <com/sun/star/beans/XPropertySet.idl>
 
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
  module com {  module sun {  module star {  module chart {
@@ -46,7 +46,7 @@ published service ChartGrid
 
     @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
     interface com::sun::star::beans::XPropertySet;
 };
diff --git a/offapi/com/sun/star/chart/ChartLegend.idl b/offapi/com/sun/star/chart/ChartLegend.idl
index 6ef9699ca83d..1a056e4a012f 100644
--- a/offapi/com/sun/star/chart/ChartLegend.idl
+++ b/offapi/com/sun/star/chart/ChartLegend.idl
@@ -24,7 +24,7 @@
 #include <com/sun/star/style/CharacterProperties.idl>
 
 #include <com/sun/star/chart/ChartLegendPosition.idl>
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
 
@@ -60,7 +60,7 @@ published service ChartLegend
 
     @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
 
     /** determines the alignment of the legend relative
diff --git a/offapi/com/sun/star/chart/ChartTitle.idl b/offapi/com/sun/star/chart/ChartTitle.idl
index 8e7844623626..d3019ca6654d 100644
--- a/offapi/com/sun/star/chart/ChartTitle.idl
+++ b/offapi/com/sun/star/chart/ChartTitle.idl
@@ -20,7 +20,7 @@
 #define __com_sun_star_chart_ChartTitle_idl__
 
 #include <com/sun/star/drawing/Shape.idl>
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
  module com {  module sun {  module star {  module chart {
@@ -49,7 +49,7 @@ published service ChartTitle
 
     @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
 
     /** specifies the rotation of the shape in 100th of degrees.
diff --git a/offapi/com/sun/star/chart/Diagram.idl b/offapi/com/sun/star/chart/Diagram.idl
index 3c517a418cde..c0ce8551b6df 100644
--- a/offapi/com/sun/star/chart/Diagram.idl
+++ b/offapi/com/sun/star/chart/Diagram.idl
@@ -28,7 +28,7 @@
 
 #include <com/sun/star/chart/ChartDataRowSource.idl>
 
-#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
+#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
 
 
  module com {  module sun {  module star {  module chart {
@@ -88,7 +88,7 @@ published service Diagram
 
     @since OOo 1.1.2
      */
-    [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
+    [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
 
     /** determines if the data for a data row is contained in the
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
deleted file mode 100644
index 4630574e36bd..000000000000
--- a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- 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_xml_UserDefinedAttributeSupplier_idl_
-#define _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
-
-#include <com/sun/star/container/XNameContainer.idl>
-
-module com { module sun { module star { module xml {
-
-/** A component that supports this service preserves XML attributes,
-    unknown by its parser, that belong to the XML element representing
-    it (the component).
-
-    @since OOo 1.1.2
-
-    @deprecated     because of typo in service name.
-            Please use the service UserDefinedAttributesSupplier instead.
-
-    @see    <type scope="com::sun::star::xml">UserDefinedAttributesSupplier</type>
-*/
-published service UserDefinedAttributeSupplier
-{
-    /** This container holds the <type>AttributeData</type> elements
-        that represent uninterpreted XML attributes.
-
-        <p>The idea behind this property is that a parser can stow
-        away all attributes that it cannot handle by itself on reading
-        an XML file.  When the file is stored again, the unknown
-        attributes can be written back without loss.</p>
-
-        <p>The
-        <type scope="com::sun::star::container">XNameContainer</type>
-        supports the service <type>AttributeContainer</type>.</p>
-
-        @deprecated     because of typo in service name.
-                Please use the service UserDefinedAttributesSupplier instead.
-
-        @see    <type scope="com::sun::star::xml">UserDefinedAttributesSupplier</type>
-     */
-    [property] ::com::sun::star::container::XNameContainer  UserDefinedAttributes;
-};
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 72b4d588791e..23164cd61cf9 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb