diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx index 335fc6003628..670ce038171b 100644 --- a/cppuhelper/inc/cppuhelper/propshlp.hxx +++ b/cppuhelper/inc/cppuhelper/propshlp.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include @@ -352,7 +352,7 @@ public: class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet, public ::com::sun::star::beans::XFastPropertySet, public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::beans::XPropertySet2 + public ::com::sun::star::beans::XPropertySetOption { public: /** @@ -506,7 +506,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener > & Listener ) throw(::com::sun::star::uno::RuntimeException); - // XPropertySet2 + // XPropertySetOption virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException); diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index a12a537fdb00..f3123541fd93 100755 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -61,7 +61,7 @@ UNOTYPES= \ com.sun.star.beans.XMultiPropertySet \ com.sun.star.beans.XPropertyAccess \ com.sun.star.beans.XPropertySet \ - com.sun.star.beans.XPropertySet2 \ + com.sun.star.beans.XPropertySetOption \ com.sun.star.bridge.UnoUrlResolver \ com.sun.star.bridge.XUnoUrlResolver \ com.sun.star.connection.SocketPermission \ diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map index 1d397bfec585..bd30b1b646d2 100644 --- a/cppuhelper/source/msvc_win32_intel.map +++ b/cppuhelper/source/msvc_win32_intel.map @@ -288,5 +288,5 @@ UDK_3.7 { # OOo 3.4 UDK_3.8 { # LibO 3.5 global: ?enableChangeListenerNotification@OPropertySetHelper@cppu@@UAAXE@Z; - ??_7OPropertySetHelper@cppu@@6BXPropertySet2@beans@star@sun@com@@@; + ??_7OPropertySetHelper@cppu@@6BXPropertySetOption@beans@star@sun@com@@@; } UDK_3.7; diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 426c7c92b924..787806200564 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -218,7 +218,7 @@ Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rTyp return ::cppu::queryInterface( rType, static_cast< XPropertySet * >( this ), - static_cast< XPropertySet2 * >( this ), + static_cast< XPropertySetOption * >( this ), static_cast< XMultiPropertySet * >( this ), static_cast< XFastPropertySet * >( this ) ); } @@ -231,7 +231,7 @@ Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rTyp { Sequence< ::com::sun::star::uno::Type > aTypes( 4 ); aTypes[ 0 ] = XPropertySet::static_type(); - aTypes[ 1 ] = XPropertySet2::static_type(); + aTypes[ 1 ] = XPropertySetOption::static_type(); aTypes[ 2 ] = XMultiPropertySet::static_type(); aTypes[ 3 ] = XFastPropertySet::static_type(); return aTypes; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 23caa369faa8..dba3480e4861 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -169,18 +169,18 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S ScfPropertySet::~ScfPropertySet() { - Reference xPropSet2(mxPropSet, UNO_QUERY); - if (xPropSet2.is()) - xPropSet2->enableChangeListenerNotification(true); + Reference xPropSetOpt(mxPropSet, UNO_QUERY); + if (xPropSetOpt.is()) + xPropSetOpt->enableChangeListenerNotification(true); } void ScfPropertySet::Set( Reference< XPropertySet > xPropSet ) { mxPropSet = xPropSet; mxMultiPropSet.set( mxPropSet, UNO_QUERY ); - Reference xPropSet2(mxPropSet, UNO_QUERY); - if (xPropSet2.is()) - xPropSet2->enableChangeListenerNotification(false); + Reference xPropSetOpt(mxPropSet, UNO_QUERY); + if (xPropSetOpt.is()) + xPropSetOpt->enableChangeListenerNotification(false); } OUString ScfPropertySet::GetServiceName() const 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 similarity index 54% rename from udkapi/com/sun/star/beans/XPropertySet2.idl rename to 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 +#include 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