compilerplugins/clang/mergeclasses.results | 1 - include/comphelper/containermultiplexer.hxx | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-)
New commits: commit ed49818ab0af63f3246e8c27ba87aef4d9fbb829 Author: Stephan Bergmann <[email protected]> Date: Fri Jun 24 10:29:48 2016 +0200 Clean up OContainerListenerAdapter * elide OContainerListenerAdapter_BASE * no need for protected members Change-Id: I70095dadc4b1f42f04c8ea76b2236bf99a226da9 diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 6d50c21..42bbffd 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -216,7 +216,6 @@ merge comphelper::NameContainerImpl with comphelper::NameContainer merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper -merge comphelper::OContainerListenerAdapter_BASE with comphelper::OContainerListenerAdapter merge comphelper::OProxyAggregation with comphelper::OComponentProxyAggregationHelper merge comphelper::OSeekableInputWrapper_BASE with comphelper::OSeekableInputWrapper merge comphelper::PropertySetInfo_BASE with comphelper::PropertySetInfo diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx index cfc76a3..fda66f0 100644 --- a/include/comphelper/containermultiplexer.hxx +++ b/include/comphelper/containermultiplexer.hxx @@ -67,17 +67,12 @@ namespace comphelper void setAdapter(OContainerListenerAdapter* _pAdapter); }; - - //= OContainerListenerAdapter - class SAL_DLLPUBLIC_TEMPLATE OContainerListenerAdapter_BASE - : public cppu::WeakImplHelper<css::container::XContainerListener> {}; - class COMPHELPER_DLLPUBLIC OContainerListenerAdapter - : public OContainerListenerAdapter_BASE + : public cppu::WeakImplHelper<css::container::XContainerListener> { friend class OContainerListener; - protected: + private: css::uno::Reference< css::container::XContainer > m_xContainer; OContainerListener* m_pListener; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
