From 6964c17415ae2d77a6aa50eeb8464faba7a47d14 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Jul 2016 11:55:35 +0200 Subject: merge sfx2::IXmlIdRegistrySupplier with SfxObjectShell Change-Id: I7e8bad6b1c944f14b850b91b902b82613c26faeb Reviewed-on: https://gerrit.libreoffice.org/26899 Tested-by: Jenkins Reviewed-by: Noel Grandin --- compilerplugins/clang/mergeclasses.results | 1 - 1 file changed, 1 deletion(-) (limited to 'compilerplugins') 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 -- cgit