mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge IScript with NewStyleUNOScript

Browse Source 
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>
This commit is contained in:
Noel Grandin
2016-12-23 10:59:56 +02:00
parent cfcbbfaeb4
commit 0b55d7e0fe
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -345,7 +345,6 @@ merge svx::IFocusObserver with svx::FmTextControlShell
merge svx::IPropertyValueProvider with svx::PropertyValueProvider merge svx::IPropertyValueProvider with svx::PropertyValueProvider
merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel 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::DispatchInterceptor with svxform::FormController
merge svxform::IFormScriptingEnvironment with svxform::FormScriptingEnvironment merge svxform::IFormScriptingEnvironment with svxform::FormScriptingEnvironment
merge sw::ICoreFrameStyle with SwXFrameStyle merge sw::ICoreFrameStyle with SwXFrameStyle

19
svx/source/form/fmscriptingenv.cxx
View File

@@ -950,19 +950,7 @@ namespace svxform
namespace namespace
{ {
class NewStyleUNOScript
//. 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
{ {
SfxObjectShell& m_rObjectShell; SfxObjectShell& m_rObjectShell;
const OUString m_sScriptCode; const OUString m_sScriptCode;
@@ -974,8 +962,7 @@ namespace svxform
{ {
} }
// IScript void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult );
virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ) override;
}; };
@@ -1019,7 +1006,7 @@ namespace svxform
return; return;
// the script to execute // the script to execute
PScript pScript; std::shared_ptr< NewStyleUNOScript > pScript;
if ( _rEvent.ScriptType != "StarBasic" ) if ( _rEvent.ScriptType != "StarBasic" )
{ {