diff options
Diffstat (limited to 'scripting/source/basprov/basscript.hxx')
| -rw-r--r-- | scripting/source/basprov/basscript.hxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index e7a94d706ee7..2adcd9c8b311 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -19,13 +19,12 @@ #pragma once -#include <bcholder.hxx> #include <com/sun/star/script/provider/XScript.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> -#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> +#include <comphelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> -#include <comphelper/propertycontainer.hxx> +#include <comphelper/propertycontainer2.hxx> #include <basic/sbmeth.hxx> #include <svl/lstner.hxx> @@ -38,14 +37,12 @@ namespace basprov - typedef ::cppu::WeakImplHelper< + typedef ::comphelper::WeakImplHelper< css::script::provider::XScript > BasicScriptImpl_BASE; class BasicScriptImpl : public BasicScriptImpl_BASE, public SfxListener, - public cppu::BaseMutex, - public ::scripting_helper::OBroadcastHelperHolder, - public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyContainer2, public ::comphelper::OPropertyArrayUsageHelper< BasicScriptImpl > { private: @@ -60,7 +57,7 @@ namespace basprov css::uno::Sequence< css::uno::Any > m_caller; protected: // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper( ) override; + virtual ::cppu::IPropertyArrayHelper& getInfoHelper( ) override; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; |