diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 13:04:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-05 08:24:39 +0000 |
| commit | b9854c60c6d481662cc1ac56d038d2c5c7124260 (patch) | |
| tree | 37c1f0022783cf2abf19a505c98f31394de25bd4 /compilerplugins | |
| parent | add9a35ba687f8c55a6ebba3a56e50c779321984 (diff) | |
merge tdoc_ucp::OfficeDocumentsEventListener with
tdoc_ucp::ContentProvider
Change-Id: I4c743ce3d61d048ae9cf762462d9042337cd9d47
Reviewed-on: https://gerrit.libreoffice.org/26903
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 8c938a6afbe2..f4d84d9c64bb 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -382,7 +382,6 @@ 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 tdoc_ucp::OfficeDocumentsEventListener with tdoc_ucp::ContentProvider merge toolkit::ScrollableInterface with toolkit::ScrollableWrapper merge unographic::GraphicTransformer with unographic::Graphic merge vcl::DeletionNotifier with SalFrame |