diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-06-24 10:29:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-06-24 10:29:48 +0200 |
| commit | ed49818ab0af63f3246e8c27ba87aef4d9fbb829 (patch) | |
| tree | 3cf87cb3c1c8d3d68933164dd371781b6b7c6a4c /compilerplugins | |
| parent | 29bea29ec1a56255455f855e2b29321553cb524c (diff) | |
Clean up OContainerListenerAdapter
* elide OContainerListenerAdapter_BASE
* no need for protected members
Change-Id: I70095dadc4b1f42f04c8ea76b2236bf99a226da9
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 6d50c2197f7a..42bbffd456f0 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 |