sb129: #i113189# removed obviously unnecessary service registrations; allow empty <implementation/>

stoc/source/simpleregistry/textualservices.cxx

@@ -194,21 +194,13 @@ Parser::Parser(rtl::OUString const & uri, rtl::Reference< Data > const & data):
                      RTL_CONSTASCII_USTRINGPARAM(
                          ": unexpected item in <component>"))),
                 css::uno::Reference< css::uno::XInterface >());
+        case STATE_IMPLEMENTATION_INITIAL:
         case STATE_IMPLEMENTATION_SERVICE:
         case STATE_IMPLEMENTATION_SINGLETON:
             if (res == xmlreader::XmlReader::RESULT_END) {
                 state = STATE_COMPONENT;
                 break;
             }
-            if (res == xmlreader::XmlReader::RESULT_BEGIN && nsId == ucNsId &&
-                name.equals(RTL_CONSTASCII_STRINGPARAM("singleton")))
-            {
-                handleSingleton();
-                state = STATE_SINGLETON;
-                break;
-            }
-            // fall through
-        case STATE_IMPLEMENTATION_INITIAL:
             if (state != STATE_IMPLEMENTATION_SINGLETON &&
                 res == xmlreader::XmlReader::RESULT_BEGIN && nsId == ucNsId &&
                 name.equals(RTL_CONSTASCII_STRINGPARAM("service")))
@@ -217,6 +209,14 @@ Parser::Parser(rtl::OUString const & uri, rtl::Reference< Data > const & data):
                 state = STATE_SERVICE;
                 break;
             }
+            if (state != STATE_IMPLEMENTATION_INITIAL &&
+                res == xmlreader::XmlReader::RESULT_BEGIN && nsId == ucNsId &&
+                name.equals(RTL_CONSTASCII_STRINGPARAM("singleton")))
+            {
+                handleSingleton();
+                state = STATE_SINGLETON;
+                break;
+            }
             throw css::registry::InvalidRegistryException(
                 (reader_.getUrl() +
                  rtl::OUString(

stoc/util/bootstrap.component

@@ -38,16 +38,12 @@
     <service name="com.sun.star.registry.NestedRegistry"/>
   </implementation>
   <implementation name="com.sun.star.comp.stoc.ORegistryServiceManager">
-    <service name="com.sun.star.lang.MultiServiceFactory"/>
     <service name="com.sun.star.lang.RegistryServiceManager"/>
   </implementation>
   <implementation name="com.sun.star.comp.stoc.OServiceManager">
-    <service name="com.sun.star.lang.MultiServiceFactory"/>
     <service name="com.sun.star.lang.ServiceManager"/>
   </implementation>
-  <implementation name="com.sun.star.comp.stoc.OServiceManagerWrapper">
-    <service name="com.sun.star.lang.MultiServiceFactory"/>
-  </implementation>
+  <implementation name="com.sun.star.comp.stoc.OServiceManagerWrapper"/>
   <implementation name="com.sun.star.comp.stoc.RegistryTypeDescriptionProvider">
     <service name="com.sun.star.reflection.TypeDescriptionProvider"/>
   </implementation>