diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 10:44:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 11:43:10 +0000 |
| commit | c4c23515d6f94f5d06215a9b0f9ca605655e3497 (patch) | |
| tree | 6e2be0f7740358cfcbc60d93f446f99a74b7dadb /compilerplugins | |
| parent | b641929e69aa5917536fad72644d0da4d67f8adc (diff) | |
merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl
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>
Diffstat (limited to 'compilerplugins')
| -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 8a7db693dad3..ab9a01e3b112 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -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 |