4 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 865449f27718..dc30db4cd577 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -142,7 +142,7 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap()
 
 SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.star.sheet.TableAutoFormatField" )
 SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" )
-SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_SERVICE )
+SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "stardiv.StarCalc.ScAutoFormatsObj", SCAUTOFORMATSOBJ_SERVICE )
 
 static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex )
 {
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 51a95910771d..dff6fd0f96c9 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -89,9 +89,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap()
 #define SCRECENTFUNCTIONSOBJ_SERVICE    "com.sun.star.sheet.RecentFunctions"
 #define SCSPREADSHEETSETTINGS_SERVICE   "com.sun.star.sheet.GlobalSheetSettings"
 
-SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOBJ_SERVICE )
-SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE )
-SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREADSHEETSETTINGS_SERVICE )
+SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "stardiv.StarCalc.ScFunctionListObj", SCFUNCTIONLISTOBJ_SERVICE )
+SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "stardiv.StarCalc.ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE )
+SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "stardiv.StarCalc.ScSpreadsheetSettings", SCSPREADSHEETSETTINGS_SERVICE )
 
 extern "C" {
 
@@ -280,13 +280,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory(
                 ScDocument_createInstance,
                 ScDocument_getSupportedServiceNames() ));
     }
-    else if ( aImpl == ::sc::sidebar::ScPanelFactory::getImplementationName() )
+    else if ( aImpl == ::sc::sidebar::ScPanelFactory::getImplementationName_static() )
     {
         xFactory = ::cppu::createSingleFactory(
             reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
-            ::sc::sidebar::ScPanelFactory::getImplementationName(),
+            ::sc::sidebar::ScPanelFactory::getImplementationName_static(),
             ::sc::sidebar::ScPanelFactory::createInstance,
-            ::sc::sidebar::ScPanelFactory::getSupportedServiceNames() );
+            ::sc::sidebar::ScPanelFactory::getSupportedServiceNames_static() );
     }
 
     void* pRet = NULL;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index dcd16fad3b24..b9e2bf45be45 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2164,7 +2164,7 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
 // XServiceInfo
 OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException, std::exception)
 {
-    return OUString( "ScModelObj" );
+    return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
 }
 
 sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName )
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 6f3b11d62390..c53e3b9cf8af 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -224,7 +224,7 @@ uno::Sequence<OUString> ScFunctionAccess::getSupportedServiceNames_Static()
 // XServiceInfo
 OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException, std::exception)
 {
-    return OUString( "ScFunctionAccess");
+    return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceName )