diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-06 18:43:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-06 19:02:05 +0000 |
| commit | ec98e7769048d44c6d274e3edcac19d5cbc74348 (patch) | |
| tree | 1f059916db08d101c8e24ea76d4fd21582a246ca /compilerplugins | |
| parent | a2e0d46ec556382140069fe473d6e0018e1d2881 (diff) | |
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 <sbergman@redhat.com>
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 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 |