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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/form/fmscriptingenv.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
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" ) { |