summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-06-05 14:35:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-06-05 14:39:45 +0200
commited0646e52f971550e0df157297384d35c47926eb (patch)
treec759136715643da015c074a55c8fb179810f9149
parent65df76208a8ad5d7b6de22b7bcae14148271dc54 (diff)
Fixes for new-style com.sun.star.chart2.FormattedString service
...changed from old-style with 5d1ad167294878789e644452f23ef883af93fe87 "fdo#46808 Convert chart2::FormattedString service to new style." The CharacterProperties* services dropped there are property-only old-style services, so only serve documentation purposes anyway. Ideally, the new-style service would offer interface attributes for the relevant properties (and likely not implement XPropertySet at all), but so be it for now... Change-Id: I0dd0373cfd372f2320204eb953acce9a2b9e86d2
-rw-r--r--chart2/source/model/main/FormattedString.hxx12
-rw-r--r--offapi/com/sun/star/chart2/XFormattedString2.idl7
2 files changed, 13 insertions, 6 deletions
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 90f864b74e9a..99ecea097377 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -65,17 +65,17 @@ public:
DECLARE_XTYPEPROVIDER()
- virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{ ::property::OPropertySet::setPropertyValue(p1, p2); }
- virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::uno::RuntimeException)
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{ return ::property::OPropertySet::getPropertyValue(p1); }
- virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{ ::property::OPropertySet::addPropertyChangeListener(p1, p2); }
- virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{ ::property::OPropertySet::removePropertyChangeListener(p1, p2); }
- virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{ ::property::OPropertySet::addVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{ ::property::OPropertySet::removeVetoableChangeListener(p1, p2); }
diff --git a/offapi/com/sun/star/chart2/XFormattedString2.idl b/offapi/com/sun/star/chart2/XFormattedString2.idl
index ea80fce260d7..c780dd9e2c06 100644
--- a/offapi/com/sun/star/chart2/XFormattedString2.idl
+++ b/offapi/com/sun/star/chart2/XFormattedString2.idl
@@ -35,6 +35,13 @@ module com { module sun { module star { module chart2 {
*/
interface XFormattedString2
{
+ /** Access to various character properties.
+
+ Supports the properties of the
+ com::sun::star::style::CharacterProperties service, and also optionally
+ those of the com::sun::star::style::CharacterPropertiesAsian and
+ com::sun::star::style::CharacterPropertiesComplex services.
+ */
interface com::sun::star::beans::XPropertySet;
interface com::sun::star::chart2::XFormattedString;