From 6752930497d1c9d0d1ebb29113e89bdaf9e53aaa Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 7 May 2012 16:49:54 +0200
Subject: LocalOfficeConnection description must end in ServiceManager

...instead of NamingService.  Even though current
<http://wiki.services.openoffice.org/w/index.php?title=Documentation/DevGuide/JavaBean/Customized_Configuration&oldid=127145>
documents using the latter, it leads to NullPointerException, as connect()
expects aInitialObject to be an XPropertySet.

Change-Id: Ia8445bed5307bf440d078a8b96200e3b7fa38706
---
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bean/com/sun')

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index bb6abdd53195..4b5f4fcec881 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -531,7 +531,7 @@ public class LocalOfficeConnection
         throws java.net.MalformedURLException
     {
         // Extruct parameters.
-        int idx = url.indexOf(";urp;StarOffice.NamingService");
+        int idx = url.indexOf(";urp;StarOffice.ServiceManager");
         if (idx < 0)
             throw new java.net.MalformedURLException(
                 "Invalid UNO connection URL.");
-- 
cgit