diff options
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 4 | ||||
| -rw-r--r-- | basic/source/inc/namecont.hxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 0038dbc696c1..da309e79b7e7 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> @@ -4297,7 +4297,7 @@ class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent > SbxObjectRef m_xScopeObj; bool m_bProxyIsClassModuleObject; - ::cppu::OInterfaceContainerHelper m_aListeners; + ::comphelper::OInterfaceContainerHelper2 m_aListeners; public: ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index cdc8a652c0c8..0978c1de8cb9 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -79,8 +79,8 @@ class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE css::uno::Type mType; css::uno::XInterface* mpxEventSource; - ::cppu::OInterfaceContainerHelper maContainerListeners; - ::cppu::OInterfaceContainerHelper maChangesListeners; + ::comphelper::OInterfaceContainerHelper2 maContainerListeners; + ::comphelper::OInterfaceContainerHelper2 maChangesListeners; public: NameContainer( const css::uno::Type& rType ) @@ -157,7 +157,7 @@ public: class ModifiableHelper { private: - ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners; ::cppu::OWeakObject& m_rEventSource; bool mbModified; |