1 files changed, 74 insertions, 38 deletions

diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 3783fb17f98e..2f4263892431 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -38,6 +38,7 @@
 #include "unonames.hxx"
 #include "funcdesc.hxx"
 #include <com/sun/star/sheet/FunctionArgument.hpp>
+#include "ScPanelFactory.hxx"
 
 using namespace com::sun::star;
 
@@ -185,154 +186,189 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory(
     OUString aImpl(OUString::createFromAscii(pImplName));
 
     if ( aImpl == ScSpreadsheetSettings::getImplementationName_Static() )
+    {
         xFactory.set(cppu::createOneInstanceFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScSpreadsheetSettings::getImplementationName_Static(),
                 ScSpreadsheetSettings_CreateInstance,
                 ScSpreadsheetSettings::getSupportedServiceNames_Static() ));
-
-    if ( aImpl == ScRecentFunctionsObj::getImplementationName_Static() )
+    }
+    else if ( aImpl == ScRecentFunctionsObj::getImplementationName_Static() )
+    {
         xFactory.set(cppu::createOneInstanceFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScRecentFunctionsObj::getImplementationName_Static(),
                 ScRecentFunctionsObj_CreateInstance,
                 ScRecentFunctionsObj::getSupportedServiceNames_Static() ));
-
-    if ( aImpl == ScFunctionListObj::getImplementationName_Static() )
+    }
+    else if ( aImpl == ScFunctionListObj::getImplementationName_Static() )
+    {
         xFactory.set(cppu::createOneInstanceFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScFunctionListObj::getImplementationName_Static(),
                 ScFunctionListObj_CreateInstance,
                 ScFunctionListObj::getSupportedServiceNames_Static() ));
-
-    if ( aImpl == ScAutoFormatsObj::getImplementationName_Static() )
+    }
+    else if ( aImpl == ScAutoFormatsObj::getImplementationName_Static() )
+    {
         xFactory.set(cppu::createOneInstanceFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScAutoFormatsObj::getImplementationName_Static(),
                 ScAutoFormatsObj_CreateInstance,
                 ScAutoFormatsObj::getSupportedServiceNames_Static() ));
-
-    if ( aImpl == ScFunctionAccess::getImplementationName_Static() )
+    }
+    else if ( aImpl == ScFunctionAccess::getImplementationName_Static() )
+    {
         xFactory.set(cppu::createOneInstanceFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScFunctionAccess::getImplementationName_Static(),
                 ScFunctionAccess_CreateInstance,
                 ScFunctionAccess::getSupportedServiceNames_Static() ));
-
-    if ( aImpl == ScFilterOptionsObj::getImplementationName_Static() )
+    }
+    else if ( aImpl == ScFilterOptionsObj::getImplementationName_Static() )
+    {
         xFactory.set(cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScFilterOptionsObj::getImplementationName_Static(),
                 ScFilterOptionsObj_CreateInstance,
                 ScFilterOptionsObj::getSupportedServiceNames_Static() ));
-
-    if ( aImpl == ScXMLImport_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLImport_getImplementationName() )
+    {
         xFactory.set(cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLImport_getImplementationName(),
                 ScXMLImport_createInstance,
                 ScXMLImport_getSupportedServiceNames() ));
-
-    if ( aImpl == ScXMLImport_Meta_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLImport_Meta_getImplementationName() )
+    {
         xFactory.set(cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLImport_Meta_getImplementationName(),
                 ScXMLImport_Meta_createInstance,
                 ScXMLImport_Meta_getSupportedServiceNames() ));
-
-    if ( aImpl == ScXMLImport_Styles_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLImport_Styles_getImplementationName() )
+    {
         xFactory.set(cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLImport_Styles_getImplementationName(),
                 ScXMLImport_Styles_createInstance,
                 ScXMLImport_Styles_getSupportedServiceNames() ));
-
-    if ( aImpl == ScXMLImport_Content_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLImport_Content_getImplementationName() )
+    {
         xFactory.set(cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLImport_Content_getImplementationName(),
                 ScXMLImport_Content_createInstance,
                 ScXMLImport_Content_getSupportedServiceNames() ));
