diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-08-07 12:45:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-08-08 14:57:56 +0200 |
| commit | f0f1d1fb2f3b059e2a0979c61613b661b938a152 (patch) | |
| tree | bd25d4db203b38b743fc80293c43cb87d0b4f7bf /compilerplugins | |
| parent | 2f2246d22e2a8ccbc1dc3e6f5243734a61edf270 (diff) | |
merge dbaui::OMarkableTreeListBox with dbaui::OTableTreeListBox
Change-Id: I5cde5c453493e5287faa770eede2e42b21075477
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100330
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@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 a01e70500c14..594a37cb76df 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -261,7 +261,6 @@ merge dbahsql::CreateStmtParser with dbahsql::FbCreateStmtParser merge dbaui::IController with dbaui::OGenericUnoController merge dbaui::IEntryFilter with dbaui::(anonymous namespace)::FilterByEntryDataId merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper -merge dbaui::OMarkableTreeListBox with dbaui::OTableTreeListBox merge dbaui::OSQLNameEntry with dbaui::OPropColumnEditCtrl merge dbaui::OSplitterView with dbaui::OApplicationDetailView merge dbaui::OTableRowView with dbaui::OTableEditorCtrl |