Fix support for "dummy" content providers

...and use it so that private: URLs are not needlessly passed to the gio or
gnome-vfs "catch-all" UCPs.

Change-Id: I85d100567d1641130449fe21ccd072bcc0ec0979

1 files changed, 25 insertions, 21 deletions

diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index bce135f0c812..a7b4384d61b1 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -58,31 +58,35 @@ registerAtUcb(
                                    copy(RTL_CONSTASCII_LENGTH("{noproxy}")) :
                                rArguments);
 
-    // First, try to instantiate proxy for provider:
     uno::Reference< ucb::XContentProvider > xProvider;
-    if (!bNoProxy)
+
+    if (!rName.isEmpty())
     {
-        uno::Reference< ucb::XContentProviderFactory > xProxyFactory;
-        try
+        // First, try to instantiate proxy for provider:
+        if (!bNoProxy)
         {
-            xProxyFactory = ucb::ContentProviderProxyFactory::create( rxContext );
+            uno::Reference< ucb::XContentProviderFactory > xProxyFactory;
+            try
+            {
+                xProxyFactory = ucb::ContentProviderProxyFactory::create( rxContext );
+            }
+            catch (uno::Exception const &) {}
+            OSL_ENSURE(xProxyFactory.is(), "No ContentProviderProxyFactory");
+            if (xProxyFactory.is())
+                xProvider = xProxyFactory->createContentProvider(rName);
         }
-        catch (uno::Exception const &) {}
-        OSL_ENSURE(xProxyFactory.is(), "No ContentProviderProxyFactory");
-        if (xProxyFactory.is())
-            xProvider = xProxyFactory->createContentProvider(rName);
-    }
 
-    // Then, try to instantiate provider directly:
-    if (!xProvider.is())
-        try
-        {
-            xProvider = uno::Reference< ucb::XContentProvider >(
-                            rxContext->getServiceManager()->createInstanceWithContext(rName, rxContext),
-                            uno::UNO_QUERY);
-        }
-        catch (uno::RuntimeException const &) { throw; }
-        catch (uno::Exception const &) {}
+        // Then, try to instantiate provider directly:
+        if (!xProvider.is())
+            try
+            {
+                xProvider = uno::Reference< ucb::XContentProvider >(
+                    rxContext->getServiceManager()->createInstanceWithContext(rName, rxContext),
+                    uno::UNO_QUERY);
+            }
+            catch (uno::RuntimeException const &) { throw; }
+            catch (uno::Exception const &) {}
+    }
 
     uno::Reference< ucb::XParameterizedContentProvider >
         xParameterized(xProvider, uno::UNO_QUERY);
@@ -104,7 +108,7 @@ registerAtUcb(
     }
 
     bool bSuccess = false;
-    if (rManager.is() && xProvider.is())
+    if (rManager.is() && (rName.isEmpty() || xProvider.is()))
     {
         try
         {