diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 10:59:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 12:21:29 +0000 |
| commit | 0b55d7e0fe9ec14cf889201ef3d9fc71f1cf7df4 (patch) | |
| tree | 7d0072063a9cf05bb9f951cbf6f24a66b8a4f74f /compilerplugins | |
| parent | cfcbbfaeb4cfee5ffeb968dc21d1c266a870d89f (diff) | |
merge IScript with NewStyleUNOScript
Change-Id: Iae70d0780678eb8df8a9e57fce5fc2f6c5ed427e
Reviewed-on: https://gerrit.libreoffice.org/32375
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-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 ab9a01e3b112..fc519945196f 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -345,7 +345,6 @@ merge svx::IFocusObserver with svx::FmTextControlShell merge svx::IPropertyValueProvider with svx::PropertyValueProvider merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel -merge svxform::(anonymous namespace)::IScript with svxform::(anonymous namespace)::NewStyleUNOScript merge svxform::DispatchInterceptor with svxform::FormController merge svxform::IFormScriptingEnvironment with svxform::FormScriptingEnvironment merge sw::ICoreFrameStyle with SwXFrameStyle |