From b552f521f6bbf917ae41ccfcddeb498c75c824e3 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 11 Dec 2012 11:27:08 +0200
Subject: fdo#46808, Adapt ui::UIElementFactoryManager UNO service to new style

Required creating a new merged interface.

Change-Id: I12be54e7e4c0614a31a04715342aa244d1687c42
---
 framework/inc/uifactory/uielementfactorymanager.hxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'framework/inc/uifactory/uielementfactorymanager.hxx')

diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index e9bbfcff16cc..266111813de8 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -34,14 +34,13 @@
 #include <stdtypes.h>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/ui/XUIElementFactory.hpp>
-#include <com/sun/star/ui/XUIElementFactoryRegistration.hpp>
+#include <com/sun/star/ui/XUIElementFactoryManager.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "com/sun/star/frame/XModuleManager2.hpp"
 
 #include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
@@ -100,9 +99,8 @@ namespace framework
 
 
 class UIElementFactoryManager :  private ThreadHelpBase                                             ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
-                                 public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,
-                                                                 ::com::sun::star::ui::XUIElementFactory,
-                                                                 ::com::sun::star::ui::XUIElementFactoryRegistration>
+                                 public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,
+                                                                 ::com::sun::star::ui::XUIElementFactoryManager>
 {
     public:
         UIElementFactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-- 
cgit