[Libreoffice-commits] .: 2 commits - chart2/qa chart2/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 29 12:31:00 PST 2012
chart2/qa/unoapi/knownissues.xcl | 18 +-
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 2
chart2/source/controller/chartcontroller.component | 2
chart2/source/inc/UserDefinedProperties.hxx | 4
chart2/source/tools/UserDefinedProperties.cxx | 2
offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/chart/ChartArea.idl | 4
offapi/com/sun/star/chart/ChartAxis.idl | 4
offapi/com/sun/star/chart/ChartDataPointProperties.idl | 4
offapi/com/sun/star/chart/ChartDataRowProperties.idl | 4
offapi/com/sun/star/chart/ChartDocument.idl | 4
offapi/com/sun/star/chart/ChartGrid.idl | 4
offapi/com/sun/star/chart/ChartLegend.idl | 4
offapi/com/sun/star/chart/ChartTitle.idl | 4
offapi/com/sun/star/chart/Diagram.idl | 4
offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl | 63 ----------
offapi/type_reference/types.rdb |binary
qadevOOo/Jar_OOoRunner.mk | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartAxis.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartDocument.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartArea.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartGrid.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLine.csv | 2
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv | 2
qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java | 63 ----------
qadevOOo/tests/java/ifc/xml/_UserDefinedAttributesSupplier.java | 63 ++++++++++
40 files changed, 116 insertions(+), 180 deletions(-)
New commits:
commit 0a9e0fbcecab9fda2ffa2e87e5f338add18daf62
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 29 21:20:11 2012 +0100
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
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e671800..16f2617 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 a685685..9abfa8f 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 33789cc..e0b240b 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 ed50494..51dbb00 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 9d940d8..3fedbdc 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 f26614d..c8d091f 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 6445d35..be4bbac 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 6ef9699..1a056e4 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 8e78446..d3019ca 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 3c517a4..c0ce855 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 4630574..0000000
--- 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 72b4d58..23164cd 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
commit 90227b15f095d706795a86564d716a5dbcf2c7e2
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 29 20:48:11 2012 +0100
chart2: replace use of deprecated UserDefinedAttributeSupplier
... with UserDefinedAttributesSupplier
Change-Id: Ib289aaae114d89238a665d0a58eda6fa8d0c482b
diff --git a/chart2/qa/unoapi/knownissues.xcl b/chart2/qa/unoapi/knownissues.xcl
index 9192dc6..8321f45 100644
--- a/chart2/qa/unoapi/knownissues.xcl
+++ b/chart2/qa/unoapi/knownissues.xcl
@@ -42,15 +42,15 @@ sch.ChartLegend::com::sun::star::drawing::XShape
sch.ChartTitle::com::sun::star::drawing::XShape
#i78867
-sch.ChXChartDocument::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChXChartAxis::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChXDiagram::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChartArea::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChartGrid::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChartLegend::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChartLine::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChartTitle::com::sun::star::xml::UserDefinedAttributeSupplier
-sch.ChXDataPoint::com::sun::star::xml::UserDefinedAttributeSupplier
+sch.ChXChartDocument::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChXChartAxis::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChXDiagram::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChartArea::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChartGrid::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChartLegend::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChartLine::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChartTitle::com::sun::star::xml::UserDefinedAttributesSupplier
+sch.ChXDataPoint::com::sun::star::xml::UserDefinedAttributesSupplier
#i83865
sch.ChXDataPoint::com::sun::star::drawing::LineProperties
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 9c4f6b0..8fee82b 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -183,7 +183,7 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
Sequence< ::rtl::OUString > AreaWrapper::getSupportedServiceNames_Static()
{
Sequence< ::rtl::OUString > aServices( 4 );
- aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
aServices[ 2 ] = "com.sun.star.drawing.FillProperties";
aServices[ 3 ] = "com.sun.star.drawing.LineProperties";
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 178a56e..c5e416c 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -681,7 +681,7 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
aServices[ 0 ] = "com.sun.star.chart.ChartAxis";
- aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.style.CharacterProperties";
return aServices;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 034eb47..1679932 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1560,7 +1560,7 @@ uno::Sequence< ::rtl::OUString > ChartDocumentWrapper::getSupportedServiceNames_
uno::Sequence< ::rtl::OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartDocument";
aServices[ 1 ] = CHART_CHARTAPIWRAPPER_SERVICE_NAME;
- aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index c29546d..4242c2e 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -862,7 +862,7 @@ uno::Sequence< ::rtl::OUString > DataSeriesPointWrapper::getSupportedServiceName
uno::Sequence< ::rtl::OUString > aServices( 7 );
aServices[ 0 ] = "com.sun.star.chart.ChartDataRowProperties";
aServices[ 1 ] = "com.sun.star.chart.ChartDataPointProperties";
- aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.beans.PropertySet";
aServices[ 4 ] = "com.sun.star.drawing.FillProperties";
aServices[ 5 ] = "com.sun.star.drawing.LineProperties";
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 9d970b5..97d49ee 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -2066,7 +2066,7 @@ uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 8 );
aServices[ 0 ] = "com.sun.star.chart.Diagram";
- aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.chart.StackableDiagram";
aServices[ 3 ] = "com.sun.star.chart.ChartAxisXSupplier";
aServices[ 4 ] = "com.sun.star.chart.ChartAxisYSupplier";
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 1a7acd3..07e8a95 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -186,7 +186,7 @@ Sequence< OUString > GridWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartGrid";
- aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.drawing.LineProperties";
aServices[ 3 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 7d63a82..eec61f2 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -436,7 +436,7 @@ Sequence< ::rtl::OUString > LegendWrapper::getSupportedServiceNames_Static()
Sequence< ::rtl::OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartLegend";
aServices[ 1 ] = "com.sun.star.drawing.Shape";
- aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.style.CharacterProperties";
return aServices;
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 9c927ac..19a06c2 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -419,7 +419,7 @@ Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
aServices[ 0 ] = "com.sun.star.chart.ChartLine";
- aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.drawing.LineProperties";
return aServices;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 03fa88a..fd25e33 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -533,7 +533,7 @@ Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static()
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartTitle";
aServices[ 1 ] = "com.sun.star.drawing.Shape";
- aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.style.CharacterProperties";
return aServices;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 86b2362..937cb83 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -383,7 +383,7 @@ Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
aServices[ 0 ] = ::rtl::OUString("com.sun.star.chart.ChartArea");
aServices[ 1 ] = ::rtl::OUString("com.sun.star.drawing.LineProperties");
aServices[ 2 ] = ::rtl::OUString("com.sun.star.drawing.FillProperties");
- aServices[ 3 ] = ::rtl::OUString("com.sun.star.xml.UserDefinedAttributeSupplier");
+ aServices[ 3 ] = ::rtl::OUString("com.sun.star.xml.UserDefinedAttributesSupplier");
return aServices;
}
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index f8d8243..8c4b53a 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -166,7 +166,7 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties(
Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
- aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+ aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 1 ] = "com.sun.star.drawing.FillProperties";
aServices[ 2 ] = "com.sun.star.drawing.LineProperties";
aServices[ 3 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component
index 4573358..e800bed 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -30,7 +30,7 @@
<service name="com.sun.star.beans.PropertySet"/>
<service name="com.sun.star.chart.ChartDocument"/>
<service name="com.sun.star.chart2.ChartDocumentWrapper"/>
- <service name="com.sun.star.xml.UserDefinedAttributeSupplier"/>
+ <service name="com.sun.star.xml.UserDefinedAttributesSupplier"/>
</implementation>
<implementation name="com.sun.star.comp.chart2.ChartFrameLoader">
<service name="com.sun.star.frame.SynchronousFrameLoader"/>
diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx
index 893e123..9c73e5f 100644
--- a/chart2/source/inc/UserDefinedProperties.hxx
+++ b/chart2/source/inc/UserDefinedProperties.hxx
@@ -29,7 +29,7 @@
namespace chart
{
-// implements service com.sun.star.xml.UserDefinedAttributeSupplier
+// implements service com.sun.star.xml.UserDefinedAttributesSupplier
class OOO_DLLPUBLIC_CHARTTOOLS UserDefinedProperties
{
public:
@@ -40,7 +40,7 @@ public:
PROP_XML_USERDEF_CHART = FAST_PROPERTY_ID_START_USERDEF_PROP,
PROP_XML_USERDEF_TEXT,
PROP_XML_USERDEF_PARA,
- // com.sun.star.xml.UserDefinedAttributeSupplier
+ // com.sun.star.xml.UserDefinedAttributesSupplier
// UserDefined attributes in the other properties-sections. (as long as
// there is no reliable mechanism, properties may move between the
// sections)
diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx
index 4345cf0..69ad99d 100644
--- a/chart2/source/tools/UserDefinedProperties.cxx
+++ b/chart2/source/tools/UserDefinedProperties.cxx
@@ -50,7 +50,7 @@ void UserDefinedProperties::AddPropertiesToVector(
::getCppuType( reinterpret_cast< const uno::Reference< container::XNameContainer > * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
- // UserDefinedAttributeSupplier
+ // UserDefinedAttributesSupplier
// ----------------------------
rOutProperties.push_back(
Property( C2U( "UserDefinedAttributes" ),
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 998a794..b67cb23 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -962,7 +962,7 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/view/_XSelectionSupplier \
qadevOOo/tests/java/ifc/view/_XViewSettingsSupplier \
qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler \
- qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier \
+ qadevOOo/tests/java/ifc/xml/_UserDefinedAttributesSupplier \
qadevOOo/tests/java/mod/_acceptor/Acceptor \
qadevOOo/tests/java/mod/_acceptor/uno/Acceptor \
qadevOOo/tests/java/mod/_adabas/ODriver \
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartAxis.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartAxis.csv
index dba9909..d6fe951 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartAxis.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartAxis.csv
@@ -1,4 +1,4 @@
-"ChXChartAxis";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChXChartAxis";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChXChartAxis";"com::sun::star::chart::ChartAxis";"Max#optional"
"ChXChartAxis";"com::sun::star::chart::ChartAxis";"Min#optional"
"ChXChartAxis";"com::sun::star::chart::ChartAxis";"Origin#optional"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartDocument.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartDocument.csv
index ca1df6e..f775e2c 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartDocument.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXChartDocument.csv
@@ -1,4 +1,4 @@
-"ChXChartDocument";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChXChartDocument";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChXChartDocument";"com::sun::star::chart::ChartDocument";"HasMainTitle"
"ChXChartDocument";"com::sun::star::chart::ChartDocument";"HasSubTitle"
"ChXChartDocument";"com::sun::star::chart::ChartDocument";"HasLegend"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv
index a42e65b..af4ebc6 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv
@@ -1,4 +1,4 @@
-"ChXDataPoint";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChXDataPoint";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChXDataPoint";"com::sun::star::drawing::LineProperties";"LineStyle"
"ChXDataPoint";"com::sun::star::drawing::LineProperties";"LineDash"
"ChXDataPoint";"com::sun::star::drawing::LineProperties";"LineColor"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv
index 73d280d..f64c24d 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv
@@ -1,4 +1,4 @@
-"ChXDataRow";"com::sun::star::xml::UserDefinedAttributeSupplier#optional";"UserDefinedAttributes"
+"ChXDataRow";"com::sun::star::xml::UserDefinedAttributesSupplier#optional";"UserDefinedAttributes"
"ChXDataRow";"com::sun::star::drawing::LineProperties";"LineStyle"
"ChXDataRow";"com::sun::star::drawing::LineProperties";"LineDash"
"ChXDataRow";"com::sun::star::drawing::LineProperties";"LineColor"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv
index 516842f..6fa7833 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv
@@ -1,4 +1,4 @@
-"ChXDiagram";"com::sun::star::xml::UserDefinedAttributeSupplier#optional";"UserDefinedAttributes"
+"ChXDiagram";"com::sun::star::xml::UserDefinedAttributesSupplier#optional";"UserDefinedAttributes"
"ChXDiagram";"com::sun::star::chart::XDiagram";"getDiagramType()"
"ChXDiagram";"com::sun::star::chart::XDiagram";"getDataRowProperties()"
"ChXDiagram";"com::sun::star::chart::XDiagram";"getDataPointProperties()"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartArea.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartArea.csv
index bbf3918..3dc5722 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartArea.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartArea.csv
@@ -1,4 +1,4 @@
-"ChartArea";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChartArea";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChartArea";"com::sun::star::drawing::LineProperties";"LineStyle"
"ChartArea";"com::sun::star::drawing::LineProperties";"LineDash"
"ChartArea";"com::sun::star::drawing::LineProperties";"LineColor"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartGrid.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartGrid.csv
index 79b51eb..5396a70 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartGrid.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartGrid.csv
@@ -1,4 +1,4 @@
-"ChartGrid";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChartGrid";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChartGrid";"com::sun::star::drawing::LineProperties";"LineStyle"
"ChartGrid";"com::sun::star::drawing::LineProperties";"LineDash"
"ChartGrid";"com::sun::star::drawing::LineProperties";"LineColor"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv
index 3ca8aa0..8622aca 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv
@@ -1,4 +1,4 @@
-"ChartLegend";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChartLegend";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChartLegend";"com::sun::star::lang::XComponent";"dispose()"
"ChartLegend";"com::sun::star::lang::XComponent";"addEventListener()"
"ChartLegend";"com::sun::star::lang::XComponent";"removeEventListener()"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLine.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLine.csv
index 5f57e95..af63a98 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLine.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLine.csv
@@ -1,4 +1,4 @@
-"ChartLine";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChartLine";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChartLine";"com::sun::star::drawing::LineProperties";"LineStyle"
"ChartLine";"com::sun::star::drawing::LineProperties";"LineDash"
"ChartLine";"com::sun::star::drawing::LineProperties";"LineColor"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv
index 7c00aa6..0bdbcc3 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv
@@ -1,4 +1,4 @@
-"ChartTitle";"com::sun::star::xml::UserDefinedAttributeSupplier";"UserDefinedAttributes"
+"ChartTitle";"com::sun::star::xml::UserDefinedAttributesSupplier";"UserDefinedAttributes"
"ChartTitle";"com::sun::star::lang::XComponent";"dispose()"
"ChartTitle";"com::sun::star::lang::XComponent";"addEventListener()"
"ChartTitle";"com::sun::star::lang::XComponent";"removeEventListener()"
diff --git a/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java b/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java
deleted file mode 100644
index 3e46223..0000000
--- a/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 .
- */
-
-package ifc.xml;
-import com.sun.star.container.XNameContainer;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.xml.AttributeData;
-
-public class _UserDefinedAttributeSupplier extends lib.MultiPropertyTest {
-
- public void _UserDefinedAttributes() {
- XNameContainer uda = null;
- boolean res = false;
- try {
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
- oObj.getPropertyValue("UserDefinedAttributes"));
- AttributeData attr = new AttributeData();
- attr.Namespace = "http://www.sun.com/staroffice/apitest/Chartprop";
- attr.Type="CDATA";
- attr.Value="true";
- uda.insertByName("Chartprop:has-first-alien-attribute",attr);
- uda.getElementNames();
- oObj.setPropertyValue("UserDefinedAttributes",uda);
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
- oObj.getPropertyValue("UserDefinedAttributes"));
- uda.getElementNames();
- uda.getByName("Chartprop:has-first-alien-attribute");
- res = true;
- } catch (com.sun.star.beans.UnknownPropertyException upe) {
- log.println("Don't know the Property 'UserDefinedAttributes'");
- } catch (com.sun.star.lang.WrappedTargetException wte) {
- log.println("WrappedTargetException while getting Property 'UserDefinedAttributes'");
- } catch (com.sun.star.container.NoSuchElementException nee) {
- log.println("added Element isn't part of the NameContainer");
- } catch (com.sun.star.lang.IllegalArgumentException iae) {
- log.println("IllegalArgumentException while getting Property 'UserDefinedAttributes'");
- } catch (com.sun.star.beans.PropertyVetoException pve) {
- log.println("PropertyVetoException while getting Property 'UserDefinedAttributes'");
- } catch (com.sun.star.container.ElementExistException eee) {
- log.println("ElementExistException while getting Property 'UserDefinedAttributes'");
- }
- tRes.tested("UserDefinedAttributes",res);
- }
-
-}
diff --git a/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributesSupplier.java b/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributesSupplier.java
new file mode 100644
index 0000000..28ff8a0
--- /dev/null
+++ b/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributesSupplier.java
@@ -0,0 +1,63 @@
+/*
+ * 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 .
+ */
+
+package ifc.xml;
+import com.sun.star.container.XNameContainer;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.Type;
+import com.sun.star.xml.AttributeData;
+
+public class _UserDefinedAttributesSupplier extends lib.MultiPropertyTest {
+
+ public void _UserDefinedAttributes() {
+ XNameContainer uda = null;
+ boolean res = false;
+ try {
+ uda = (XNameContainer) AnyConverter.toObject(
+ new Type(XNameContainer.class),
+ oObj.getPropertyValue("UserDefinedAttributes"));
+ AttributeData attr = new AttributeData();
+ attr.Namespace = "http://www.sun.com/staroffice/apitest/Chartprop";
+ attr.Type="CDATA";
+ attr.Value="true";
+ uda.insertByName("Chartprop:has-first-alien-attribute",attr);
+ uda.getElementNames();
+ oObj.setPropertyValue("UserDefinedAttributes",uda);
+ uda = (XNameContainer) AnyConverter.toObject(
+ new Type(XNameContainer.class),
+ oObj.getPropertyValue("UserDefinedAttributes"));
+ uda.getElementNames();
+ uda.getByName("Chartprop:has-first-alien-attribute");
+ res = true;
+ } catch (com.sun.star.beans.UnknownPropertyException upe) {
+ log.println("Don't know the Property 'UserDefinedAttributes'");
+ } catch (com.sun.star.lang.WrappedTargetException wte) {
+ log.println("WrappedTargetException while getting Property 'UserDefinedAttributes'");
+ } catch (com.sun.star.container.NoSuchElementException nee) {
+ log.println("added Element isn't part of the NameContainer");
+ } catch (com.sun.star.lang.IllegalArgumentException iae) {
+ log.println("IllegalArgumentException while getting Property 'UserDefinedAttributes'");
+ } catch (com.sun.star.beans.PropertyVetoException pve) {
+ log.println("PropertyVetoException while getting Property 'UserDefinedAttributes'");
+ } catch (com.sun.star.container.ElementExistException eee) {
+ log.println("ElementExistException while getting Property 'UserDefinedAttributes'");
+ }
+ tRes.tested("UserDefinedAttributes",res);
+ }
+
+}
More information about the Libreoffice-commits
mailing list