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 diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index f80ca7a612aa..e6a8417b5fb7 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -950,19 +950,7 @@ namespace svxform namespace { - - //. NewStyleUNOScript - - class SAL_NO_VTABLE IScript - { - public: - virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ) = 0; - - virtual ~IScript() { } - }; - typedef std::shared_ptr< IScript > PScript; - - class NewStyleUNOScript : public IScript + class NewStyleUNOScript { SfxObjectShell& m_rObjectShell; const OUString m_sScriptCode; @@ -974,8 +962,7 @@ namespace svxform { } - // IScript - virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ) override; + void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ); }; @@ -1019,7 +1006,7 @@ namespace svxform return; // the script to execute - PScript pScript; + std::shared_ptr< NewStyleUNOScript > pScript; if ( _rEvent.ScriptType != "StarBasic" ) {