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 /cppuhelper/source | |
| parent | Make XPropertSet2 not a child interface of XPropertySet. (diff) | |
| download | core-60d60caf99a40ca0c3891bf230c5a1fdbae5f49c.tar.gz core-60d60caf99a40ca0c3891bf230c5a1fdbae5f49c.zip | |
Renamed XPropertySet2 to XPropertySetOption.
To avoid making it appear to be a derived interface of XPropertySet
when it's not.
Diffstat (limited to 'cppuhelper/source')
| -rwxr-xr-x | cppuhelper/source/makefile.mk | 2 | ||||
| -rw-r--r-- | cppuhelper/source/msvc_win32_intel.map | 2 | ||||
| -rw-r--r-- | cppuhelper/source/propshlp.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
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; |