basic/source/inc/namecont.hxx | 5
+++--
basic/source/uno/namecont.cxx | 8
++++----
chart2/source/controller/chartapiwrapper/AreaWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/GridWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/LegendWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/TitleWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx | 4 ++--
12 files changed, 27 insertions(+), 26 deletions(-)
New commits:
commit 2958109df0d2901b59748c3028e5df7a2c5b2481
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Nov 22 21:01:01 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 27 06:48:25 2021 +0100
use more OInterfaceContainerHelper3 in chart2
Change-Id: Icff667a11f1798e29c732c13b5739a4f7b581999
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125921
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index 4934ac5f1964..3de57f421313 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -20,7 +20,7 @@
#include <WrappedPropertySet.hxx>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -72,7 +72,7 @@ protected:
private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
};
} // namespace chart::wrapper
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 7b55173f5d3d..b421ab331ab6 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -21,7 +21,7 @@
#include <WrappedPropertySet.hxx>
#include "ReferenceSizePropertyProvider.hxx"
#include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/chart/XAxis.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -109,7 +109,7 @@ private: //methods
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
tAxisType m_eType;
diff --git
a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 5bf582586d9c..f5fbab3f332b 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -21,7 +21,7 @@
#include <WrappedPropertySet.hxx>
#include "ReferenceSizePropertyProvider.hxx"
#include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -104,7 +104,7 @@ private:
css::uno::Reference< css::beans::XPropertySet > getDataPointProperties();
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
eType m_eType;
sal_Int32 m_nSeriesIndexInNewAPI;
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index d8e35d3bfe17..bef53a739386 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -20,7 +20,7 @@
#include <WrappedPropertySet.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/chart/XDiagramPositioning.hpp>
#include <com/sun/star/chart2/XDiagramProvider.hpp>
#include <com/sun/star/chart/XDiagram.hpp>
@@ -186,7 +186,7 @@ protected:
private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2
m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
css::uno::Reference<
css::chart::XAxis > m_xXAxis;
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index f9e918301a53..0a16368e9ccf 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -20,7 +20,7 @@
#include <WrappedPropertySet.hxx>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -71,7 +71,7 @@ protected:
private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
tGridType m_eType;
};
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 5da2b1b1fb4a..128c5fbcf970 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -21,7 +21,7 @@
#include <WrappedPropertySet.hxx>
#include "ReferenceSizePropertyProvider.hxx"
#include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -79,7 +79,7 @@ protected:
private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
};
} // namespace chart::wrapper
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 1ef4367c8f7d..eeaaf71dad88 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -20,7 +20,7 @@
#include <MutexContainer.hxx>
#include <WrappedIgnoreProperty.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -94,7 +94,7 @@ public:
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
WrappedIgnoreProperty m_aWrappedLineJointProperty;
};
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 71a0878d9e3a..5cc3ed477d01 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -22,7 +22,7 @@
#include "ReferenceSizePropertyProvider.hxx"
#include <TitleHelper.hxx>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -100,7 +100,7 @@ private:
css::uno::Reference< css::chart2::XTitle > getTitleObject();
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2
m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
::chart::TitleHelper::eTitleType m_eTitleType;
};
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 1211ff735d9b..b62c70bbc150 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -19,7 +19,7 @@
#pragma once
#include <MutexContainer.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -95,7 +95,7 @@ public:
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
OUString m_aPropertySetName;
};
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index b538d55f1d9d..3df4a9f1af0b 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -20,7 +20,7 @@
#include <WrappedPropertySet.hxx>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -59,7 +59,7 @@ protected:
private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
- ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
+ ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>
m_aEventListenerContainer;
bool m_bWall;
};
commit 11599f6f00bbcad78ad7c3f563606616e8506ea8
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Nov 22 18:50:58 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 27 06:48:07 2021 +0100
use more OInterfaceContainerHelper3 in NameContainer
Change-Id: I75cb302156ea93fe0b545b22ca85a0c537cce760
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125919
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 096f614a84d2..9a8bfa12f257 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -51,6 +51,7 @@
#include <rtl/ref.hxx>
#include <comphelper/listenernotification.hxx>
#include <xmlscript/xmllib_imexp.hxx>
+#include <comphelper/interfacecontainer3.hxx>
class BasicManager;
@@ -74,8 +75,8 @@ class NameContainer final : public ::cppu::BaseMutex, public
NameContainer_BASE
css::uno::Type mType;
css::uno::XInterface* mpxEventSource;
- ::comphelper::OInterfaceContainerHelper2 maContainerListeners;
- ::comphelper::OInterfaceContainerHelper2 maChangesListeners;
+
::comphelper::OInterfaceContainerHelper3<css::container::XContainerListener>
maContainerListeners;
+ ::comphelper::OInterfaceContainerHelper3<css::util::XChangesListener>
maChangesListeners;
public:
NameContainer( const css::uno::Type& rType )
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index a2cb37611f08..87b33ea9be66 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -287,7 +287,7 @@ void SAL_CALL NameContainer::addContainerListener( const
Reference< XContainerLi
{
throw RuntimeException("addContainerListener called with null
xListener",static_cast< cppu::OWeakObject * >(this));
}
- maContainerListeners.addInterface( Reference<XInterface>(xListener,
UNO_QUERY) );
+ maContainerListeners.addInterface( xListener );
}
void SAL_CALL NameContainer::removeContainerListener( const Reference<
XContainerListener >& xListener )
@@ -296,7 +296,7 @@ void SAL_CALL NameContainer::removeContainerListener( const
Reference< XContaine
{
throw RuntimeException("removeContainerListener called with null
xListener",static_cast< cppu::OWeakObject * >(this));
}
- maContainerListeners.removeInterface( Reference<XInterface>(xListener,
UNO_QUERY) );
+ maContainerListeners.removeInterface( xListener );
}
// Methods XChangesNotifier
@@ -306,7 +306,7 @@ void SAL_CALL NameContainer::addChangesListener( const
Reference< XChangesListen
{
throw RuntimeException("addChangesListener called with null
xListener",static_cast< cppu::OWeakObject * >(this));
}
- maChangesListeners.addInterface( Reference<XInterface>(xListener,
UNO_QUERY) );
+ maChangesListeners.addInterface( xListener );
}
void SAL_CALL NameContainer::removeChangesListener( const Reference<
XChangesListener >& xListener )
@@ -315,7 +315,7 @@ void SAL_CALL NameContainer::removeChangesListener( const
Reference< XChangesLis
{
throw RuntimeException("removeChangesListener called with null
xListener",static_cast< cppu::OWeakObject * >(this));
}
- maChangesListeners.removeInterface( Reference<XInterface>(xListener,
UNO_QUERY) );
+ maChangesListeners.removeInterface( xListener );
}
