From 2e284203da7f9882842111265f5f68ea0a145065 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 13 Sep 2012 11:01:15 +0200
Subject: fdo#46808, Adapt ucb::UniversalContentBroker UNO service to new style

Create a merged XUniversalContentBroker interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Change-Id: Id264387bf8af8bf211050e15b8801a1fde368167
---
 ucb/source/core/ucb.cxx | 27 +++++++++++++++++++++------
 ucb/source/core/ucb.hxx | 20 ++++++++------------
 2 files changed, 29 insertions(+), 18 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 64a412b778b7..4d454c2e4f30 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -269,7 +269,8 @@ UniversalContentBroker::~UniversalContentBroker()
 //
 //=========================================================================
 
-XINTERFACE_IMPL_8( UniversalContentBroker,
+XINTERFACE_IMPL_9( UniversalContentBroker,
+                   XUniversalContentBroker,
                    XTypeProvider,
                    XComponent,
                    XServiceInfo,
@@ -285,13 +286,14 @@ XINTERFACE_IMPL_8( UniversalContentBroker,
 //
 //=========================================================================
 
-XTYPEPROVIDER_IMPL_8( UniversalContentBroker,
-                         XTypeProvider,
+XTYPEPROVIDER_IMPL_9( UniversalContentBroker,
+                      XUniversalContentBroker,
+                      XTypeProvider,
                       XComponent,
-                         XServiceInfo,
+                      XServiceInfo,
                       XInitialization,
-                         XContentProviderManager,
-                         XContentProvider,
+                      XContentProviderManager,
+                      XContentProvider,
                       XContentIdentifierFactory,
                       XCommandProcessor );
 
@@ -675,6 +677,19 @@ Any SAL_CALL UniversalContentBroker::execute(
     return aRet;
 }
 
+//=========================================================================
+//
+// XCommandProcessor2 methods.
+//
+//=========================================================================
+
+// virtual
+void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aCommandId*/)
+    throw( RuntimeException )
+{
+    // @@@ Not implemeted ( yet).
+}
+
 //=========================================================================
 // virtual
 void SAL_CALL UniversalContentBroker::abort( sal_Int32 )
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 265457126323..f12386fe94ab 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -20,13 +20,10 @@
 #ifndef _UCB_HXX
 #define _UCB_HXX
 
-#include <com/sun/star/ucb/XCommandProcessor.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
-#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-#include <com/sun/star/ucb/XContentProviderManager.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+
+#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
@@ -57,14 +54,9 @@ namespace com { namespace sun { namespace star { namespace ucb {
 
 class UniversalContentBroker :
                 public cppu::OWeakObject,
+                public com::sun::star::ucb::XUniversalContentBroker,
                 public com::sun::star::lang::XTypeProvider,
-                public com::sun::star::lang::XComponent,
                 public com::sun::star::lang::XServiceInfo,
-                public com::sun::star::lang::XInitialization,
-                public com::sun::star::ucb::XContentProviderManager,
-                public com::sun::star::ucb::XContentProvider,
-                public com::sun::star::ucb::XContentIdentifierFactory,
-                public com::sun::star::ucb::XCommandProcessor,
                 public com::sun::star::util::XChangesListener
 {
 public:
@@ -161,6 +153,10 @@ public:
     abort( sal_Int32 CommandId )
         throw( com::sun::star::uno::RuntimeException );
 
+    // XCommandProcessor2
+    virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId)
+        throw( com::sun::star::uno::RuntimeException );
+
     // XChangesListener
     virtual void SAL_CALL changesOccurred( const com::sun::star::util::ChangesEvent& Event )
         throw( com::sun::star::uno::RuntimeException );
-- 
cgit