diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-09-02 14:57:30 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-09-07 11:17:55 +0200 |
| commit | 5c64fd7ce04ff82edb2989d862bd660c9b9492a5 (patch) | |
| tree | 3b457843f3f2068b91bfa2e8a35e8c1de23a93ba /comphelper | |
| parent | 20a3baeb5da5bbb77eb2bf46d6714ad38dc4f19b (diff) | |
Restore ABI compatibility with LO 3.4 and earlier
Factor out ABI-breaking changes to OPropertySetHelper into a derived
class OPropertySetHelper2.
Only gcc3.map is up-to-date.
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/propstate.hxx | 4 | ||||
| -rw-r--r-- | comphelper/source/property/propstate.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx index 2c8f06f4118a..b99f75f7655c 100644 --- a/comphelper/inc/comphelper/propstate.hxx +++ b/comphelper/inc/comphelper/propstate.hxx @@ -54,11 +54,11 @@ namespace comphelper //= OPropertyStateHelper //================================================================== /// helper class for implementing property states - class COMPHELPER_DLLPUBLIC OPropertyStateHelper :public ::cppu::OPropertySetHelper + class COMPHELPER_DLLPUBLIC OPropertyStateHelper :public ::cppu::OPropertySetHelper2 ,public ::com::sun::star::beans::XPropertyState { public: - OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp):OPropertySetHelper(rBHlp) { } + OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp):OPropertySetHelper2(rBHlp) { } OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp, ::cppu::IEventNotificationHook *i_pFireEvents); diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index ec621cb43833..3859f6a0a95d 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -57,7 +57,7 @@ namespace comphelper //--------------------------------------------------------------------- ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Any aReturn = OPropertySetHelper::queryInterface(_rType); + ::com::sun::star::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); // our own ifaces if ( !aReturn.hasValue() ) aReturn = ::cppu::queryInterface(_rType, static_cast< ::com::sun::star::beans::XPropertyState*>(this)); @@ -82,7 +82,7 @@ namespace comphelper OPropertyStateHelper::OPropertyStateHelper( ::cppu::OBroadcastHelper& rBHlp, ::cppu::IEventNotificationHook *i_pFireEvents) - : ::cppu::OPropertySetHelper(rBHlp, i_pFireEvents) { } + : ::cppu::OPropertySetHelper2(rBHlp, i_pFireEvents) { } OPropertyStateHelper::~OPropertyStateHelper() {} |