diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 13:35:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 12:55:14 +0000 |
| commit | f81316af4f3c69d1f405040f4eddc523ce792add (patch) | |
| tree | 142315d47f77de9d81d1b3a4d9f543cbd34f7317 /compilerplugins/clang/mergeclasses.results | |
| parent | Make hatch UI bitmap resizable (diff) | |
| download | core-f81316af4f3c69d1f405040f4eddc523ce792add.tar.gz core-f81316af4f3c69d1f405040f4eddc523ce792add.zip | |
merge sdr::event::EventHandler with sdr::event::TimerEventHandler
Change-Id: Id81c6b67d95d976dae417cf225bd43347c716d06
Reviewed-on: https://gerrit.libreoffice.org/26905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'compilerplugins/clang/mergeclasses.results')
| -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 5b4c8e1538c9..a033c15273eb 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -323,7 +323,6 @@ merge sdext::presenter::PresenterScrollBar with sdext::presenter::PresenterVerti merge sdext::presenter::PresenterSlidePreview with sdext::presenter::(anonymous namespace)::NextSlidePreview merge sdr::SelectionController with sdr::table::SvxTableController merge sdr::contact::ObjectContactOfPagePainter with sdr::contact::PagePrimitiveExtractor -merge sdr::event::EventHandler with sdr::event::TimerEventHandler merge sdr::table::TableDesignUser with sdr::table::SdrTableObjImpl merge sfx2::IXmlIdRegistry with sfx2::XmlIdRegistry merge sfx::DummyWindowWrapper with sfx::DummyItemConnection |