summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/app/AppController.cxx4
-rw-r--r--dbaccess/source/ui/app/AppController.hxx5
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx6
-rw-r--r--dbaccess/source/ui/browser/exsrcbrw.cxx2
-rw-r--r--dbaccess/source/ui/browser/formadapter.cxx10
-rw-r--r--dbaccess/source/ui/browser/sbamultiplex.cxx4
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx6
-rw-r--r--dbaccess/source/ui/inc/callbacks.hxx4
-rw-r--r--dbaccess/source/ui/inc/exsrcbrw.hxx2
-rw-r--r--dbaccess/source/ui/inc/formadapter.hxx4
-rw-r--r--dbaccess/source/ui/inc/sbamultiplex.hxx11
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx6
-rw-r--r--dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx3
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx5
15 files changed, 39 insertions, 35 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 5d1d893e3775..3a391f509762 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -187,7 +187,7 @@ Reference< XInterface > SAL_CALL OApplicationController::Create(const Reference<
class SelectionNotifier : public ::boost::noncopyable
{
private:
- ::cppu::OInterfaceContainerHelper m_aSelectionListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aSelectionListeners;
::cppu::OWeakObject& m_rContext;
sal_Int32 m_nSelectionNestingLevel;
@@ -2340,7 +2340,7 @@ IController& OApplicationController::getCommandController()
return *this;
}
-::cppu::OInterfaceContainerHelper* OApplicationController::getContextMenuInterceptors()
+::comphelper::OInterfaceContainerHelper2* OApplicationController::getContextMenuInterceptors()
{
return &m_aContextMenuInterceptors;
}
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 7da651439903..e73f1eab3f7c 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -38,6 +38,7 @@
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase5.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <sot/storage.hxx>
#include <svtools/transfer.hxx>
#include <svx/dataaccessdescriptor.hxx>
@@ -99,7 +100,7 @@ namespace dbaui
m_xDataSource;
css::uno::Reference< css::frame::XModel >
m_xModel;
- ::cppu::OInterfaceContainerHelper
+ ::comphelper::OInterfaceContainerHelper2
m_aContextMenuInterceptors;
TContainerVector m_aCurrentContainers; // the containers where we are listener on
@@ -536,7 +537,7 @@ namespace dbaui
// IContextMenuProvider
virtual PopupMenu* getContextMenu( Control& _rControl ) const override;
virtual IController& getCommandController() override;
- virtual ::cppu::OInterfaceContainerHelper*
+ virtual ::comphelper::OInterfaceContainerHelper2*
getContextMenuInterceptors() override;
virtual css::uno::Any
getCurrentSelection( Control& _rControl ) const override;
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 36425d0f9c7f..f47a075fa737 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -154,7 +154,7 @@ class SbaXDataBrowserController::FormControllerImpl
css::frame::XFrameActionListener >
{
friend class SbaXDataBrowserController;
- ::cppu::OInterfaceContainerHelper m_aActivateListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aActivateListeners;
SbaXDataBrowserController* m_pOwner;
public:
@@ -935,7 +935,7 @@ void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) th
{
// notify our activate listeners (registered on the form controller aggregate)
EventObject aEvt(*this);
- ::cppu::OInterfaceIteratorHelper aIter(m_pFormControllerImpl->m_aActivateListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIter(m_pFormControllerImpl->m_aActivateListeners);
while (aIter.hasMoreElements())
static_cast<XFormControllerListener*>(aIter.next())->formActivated(aEvt);
}
@@ -961,7 +961,7 @@ void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( R
// notify the listeners that the "form" we represent has been deactivated
EventObject aEvt(*this);
- ::cppu::OInterfaceIteratorHelper aIter(m_pFormControllerImpl->m_aActivateListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIter(m_pFormControllerImpl->m_aActivateListeners);
while (aIter.hasMoreElements())
static_cast<XFormControllerListener*>(aIter.next())->formDeactivated(aEvt);
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index c3d2195a2262..e840504dcf34 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -123,7 +123,7 @@ void SbaExternalSourceBrowser::modified(const css::lang::EventObject& aEvent) th
// multiplex this event to all my listeners
css::lang::EventObject aEvt(*this);
- ::cppu::OInterfaceIteratorHelper aIt(m_aModifyListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIt(m_aModifyListeners);
while (aIt.hasMoreElements())
static_cast< css::util::XModifyListener*>(aIt.next())->modified(aEvt);
}
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index a25eefce39d5..49a6a3030f1d 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -168,7 +168,7 @@ void SbaXFormAdapter::AttachForm(const Reference< css::sdbc::XRowSet >& xNewMast
if (xLoadable->isLoaded())
{
css::lang::EventObject aEvt(*this);
- ::cppu::OInterfaceIteratorHelper aIt(m_aLoadListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIt(m_aLoadListeners);
while (aIt.hasMoreElements())
static_cast< css::form::XLoadListener*>(aIt.next())->unloaded(aEvt);
}
@@ -185,7 +185,7 @@ void SbaXFormAdapter::AttachForm(const Reference< css::sdbc::XRowSet >& xNewMast
if (xLoadable->isLoaded())
{
css::lang::EventObject aEvt(*this);
- ::cppu::OInterfaceIteratorHelper aIt(m_aLoadListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIt(m_aLoadListeners);
while (aIt.hasMoreElements())
static_cast< css::form::XLoadListener*>(aIt.next())->loaded(aEvt);
}
@@ -1421,7 +1421,7 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU
aEvt.Source = *this;
aEvt.Accessor <<= nIndex;
aEvt.Element <<= xElement;
- ::cppu::OInterfaceIteratorHelper aIt(m_aContainerListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIt(m_aContainerListeners);
while (aIt.hasMoreElements())
static_cast< css::container::XContainerListener*>(aIt.next())->elementInserted(aEvt);
}
@@ -1526,7 +1526,7 @@ void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( css::lang
css::container::ContainerEvent aEvt;
aEvt.Source = *this;
aEvt.Element <<= xAffected;
- ::cppu::OInterfaceIteratorHelper aIt(m_aContainerListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIt(m_aContainerListeners);
while (aIt.hasMoreElements())
static_cast< css::container::XContainerListener*>(aIt.next())->elementRemoved(aEvt);
@@ -1589,7 +1589,7 @@ void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Elem
aEvt.Element <<= xElement;
aEvt.ReplacedElement <<= xOld;
- ::cppu::OInterfaceIteratorHelper aIt(m_aContainerListeners);
+ ::comphelper::OInterfaceIteratorHelper2 aIt(m_aContainerListeners);
while (aIt.hasMoreElements())
static_cast< css::container::XContainerListener*>(aIt.next())->elementReplaced(aEvt);
}
diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx
index 309dba915d1d..2220eceba2e2 100644
--- a/dbaccess/source/ui/browser/sbamultiplex.cxx
+++ b/dbaccess/source/ui/browser/sbamultiplex.cxx
@@ -29,7 +29,7 @@ void SAL_CALL SbaXStatusMultiplexer::statusChanged(const css::frame::FeatureStat
{
m_aLastKnownStatus = e;
m_aLastKnownStatus.Source = &m_rParent;
- ::cppu::OInterfaceIteratorHelper aIt( *this );
+ ::comphelper::OInterfaceIteratorHelper2 aIt( *this );
while ( aIt.hasMoreElements() )
static_cast< css::frame::XStatusListener* >( aIt.next() )->statusChanged( m_aLastKnownStatus );
} \
@@ -89,7 +89,7 @@ void SbaXPropertiesChangeMultiplexer::propertiesChange(const css::uno::Sequence<
for (sal_Int32 i=0; i<aMulti.getLength(); ++i, ++pMulti)
pMulti->Source = &m_rParent;
- ::cppu::OInterfaceIteratorHelper aIt(*this);
+ ::comphelper::OInterfaceIteratorHelper2 aIt(*this);
while (aIt.hasMoreElements())
static_cast< css::beans::XPropertiesChangeListener*>(aIt.next())->propertiesChange(aMulti);
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 30cff7ef186e..a19442d3200f 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3491,7 +3491,7 @@ IController& SbaTableQueryBrowser::getCommandController()
return *this;
}
-::cppu::OInterfaceContainerHelper* SbaTableQueryBrowser::getContextMenuInterceptors()
+::comphelper::OInterfaceContainerHelper2* SbaTableQueryBrowser::getContextMenuInterceptors()
{
return &m_aContextMenuInterceptors;
}
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index d27560190b99..7142e295d8e0 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/util/URL.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <vcl/help.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <dbaccess/IController.hxx>
@@ -565,7 +565,7 @@ std::unique_ptr<PopupMenu> DBTreeListBox::CreateContextMenu()
// set images
lcl_insertMenuItemImages( *pContextMenu, m_pContextMenuProvider->getCommandController() );
// allow context menu interception
- ::cppu::OInterfaceContainerHelper* pInterceptors = m_pContextMenuProvider->getContextMenuInterceptors();
+ ::comphelper::OInterfaceContainerHelper2* pInterceptors = m_pContextMenuProvider->getContextMenuInterceptors();
if ( !pInterceptors || !pInterceptors->getLength() )
return pContextMenu;
@@ -577,7 +577,7 @@ std::unique_ptr<PopupMenu> DBTreeListBox::CreateContextMenu()
pContextMenu.get(), nullptr );
aEvent.Selection = new SelectionSupplier( m_pContextMenuProvider->getCurrentSelection( *this ) );
- ::cppu::OInterfaceIteratorHelper aIter( *pInterceptors );
+ ::comphelper::OInterfaceIteratorHelper2 aIter( *pInterceptors );
bool bModifiedMenu = false;
bool bAskInterceptors = true;
while ( aIter.hasMoreElements() && bAskInterceptors )
diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx
index a87ccf374dd9..9c2a579a7a51 100644
--- a/dbaccess/source/ui/inc/callbacks.hxx
+++ b/dbaccess/source/ui/inc/callbacks.hxx
@@ -31,7 +31,7 @@ class Control;
struct AcceptDropEvent;
struct ExecuteDropEvent;
-namespace cppu { class OInterfaceContainerHelper; }
+namespace comphelper { class OInterfaceContainerHelper2; }
namespace dbaui
{
@@ -84,7 +84,7 @@ namespace dbaui
/** returns the container of registered context menu interceptors, or NULL if the implementation
does not support context menu interception
*/
- virtual ::cppu::OInterfaceContainerHelper*
+ virtual ::comphelper::OInterfaceContainerHelper2*
getContextMenuInterceptors() = 0;
/** returns the current selection in the given control
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index 09c0ea6a6fe9..3a533e8fadf4 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -34,7 +34,7 @@ namespace dbaui
:public SbaXDataBrowserController
,public css::util::XModifyBroadcaster
{
- ::cppu::OInterfaceContainerHelper m_aModifyListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners;
// for multiplexing the modify events
SbaXFormAdapter* m_pDataSourceImpl;
bool m_bInQueryDispatch;
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 82eb85c7b730..c9d7093db9de 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -136,8 +136,8 @@ namespace dbaui
SbaXVetoableChangeMultiplexer m_aVetoablePropertyChangeListeners;
SbaXPropertiesChangeMultiplexer m_aPropertiesChangeListeners;
- ::cppu::OInterfaceContainerHelper m_aDisposeListeners;
- ::cppu::OInterfaceContainerHelper m_aContainerListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aDisposeListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aContainerListeners;
// hierarchy administration
css::uno::Reference< css::uno::XInterface > m_xParent;
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index c5b097de4db0..67999030cb4d 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -41,6 +41,7 @@
#include <com/sun/star/frame/XStatusListener.hpp>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/weak.hxx>
@@ -64,7 +65,7 @@ namespace dbaui
class classname \
:public OSbaWeakSubObject \
,public listenerclass \
- ,public ::cppu::OInterfaceContainerHelper \
+ ,public ::comphelper::OInterfaceContainerHelper2 \
{ \
public: \
classname( ::cppu::OWeakObject& rSource, \
@@ -83,7 +84,7 @@ namespace dbaui
virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) override; \
#define END_DECLARE_LISTENER_MULTIPLEXER() \
- /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \
+ /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators */ \
void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \
void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \
}; \
@@ -94,7 +95,7 @@ namespace dbaui
\
classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex) \
:OSbaWeakSubObject(rSource) \
- ,OInterfaceContainerHelper(_rMutex) \
+ ,OInterfaceContainerHelper2(_rMutex) \
{ \
} \
\
@@ -120,7 +121,7 @@ namespace dbaui
{ \
eventtype aMulti(e); \
aMulti.Source = &m_rParent; \
- ::cppu::OInterfaceIteratorHelper aIt(*this); \
+ ::comphelper::OInterfaceIteratorHelper2 aIt(*this); \
while (aIt.hasMoreElements()) \
static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \
} \
@@ -130,7 +131,7 @@ namespace dbaui
{ \
eventtype aMulti(e); \
aMulti.Source = &m_rParent; \
- ::cppu::OInterfaceIteratorHelper aIt(*this); \
+ ::comphelper::OInterfaceIteratorHelper2 aIt(*this); \
bool bResult = true; \
while (bResult && aIt.hasMoreElements()) \
bResult = static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 4c58d72c2463..c70fa481c47b 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -91,8 +91,8 @@ namespace dbaui
svx::ODataAccessDescriptor m_aDocumentDataSource;
// if we're part of a document, this is the state of the DocumentDataSource slot
- ::cppu::OInterfaceContainerHelper m_aSelectionListeners;
- ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors;
+ ::comphelper::OInterfaceContainerHelper2 m_aSelectionListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aContextMenuInterceptors;
OTableCopyHelper::DropDescriptor m_aAsyncDrop;
OTableCopyHelper m_aTableCopyHelper;
@@ -232,7 +232,7 @@ namespace dbaui
// IContextMenuProvider
virtual PopupMenu* getContextMenu( Control& _rControl ) const override;
virtual IController& getCommandController() override;
- virtual ::cppu::OInterfaceContainerHelper*
+ virtual ::comphelper::OInterfaceContainerHelper2*
getContextMenuInterceptors() override;
virtual css::uno::Any
getCurrentSelection( Control& _rControl ) const override;
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 1e14c3f75d03..70154bbfcf18 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -41,6 +41,7 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <rtl/ustrbuf.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
@@ -126,7 +127,7 @@ namespace dbaui
OModuleClient m_aModuleClient;
::dbtools::SQLExceptionInfo m_aCurrentError;
- ::cppu::OInterfaceContainerHelper
+ ::comphelper::OInterfaceContainerHelper2
m_aModifyListeners;
// <properties>
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index bdfd531da0aa..5030eeb3995a 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -64,6 +64,7 @@
#include <connectivity/dbtools.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <rtl/ustrbuf.hxx>
#include <svtools/genericunodialog.hxx>
#include <tools/diagnose_ex.h>
@@ -346,7 +347,7 @@ private:
// other
Reference< XInteractionHandler > m_xInteractionHandler;
- ::cppu::OInterfaceContainerHelper
+ ::comphelper::OInterfaceContainerHelper2
m_aCopyTableListeners;
sal_Int16 m_nOverrideExecutionResult;
};
@@ -1016,7 +1017,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r
Reference< XCopyTableListener > xListener;
try
{
- ::cppu::OInterfaceIteratorHelper aIter( m_aCopyTableListeners );
+ ::comphelper::OInterfaceIteratorHelper2 aIter( m_aCopyTableListeners );
while ( aIter.hasMoreElements() )
{
xListener.set( aIter.next(), UNO_QUERY_THROW );
generated by cgit (git 2.34.1) at 2024-07-05 14:08:33 +0000