diff options
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/helper/uiconfigelementwrapperbase.hxx | 3 | ||||
| -rw-r--r-- | framework/inc/helper/uielementwrapperbase.hxx | 3 | ||||
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index a58c187c0945..5b561bef5db5 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <rtl/ustring.hxx> +#include <comphelper/multicontainer2.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> @@ -132,7 +133,7 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex, css::uno::Reference< css::container::XIndexAccess > m_xConfigData; css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame; css::uno::Reference< css::awt::XMenuBar > m_xMenuBar; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + comphelper::OMultiTypeInterfaceContainerHelper2 m_aListenerContainer; /// container for ALL Listener }; } // namespace framework diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index 71fc8d0784ae..573755f2020d 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/util/XUpdatable.hpp> #include <rtl/ustring.hxx> +#include <comphelper/multicontainer2.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> @@ -98,7 +99,7 @@ class UIElementWrapperBase : private cppu::BaseMutex, static css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + comphelper::OMultiTypeInterfaceContainerHelper2 m_aListenerContainer; /// container for ALL Listener OUString m_aResourceURL; css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame; sal_Int16 m_nType; diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 0274492db1d3..189be410bfc9 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/multicontainer2.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/uno3.hxx> @@ -261,7 +261,7 @@ namespace framework std::unique_ptr<GlobalSettings> m_pGlobalSettings; OUString m_aModuleIdentifier; Timer m_aAsyncLayoutTimer; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener + comphelper::OMultiTypeInterfaceContainerHelper2 m_aListenerContainer; // container for ALL Listener rtl::Reference< ToolbarLayoutManager > m_xToolbarManager; friend class detail::InfoHelperBuilder; diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index c4b2876277ad..99cf94ea1d59 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/multicontainer2.hxx> #include <vcl/status.hxx> #include <vcl/vclptr.hxx> #include <map> @@ -93,7 +93,7 @@ class StatusBarManager final: public ::cppu::WeakImplHelper< css::uno::Reference< css::frame::XFrame > m_xFrame; StatusBarControllerMap m_aControllerMap; osl::Mutex m_mutex; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + comphelper::OMultiTypeInterfaceContainerHelper2 m_aListenerContainer; /// container for ALL Listener css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::frame::XUIControllerFactory > m_xStatusbarControllerFactory; }; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 6de526423d38..a12528415184 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -37,7 +37,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/multicontainer2.hxx> #include <tools/link.hxx> #include <vcl/weld.hxx> @@ -229,7 +229,7 @@ class ToolBarManager final : public ToolbarManager_Base css::uno::Reference< css::frame::XFrame > m_xFrame; ToolBarControllerMap m_aControllerMap; osl::Mutex m_mutex; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + comphelper::OMultiTypeInterfaceContainerHelper2 m_aListenerContainer; /// container for ALL Listener css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::frame::XUIControllerFactory > m_xToolbarControllerFactory; css::uno::Reference< css::ui::XImageManager > m_xModuleImageManager; |