diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 14:12:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-11 10:20:58 +0200 |
| commit | bf6449230ad2b4dfb427a062663e5ff2b9ddf3b6 (patch) | |
| tree | 75c9947c10b4685cb9caaaaf1b59ca3f679bcd4e /compilerplugins | |
| parent | 9fa75f677a7b48a2177fe11cca0d00f5a2deb7da (diff) | |
loplugin:mergeclasses merge SwAnnotationWin and SwSidebarWin
Change-Id: Idaf7d7e8e4da37e0ba423dca3e22dc6711ba806a
Reviewed-on: https://gerrit.libreoffice.org/36380
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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 126c7d3cd7d8..7031a522f436 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -353,7 +353,6 @@ merge sw::WriterListener with SwClient merge sw::mark::ContentIdxStore with (anonymous namespace)::ContentIdxStoreImpl merge sw::mark::IBookmark with sw::mark::Bookmark merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark -merge sw::sidebarwindows::SwSidebarWin with sw::annotation::SwAnnotationWin merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor merge unographic::GraphicTransformer with unographic::Graphic merge vcl::DeletionNotifier with SalFrame |