comphelper/source/property/propshlp.cxx | 13 ------------- include/comphelper/propshlp.hxx | 19 ------------------- 2 files changed, 32 deletions(-)
New commits: commit 0b32750a8dcc8cec2922e93ce34151006d3517b0 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Sun Apr 2 18:38:17 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sun Apr 2 21:13:59 2023 +0200 remove IEventNotificationHook from comphelper::OPropertySet this class is a copy of cppuhelper::OPropertySet, and this feature is unused in that class too, so we are not likely to need it Change-Id: I9e3f0f7d786052f87f5a18c67e9b78409752fd99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149942 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/comphelper/source/property/propshlp.cxx b/comphelper/source/property/propshlp.cxx index af6e3f398734..97b89f1aaf1d 100644 --- a/comphelper/source/property/propshlp.cxx +++ b/comphelper/source/property/propshlp.cxx @@ -109,13 +109,6 @@ OPropertySetHelper::OPropertySetHelper(bool bIgnoreRuntimeExceptionsWhileFiring) { } -OPropertySetHelper::OPropertySetHelper(cppu::IEventNotificationHook* i_pFireEvents, - bool bIgnoreRuntimeExceptionsWhileFiring) - : m_pFireEvents(i_pFireEvents) - , m_bIgnoreRuntimeExceptionsWhileFiring(bIgnoreRuntimeExceptionsWhileFiring) -{ -} - /** * You must call disposing before. */ @@ -525,12 +518,6 @@ void OPropertySetHelper::fire(std::unique_lock<std::mutex>& rGuard, sal_Int32* p if (!m_bFireEvents) return; - if (m_pFireEvents) - { - m_pFireEvents->fireEvents(pnHandles, nHandles, bVetoable, - m_bIgnoreRuntimeExceptionsWhileFiring); - } - // Only fire, if one or more properties changed if (!nHandles) return; diff --git a/include/comphelper/propshlp.hxx b/include/comphelper/propshlp.hxx index bca25d84d9d6..524ff2f10c91 100644 --- a/include/comphelper/propshlp.hxx +++ b/include/comphelper/propshlp.hxx @@ -66,24 +66,6 @@ public: */ OPropertySetHelper(bool bIgnoreRuntimeExceptionsWhileFiring); - /** Constructor. - - @param i_pFireEvents - additional event notifier - - @param bIgnoreRuntimeExceptionsWhileFiring - indicates whether occurring RuntimeExceptions will be - ignored when firing notifications - (vetoableChange(), propertyChange()) - to listeners. - PropertyVetoExceptions may still be thrown. - This flag is useful in an inter-process scenario when - remote bridges may break down - (firing DisposedExceptions). - */ - OPropertySetHelper(cppu::IEventNotificationHook* i_pFireEvents, - bool bIgnoreRuntimeExceptionsWhileFiring = false); - /** Only returns a reference to XMultiPropertySet, XFastPropertySet, XPropertySet and XEventListener. @@ -316,7 +298,6 @@ private: */ comphelper::OInterfaceContainerHelper4<css::beans::XVetoableChangeListener> maVetoableChangeListeners; - cppu::IEventNotificationHook* const m_pFireEvents = nullptr; std::vector<sal_Int32> m_handles; std::vector<css::uno::Any> m_newValues; std::vector<css::uno::Any> m_oldValues;