[Libreoffice-commits] core.git: compilerplugins/clang svx/source

[Noel Grandin]

 compilerplugins/clang/mergeclasses.results |    1 -
 svx/source/form/fmscriptingenv.cxx         |   19 +++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 0b55d7e0fe9ec14cf889201ef3d9fc71f1cf7df4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Dec 23 10:59:56 2016 +0200

    merge IScript with NewStyleUNOScript
    
    Change-Id: Iae70d0780678eb8df8a9e57fce5fc2f6c5ed427e
    Reviewed-on: https://gerrit.libreoffice.org/32375
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index ab9a01e..fc51994 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 f80ca7a..e6a8417 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" )
         {