summaryrefslogtreecommitdiff
path: root/embeddedobj/source/msole
diff options
context:
space:
mode:
Diffstat (limited to 'embeddedobj/source/msole')
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx18
-rw-r--r--embeddedobj/source/msole/olecomponent.hxx6
-rw-r--r--embeddedobj/source/msole/oleembed.cxx14
-rw-r--r--embeddedobj/source/msole/olemisc.cxx24
4 files changed, 31 insertions, 31 deletions
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index b0c4fc62c1ac..3834d4098170 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/awt/XRequestCallback.hpp>
#include "platform.h"
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
#include <comphelper/mimeconfighelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/windowserrorstring.hxx>
@@ -1460,11 +1460,11 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
if (m_pInterfaceContainer)
{
- ::cppu::OInterfaceContainerHelper* pContainer
+ comphelper::OInterfaceContainerHelper2* pContainer
= m_pInterfaceContainer->getContainer(cppu::UnoType<util::XCloseListener>::get());
if (pContainer != nullptr)
{
- ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+ comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
while (pIterator.hasMoreElements())
{
try
@@ -1483,7 +1483,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
= m_pInterfaceContainer->getContainer(cppu::UnoType<util::XCloseListener>::get());
if (pContainer != nullptr)
{
- ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
+ comphelper::OInterfaceIteratorHelper2 pCloseIterator(*pContainer);
while (pCloseIterator.hasMoreElements())
{
try
@@ -1511,7 +1511,7 @@ void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XClose
throw lang::DisposedException(); // TODO
if ( !m_pInterfaceContainer )
- m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+ m_pInterfaceContainer = new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex );
m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
}
@@ -1682,7 +1682,7 @@ void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEvent
throw lang::DisposedException(); // TODO
if ( !m_pInterfaceContainer )
- m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+ m_pInterfaceContainer = new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex );
m_pInterfaceContainer->addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
}
@@ -1743,11 +1743,11 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified )
if ( bModified && m_pInterfaceContainer )
{
- ::cppu::OInterfaceContainerHelper* pContainer =
+ comphelper::OInterfaceContainerHelper2* pContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XModifyListener>::get());
if ( pContainer != nullptr )
{
- ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
+ comphelper::OInterfaceIteratorHelper2 pIterator( *pContainer );
while ( pIterator.hasMoreElements() )
{
try
@@ -1771,7 +1771,7 @@ void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::
throw lang::DisposedException(); // TODO
if ( !m_pInterfaceContainer )
- m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+ m_pInterfaceContainer = new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex );
m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
}
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 08f1cbed696f..5a96b64fcbfc 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -34,8 +34,8 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <rtl/ref.hxx>
-namespace cppu {
- class OMultiTypeInterfaceContainerHelper;
+namespace comphelper {
+ class OMultiTypeInterfaceContainerHelper2;
}
class OleWrapperClientSite;
@@ -48,7 +48,7 @@ class OleComponent : public ::cppu::WeakImplHelper< css::util::XCloseable, css::
css::datatransfer::XTransferable >
{
::osl::Mutex m_aMutex;
- ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
+ comphelper::OMultiTypeInterfaceContainerHelper2* m_pInterfaceContainer;
bool m_bDisposed;
bool m_bModified;
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 8c23a4429895..ba678d4dfb87 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
#include <comphelper/mimeconfighelper.hxx>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
@@ -125,13 +125,13 @@ void OleEmbeddedObject::MoveListeners()
// move state change listeners
{
- ::cppu::OInterfaceContainerHelper* pStateChangeContainer =
+ comphelper::OInterfaceContainerHelper2* pStateChangeContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<embed::XStateChangeListener>::get());
if ( pStateChangeContainer != nullptr )
{
if ( m_xWrappedObject.is() )
{
- ::cppu::OInterfaceIteratorHelper pIterator( *pStateChangeContainer );
+ comphelper::OInterfaceIteratorHelper2 pIterator( *pStateChangeContainer );
while ( pIterator.hasMoreElements() )
{
try
@@ -149,13 +149,13 @@ void OleEmbeddedObject::MoveListeners()
// move event listeners
{
- ::cppu::OInterfaceContainerHelper* pEventContainer =
+ comphelper::OInterfaceContainerHelper2* pEventContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get());
if ( pEventContainer != nullptr )
{
if ( m_xWrappedObject.is() )
{
- ::cppu::OInterfaceIteratorHelper pIterator( *pEventContainer );
+ comphelper::OInterfaceIteratorHelper2 pIterator( *pEventContainer );
while ( pIterator.hasMoreElements() )
{
try
@@ -173,13 +173,13 @@ void OleEmbeddedObject::MoveListeners()
// move close listeners
{
- ::cppu::OInterfaceContainerHelper* pCloseContainer =
+ comphelper::OInterfaceContainerHelper2* pCloseContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
if ( pCloseContainer != nullptr )
{
if ( m_xWrappedObject.is() )
{
- ::cppu::OInterfaceIteratorHelper pIterator( *pCloseContainer );
+ comphelper::OInterfaceIteratorHelper2 pIterator( *pCloseContainer );
while ( pIterator.hasMoreElements() )
{
try
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index f85c845e31a8..a4045f34b4f2 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -28,7 +28,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <oleembobj.hxx>
@@ -156,14 +156,14 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve
if ( !m_pInterfaceContainer )
return;
- ::cppu::OInterfaceContainerHelper* pContainer =
- m_pInterfaceContainer->getContainer(
+ comphelper::OInterfaceContainerHelper2* pContainer =
+ m_pInterfaceContainer->getContainer(
cppu::UnoType<document::XEventListener>::get());
if ( pContainer == nullptr )
return;
document::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ), aEventName );
- ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+ comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
while (pIterator.hasMoreElements())
{
try
@@ -181,12 +181,12 @@ void OleEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sal_In
{
if ( m_pInterfaceContainer )
{
- ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
+ comphelper::OInterfaceContainerHelper2* pContainer = m_pInterfaceContainer->getContainer(
cppu::UnoType<embed::XStateChangeListener>::get());
if ( pContainer != nullptr )
{
lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
- ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+ comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
while (pIterator.hasMoreElements())
{
@@ -399,7 +399,7 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e
throw lang::DisposedException(); // TODO
if ( !m_pInterfaceContainer )
- m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+ m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
xListener );
@@ -446,11 +446,11 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
if ( m_pInterfaceContainer )
{
- ::cppu::OInterfaceContainerHelper* pContainer =
+ comphelper::OInterfaceContainerHelper2* pContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != nullptr )
{
- ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+ comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
while (pIterator.hasMoreElements())
{
try
@@ -468,7 +468,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != nullptr )
{
- ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
+ comphelper::OInterfaceIteratorHelper2 pCloseIterator(*pContainer);
while (pCloseIterator.hasMoreElements())
{
try
@@ -504,7 +504,7 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X
throw lang::DisposedException(); // TODO
if ( !m_pInterfaceContainer )
- m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+ m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
}
@@ -549,7 +549,7 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen
throw lang::DisposedException(); // TODO
if ( !m_pInterfaceContainer )
- m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+ m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
}
generated by cgit (git 2.34.1) at 2024-07-09 17:12:05 +0000