From 60d60caf99a40ca0c3891bf230c5a1fdbae5f49c Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@suse.com>
Date: Tue, 16 Aug 2011 01:18:21 -0400
Subject: Renamed XPropertySet2 to XPropertySetOption.

To avoid making it appear to be a derived interface of XPropertySet
when it's not.
---
 udkapi/UnoApi_udkapi.mk                          |  2 +-
 udkapi/com/sun/star/beans/XPropertySet2.idl      | 28 ------------------------
 udkapi/com/sun/star/beans/XPropertySetOption.idl | 22 +++++++++++++++++++
 3 files changed, 23 insertions(+), 29 deletions(-)
 delete mode 100644 udkapi/com/sun/star/beans/XPropertySet2.idl
 create mode 100644 udkapi/com/sun/star/beans/XPropertySetOption.idl

(limited to 'udkapi')

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/XPropertySet2.idl
deleted file mode 100644
index 61f3dfe1c250..000000000000
--- a/udkapi/com/sun/star/beans/XPropertySet2.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#ifndef __com_sun_star_beans_XPropertySet2_idl__
-#define __com_sun_star_beans_XPropertySet2_idl__
-
-#include <com/sun/star/beans/XPropertySet.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
-{
-    /**
-     * Turn on or off notifying change listeners on property value change.  It
-     * notifies registered change listeners by default.
-     */
-    void enableChangeListenerNotification( [in] boolean bEnable );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/udkapi/com/sun/star/beans/XPropertySetOption.idl b/udkapi/com/sun/star/beans/XPropertySetOption.idl
new file mode 100644
index 000000000000..032a040522eb
--- /dev/null
+++ b/udkapi/com/sun/star/beans/XPropertySetOption.idl
@@ -0,0 +1,22 @@
+
+#ifndef __com_sun_star_beans_XPropertySet2_idl__
+#define __com_sun_star_beans_XPropertySet2_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module com {  module sun {  module star {  module beans {
+
+interface XPropertySetOption: com::sun::star::uno::XInterface
+{
+    /**
+     * Turn on or off notifying change listeners on property value change.  It
+     * notifies registered change listeners by default.
+     */
+    void enableChangeListenerNotification( [in] boolean bEnable );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
-- 
cgit