mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up OContainerListenerAdapter

Browse Source 
* elide OContainerListenerAdapter_BASE
* no need for protected members

Change-Id: I70095dadc4b1f42f04c8ea76b2236bf99a226da9
This commit is contained in:
Stephan Bergmann
2016-06-24 10:29:48 +02:00
parent 29bea29ec1
commit ed49818ab0
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -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

9
include/comphelper/containermultiplexer.hxx
View File

@@ -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;