From ec98e7769048d44c6d274e3edcac19d5cbc74348 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 6 Jan 2023 18:43:28 +0100 Subject: Merge comphelper::OAccessibleContextHelper into comphelper::OCommonAccessibleComponent Change-Id: I586ae8fe2842fd879ae2ae506c659d06dda16843 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145160 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- compilerplugins/clang/mergeclasses.results | 1 - 1 file changed, 1 deletion(-) (limited to 'compilerplugins/clang') diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 793b6f10bef8..1682b3ea21bf 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -259,7 +259,6 @@ merge comphelper::ConfigurationListenerPropertyBase with comphelper::Configurati merge comphelper::ConfigurationListener_Base with comphelper::ConfigurationListener merge comphelper::MasterPropertySetInfo_Base with comphelper::MasterPropertySetInfo merge comphelper::OAccessibleComponentHelper_Base with comphelper::OAccessibleComponentHelper -merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent merge comphelper::OAccessibleWrapper_Base with comphelper::OAccessibleWrapper merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper -- cgit