cws tl79: merge with DEV300_m79

4 files changed, 11 insertions, 143 deletions

diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 7e0e7f3657ca..408ff6af0dee 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -298,14 +298,18 @@ bool ContentBroker_Impl::initialize()
 
                     if ( m_xProviderMgr.is() )
                     {
-                        if ( !configureUcb( m_xProviderMgr,
-                                            m_xSMgr,
-                                            m_aProvData,
-                                            0 ) )
+                        ContentProviderDataList::const_iterator aEnd(m_aProvData.end());
+                        for (ContentProviderDataList::const_iterator aIt(m_aProvData.begin());
+                            aIt != aEnd; ++aIt)
                         {
-                            OSL_ENSURE( false, "Failed to configure UCB!" );
-                            return false;
+                            registerAtUcb(m_xProviderMgr,
+                                      m_xSMgr,
+                                      aIt->ServiceName,
+                                      aIt->Arguments,
+                                      aIt->URLTemplate,
+                                      0);
                         }
+
                     }
                 }
             }
diff --git a/ucbhelper/source/provider/makefile.mk b/ucbhelper/source/provider/makefile.mk
index db06a5df131c..5999192f7bdb 100644
--- a/ucbhelper/source/provider/makefile.mk
+++ b/ucbhelper/source/provider/makefile.mk
@@ -43,7 +43,6 @@ ENABLE_EXCEPTIONS=TRUE
 .IF "$(header)" == ""
 
 SLOFILES=\
-        $(SLO)$/configureucb.obj       \
         $(SLO)$/contentidentifier.obj  \
         $(SLO)$/providerhelper.obj     \
         $(SLO)$/contenthelper.obj      \
@@ -53,7 +52,6 @@ SLOFILES=\
         $(SLO)$/resultsetmetadata.obj  \
         $(SLO)$/resultset.obj          \
         $(SLO)$/resultsethelper.obj    \
-        $(SLO)$/provconf.obj	       \
         $(SLO)$/commandenvironmentproxy.obj     \
         $(SLO)$/interactionrequest.obj          \
         $(SLO)$/simpleinteractionrequest.obj    \
diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index 0a749c9ccb5c..e6ccaf4743a8 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_ucbhelper.hxx"
-#include <registerucb.hxx>
+#include <ucbhelper/registerucb.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/XContentProviderManager.hpp>
 #include <com/sun/star/ucb/XParameterizedContentProvider.hpp>
@@ -35,7 +35,6 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 
 #include "osl/diagnose.h"
-#include <ucbhelper/configureucb.hxx>
 
 using namespace com::sun::star;
 
@@ -162,41 +161,4 @@ registerAtUcb(
     return bSuccess;
 }
 
-//============================================================================
-//
-//  deregisterFromUcb
-//
-//============================================================================
-
-void
-deregisterFromUcb(
-    uno::Reference< ucb::XContentProviderManager > const & rManager,
-    ContentProviderRegistrationInfo const & rInfo)
-    throw (uno::RuntimeException)
-{
-    uno::Reference< ucb::XContentProvider >
-        xProvider(rInfo.m_xProvider);
-    uno::Reference< ucb::XParameterizedContentProvider >
-        xParameterized(xProvider, uno::UNO_QUERY);
-    if (xParameterized.is())
-    {
-        uno::Reference< ucb::XContentProvider > xInstance;
-        try
-        {
-            xInstance
-                = xParameterized->deregisterInstance(rInfo.m_aTemplate,
-                                                     rInfo.m_aArguments);
-        }
-        catch (lang::IllegalArgumentException const &) {}
-
-        if (xInstance.is())
-            xProvider = xInstance;
-    }
-
-    if (rManager.is())
-        rManager->deregisterContentProvider(xProvider, rInfo.m_aTemplate);
-            //@@@ if this fails, a roll-back of deregisterInstance() is
-            // missing
-}
-
 }
diff --git a/ucbhelper/source/provider/registerucb.hxx b/ucbhelper/source/provider/registerucb.hxx
deleted file mode 100644
index f17321c76cd5..000000000000
--- a/ucbhelper/source/provider/registerucb.hxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _UCBHELPER_REGISTERUCB_HXX_
-#define _UCBHELPER_REGISTERUCB_HXX_
-
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Reference.h>
-
-namespace com { namespace sun { namespace star {
-    namespace lang { class XMultiServiceFactory; }
-    namespace ucb { class XContentProviderManager; }
-} } }
-namespace rtl { class OUString; }
-
-namespace ucbhelper {
-
-struct ContentProviderRegistrationInfo;
-
-//============================================================================
-/** Register a content provider at a Universal Content Broker.
-
-    @param rManager  A content provider manager (normally, this would be a
-    UCB).  May be null, which is only useful if the content provider is an
-    <type>XParamterizedContentProvider</type>s.
-
-    @param rServiceFactory  A factory through which to obtain the required
-    services.
-
-    @param rName  The service name of the content provider.
-
-    @param rArguments  Any arguments to instantiate the content provider with.
-
-    @param rTemplate  The URL template to register the content provider on.
-
-    @param pInfo  If not null, this output parameter is filled with
-    information about the (atemptively) registered provider.
- */
-bool
-registerAtUcb(
-    com::sun::star::uno::Reference<
-            com::sun::star::ucb::XContentProviderManager > const &
-        rManager,
-    com::sun::star::uno::Reference<
-            com::sun::star::lang::XMultiServiceFactory > const &
-        rServiceFactory,
-    rtl::OUString const & rName,
-    rtl::OUString const & rArguments,
-    rtl::OUString const & rTemplate,
-    ContentProviderRegistrationInfo * pInfo)
-    throw (com::sun::star::uno::RuntimeException);
-
-//============================================================================
-/** Deregister a content provider from a Universal Content Broker.
-
-    @param rManager  A content provider manager (normally, this would be a
-    UCB).  May be null, which is only useful if the content provider is an
-    <type>XParamterizedContentProvider</type>s.
-
-    @param rInfo  Information about the content provider to deregister.
- */
-void
-deregisterFromUcb(
-    com::sun::star::uno::Reference<
-            com::sun::star::ucb::XContentProviderManager > const &
-        rManager,
-    ContentProviderRegistrationInfo const & rInfo)
-    throw (com::sun::star::uno::RuntimeException);
-
-}
-
-#endif // _UCBHELPER_REGISTERUCB_HXX_