-
-    if ( aImpl == ScXMLImport_Settings_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLImport_Settings_getImplementationName() )
+    {
         xFactory.set(cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLImport_Settings_getImplementationName(),
                 ScXMLImport_Settings_createInstance,
                 ScXMLImport_Settings_getSupportedServiceNames() ));
-
-    if ( aImpl == ScXMLOOoExport_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOOoExport_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOOoExport_getImplementationName(),
                 ScXMLOOoExport_createInstance,
                 ScXMLOOoExport_getSupportedServiceNames() );
-
-    if ( aImpl == ScXMLOOoExport_Meta_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOOoExport_Meta_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOOoExport_Meta_getImplementationName(),
                 ScXMLOOoExport_Meta_createInstance,
                 ScXMLOOoExport_Meta_getSupportedServiceNames() );
-
-    if ( aImpl == ScXMLOOoExport_Styles_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOOoExport_Styles_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOOoExport_Styles_getImplementationName(),
                 ScXMLOOoExport_Styles_createInstance,
                 ScXMLOOoExport_Styles_getSupportedServiceNames() );
-
-    if ( aImpl == ScXMLOOoExport_Content_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOOoExport_Content_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOOoExport_Content_getImplementationName(),
                 ScXMLOOoExport_Content_createInstance,
                 ScXMLOOoExport_Content_getSupportedServiceNames() );
-
-    if ( aImpl == ScXMLOOoExport_Settings_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOOoExport_Settings_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOOoExport_Settings_getImplementationName(),
                 ScXMLOOoExport_Settings_createInstance,
                 ScXMLOOoExport_Settings_getSupportedServiceNames() );
-
-    if ( aImpl == ScXMLOasisExport_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOasisExport_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOasisExport_getImplementationName(),
                 ScXMLOasisExport_createInstance,
                 ScXMLOasisExport_getSupportedServiceNames() );
-    if ( aImpl == ScXMLOasisExport_Meta_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOasisExport_Meta_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOasisExport_Meta_getImplementationName(),
                 ScXMLOasisExport_Meta_createInstance,
                 ScXMLOasisExport_Meta_getSupportedServiceNames() );
-    if ( aImpl == ScXMLOasisExport_Styles_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOasisExport_Styles_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOasisExport_Styles_getImplementationName(),
                 ScXMLOasisExport_Styles_createInstance,
                 ScXMLOasisExport_Styles_getSupportedServiceNames() );
-    if ( aImpl == ScXMLOasisExport_Content_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOasisExport_Content_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOasisExport_Content_getImplementationName(),
                 ScXMLOasisExport_Content_createInstance,
                 ScXMLOasisExport_Content_getSupportedServiceNames() );
-    if ( aImpl == ScXMLOasisExport_Settings_getImplementationName() )
+    }
+    else if ( aImpl == ScXMLOasisExport_Settings_getImplementationName() )
+    {
         xFactory = cppu::createSingleFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScXMLOasisExport_Settings_getImplementationName(),
                 ScXMLOasisExport_Settings_createInstance,
                 ScXMLOasisExport_Settings_getSupportedServiceNames() );
-
-    if ( aImpl == ScDocument_getImplementationName() )
+    }
+    else if ( aImpl == ScDocument_getImplementationName() )
+    {
         xFactory.set(sfx2::createSfxModelFactory(
                 reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
                 ScDocument_getImplementationName(),
                 ScDocument_createInstance,
                 ScDocument_getSupportedServiceNames() ));
+    }
+    else if ( aImpl == ::sc::sidebar::ScPanelFactory::getImplementationName() )
+    {
+        xFactory = ::cppu::createSingleFactory(
+            reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
+            ::sc::sidebar::ScPanelFactory::getImplementationName(),
+            ::sc::sidebar::ScPanelFactory::createInstance,
+            ::sc::sidebar::ScPanelFactory::getSupportedServiceNames() );
+    }
 
     void* pRet = NULL;
     if (xFactory.is())