diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-16 01:18:21 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-16 21:22:45 -0400 |
| commit | 60d60caf99a40ca0c3891bf230c5a1fdbae5f49c (patch) | |
| tree | 68dd8bced3df8fd52ff56842ca5b7e0f19c0a8a1 /udkapi | |
| parent | 11207ae93191fb966676423e6d377c8292a8cf0b (diff) | |
Renamed XPropertySet2 to XPropertySetOption.
To avoid making it appear to be a derived interface of XPropertySet
when it's not.
Diffstat (limited to 'udkapi')
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 2 | ||||
| -rw-r--r-- | udkapi/com/sun/star/beans/XPropertySetOption.idl (renamed from udkapi/com/sun/star/beans/XPropertySet2.idl) | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index 8a57118ae6f1..9fab4564a14d 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -159,10 +159,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,\ udkapi/com/sun/star/beans/XPropertyChangeListener \ udkapi/com/sun/star/beans/XPropertyContainer \ udkapi/com/sun/star/beans/XPropertySet \ - udkapi/com/sun/star/beans/XPropertySet2 \ udkapi/com/sun/star/beans/XPropertySetInfo \ udkapi/com/sun/star/beans/XPropertySetInfoChangeListener \ udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier \ + udkapi/com/sun/star/beans/XPropertySetOption \ udkapi/com/sun/star/beans/XPropertyState \ udkapi/com/sun/star/beans/XPropertyStateChangeListener \ udkapi/com/sun/star/beans/XPropertyWithState \ diff --git a/udkapi/com/sun/star/beans/XPropertySet2.idl b/udkapi/com/sun/star/beans/XPropertySetOption.idl index 61f3dfe1c250..032a040522eb 100644 --- a/udkapi/com/sun/star/beans/XPropertySet2.idl +++ b/udkapi/com/sun/star/beans/XPropertySetOption.idl @@ -2,17 +2,11 @@ #ifndef __com_sun_star_beans_XPropertySet2_idl__ #define __com_sun_star_beans_XPropertySet2_idl__ -#include <com/sun/star/beans/XPropertySet.idl> +#include <com/sun/star/uno/XInterface.idl> module com { module sun { module star { module beans { -/** - * This interface should be conceptually derived from XPropertySet but isn't - * due to ABI compatibility on Windows; cppu::OPrpertySetHelper exports - * XPropertySet's vtable symbol in the UDK_3_0_0 section which must stay - * there. Once we hit LibreOffice 4 we should clean this mess up. - */ -interface XPropertySet2: com::sun::star::uno::XInterface +interface XPropertySetOption: com::sun::star::uno::XInterface { /** * Turn on or off notifying change listeners on property value change. It |