diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 11:55:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 12:28:41 +0000 |
| commit | 6964c17415ae2d77a6aa50eeb8464faba7a47d14 (patch) | |
| tree | af6a02bbb54f837e67c3922137dcf5e79920a5d0 /compilerplugins/clang | |
| parent | c752aad43352478ef7065ca7ab844650811e6745 (diff) | |
merge sfx2::IXmlIdRegistrySupplier with SfxObjectShell
Change-Id: I7e8bad6b1c944f14b850b91b902b82613c26faeb
Reviewed-on: https://gerrit.libreoffice.org/26899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'compilerplugins/clang')
| -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 1785f4cecf3f..5b4c8e1538c9 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -326,7 +326,6 @@ merge sdr::contact::ObjectContactOfPagePainter with sdr::contact::PagePrimitiveE merge sdr::event::EventHandler with sdr::event::TimerEventHandler merge sdr::table::TableDesignUser with sdr::table::SdrTableObjImpl merge sfx2::IXmlIdRegistry with sfx2::XmlIdRegistry -merge sfx2::IXmlIdRegistrySupplier with SfxObjectShell merge sfx::DummyWindowWrapper with sfx::DummyItemConnection merge sfx::MultiControlWrapperHelper with sfx::MultiControlWrapper merge slideshow::internal::(anonymous namespace)::EventContainer with slideshow::internal::ClickEventHandler |