diff options
Diffstat (limited to 'dbaccess/source/ui/app')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppController.hxx | 5 |
2 files changed, 5 insertions, 4 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; |