mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge sfx2::IXmlIdRegistrySupplier with SfxObjectShell

Browse Source 
Change-Id: I7e8bad6b1c944f14b850b91b902b82613c26faeb
Reviewed-on: https://gerrit.libreoffice.org/26899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-07-04 11:55:35 +02:00
committed by Noel Grandin
parent c752aad433
commit 6964c17415
5 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -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