diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 11:10:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 10:55:08 +0000 |
| commit | 20b9cbd0e586fe89f8e1bdd942135445a256af7b (patch) | |
| tree | 061d5276c6363be1d6b9db734e00676eec71f513 /compilerplugins | |
| parent | 64acc9d576be9166c2da6edc6f8478e2cf31f606 (diff) | |
merge toolkit::NameContainer_Impl with toolkit::ScriptEventContainer
Change-Id: I14e9401056e31ee9d4ad5945a73ca31969430b4c
Reviewed-on: https://gerrit.libreoffice.org/26891
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.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 42bbffd456f0..9464dd547363 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -388,7 +388,6 @@ merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark merge sw::sidebarwindows::SwSidebarWin with sw::annotation::SwAnnotationWin merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor merge tdoc_ucp::OfficeDocumentsEventListener with tdoc_ucp::ContentProvider -merge toolkit::NameContainer_Impl with toolkit::ScriptEventContainer merge toolkit::ScrollableInterface with toolkit::ScrollableWrapper merge unographic::GraphicTransformer with unographic::Graphic merge vcl::DeletionNotifier with SalFrame |