From ed49818ab0af63f3246e8c27ba87aef4d9fbb829 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 24 Jun 2016 10:29:48 +0200 Subject: Clean up OContainerListenerAdapter * elide OContainerListenerAdapter_BASE * no need for protected members Change-Id: I70095dadc4b1f42f04c8ea76b2236bf99a226da9 --- compilerplugins/clang/mergeclasses.results | 1 - 1 file changed, 1 deletion(-) (limited to 'compilerplugins') 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 -- cgit