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

merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl

Browse Source 
Change-Id: I7cf6bb4cf3aa532718753904c2100882b0df6775
Reviewed-on: https://gerrit.libreoffice.org/32373
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2016-12-23 10:44:33 +02:00
parent b641929e69
commit c4c23515d6
3 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -344,7 +344,6 @@ merge svx::IControllerFeatureInvalidation with FmXFormShell
merge svx::IFocusObserver with svx::FmTextControlShell
merge svx::IPropertyValueProvider with svx::PropertyValueProvider
merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl
merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
merge svxform::(anonymous namespace)::IScript with svxform::(anonymous namespace)::NewStyleUNOScript
merge svxform::DispatchInterceptor with svxform::FormController