Remove socomp library related code

15 files changed, 5 insertions, 1105 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 560b1b0b0860..b950d2583097 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -126,7 +126,6 @@ class Desktop : public Application
             return m_aBootstrapStatus;
         }
 
-        static sal_Bool         CheckOEM();
         static sal_Bool         isCrashReporterEnabled();
 
         // first-start (ever) related methods
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index e9a287ad309d..4e59c5f21517 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -6,7 +6,6 @@ dt	desktop\res								get		-	all	dt_res NULL
 dt	desktop\source\app						nmake	-	all	dt_app dt_migr dt_inc dt_dp_misc NULL
 dt	desktop\source\migration				nmake	-	all	dt_migr dt_inc NULL
 dt	desktop\source\migration\services		nmake	-	all	dt_services dt_inc dt_dp_misc NULL
-dt	desktop\source\so_comp					nmake	-	all	dt_so_comp dt_inc NULL
 dt	desktop\source\offacc					nmake	-	all	dt_offac dt_inc NULL
 dt	desktop\source\splash					nmake	-	all	dt_spl dt_migr dt_inc NULL
 dt	desktop\win32\source					nmake	-	w	dt_wrapper dt_inc NULL
@@ -40,7 +39,7 @@ dt	desktop\source\deployment\registry\configuration	nmake	-	all	dt_dp_registry_c
 dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
 dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
 dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
-dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_win32_quickstart_so.w dt_zipintro NULL
+dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_win32_quickstart_so.w dt_zipintro NULL
 dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
 dt  desktop\registry\data\org\openoffice\Office                     nmake   -  all sn_regconfig NULL
 dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 38bdf495ccd4..6287afa02ed9 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -50,7 +50,6 @@ mkdir: %_DEST%\bin\odf4ms
 ..\%__SRC%\misc\soffice.bin.manifest %_DEST%\bin\soffice.bin.manifest
 ..\%__SRC%\bin\wrp*.dll %_DEST%\bin\wrp*.dll
 ..\%__SRC%\bin\spl*.dll %_DEST%\bin\spl*.dll
-..\%__SRC%\bin\socomp.dll %_DEST%\bin\socomp.dll
 ..\%__SRC%\obj\officeloader.obj %_DEST%\lib\officeloader.obj
 ..\%__SRC%\obj\extendloaderenvironment.obj %_DEST%\lib\extendloaderenvironment.obj
 ..\%__SRC%\obj\copyright_ascii_sun.obj %_DEST%\lib\copyright_ascii_sun.obj
@@ -59,8 +58,6 @@ mkdir: %_DEST%\bin\odf4ms
 ..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib\libwrp*.dylib
 ..\%__SRC%\lib\libspl*.so %_DEST%\lib\libspl*.so
 ..\%__SRC%\lib\libspl*.dylib %_DEST%\lib\libspl*.dylib
-..\%__SRC%\lib\libsocomp.so %_DEST%\lib\libsocomp.so
-..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib\libsocomp.dylib
 ..\%__SRC%\bin\offacc*.dll %_DEST%\bin\offacc*.dll
 ..\%__SRC%\lib\liboffacc*.so %_DEST%\lib\liboffacc*.so
 ..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib\liboffacc*.dylib
@@ -147,6 +144,5 @@ mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
 ..\%__SRC%\misc\migrationoo2.component %_DEST%\xml\migrationoo2.component
 ..\%__SRC%\misc\migrationoo3.component %_DEST%\xml\migrationoo3.component
 ..\%__SRC%\misc\offacc.component %_DEST%\xml\offacc.component
-..\%__SRC%\misc\socomp.component %_DEST%\xml\socomp.component
 ..\%__SRC%\misc\spl.component %_DEST%\xml\spl.component
 ..\%__SRC%\misc\splash.component %_DEST%\xml\splash.component
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 03382365d302..24a13e362e0d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -43,7 +43,6 @@
 #include "dispatchwatcher.hxx"
 #include "configinit.hxx"
 #include "lockfile.hxx"
-#include "checkinstall.hxx"
 #include "cmdlinehelp.hxx"
 #include "userinstall.hxx"
 #include "desktopcontext.hxx"
@@ -1672,14 +1671,6 @@ int Desktop::Main()
         String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
         delete pLabelResMgr;
 
-        // Check for StarOffice/Suite specific extensions runs also with OpenOffice installation sets
-        OUString aTitleString( aTitle );
-        bCheckOk = CheckInstallation( aTitleString );
-        if ( !bCheckOk )
-            return EXIT_FAILURE;
-        else
-            aTitle = aTitleString;
-
 #ifdef DBG_UTIL
         //include version ID in non product builds
         ::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
@@ -2234,23 +2225,6 @@ void Desktop::EnableOleAutomation()
 #endif
 }
 
-sal_Bool Desktop::CheckOEM()
-{
-    Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
-    Reference<XJob> rOemJob(rFactory->createInstance(
-        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.OEMPreloadJob"))),
-        UNO_QUERY );
-    Sequence<NamedValue> args;
-    sal_Bool bResult = sal_False;
-    if (rOemJob.is()) {
-        Any aResult = rOemJob->execute(args);
-        aResult >>= bResult;
-        return bResult;
-    } else {
-        return sal_True;
-    }
-}
-
 void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
 {
     Reference< XMultiServiceFactory > rFactory = ::comphelper::getProcessServiceFactory();
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
deleted file mode 100644
index c0e853d9eef5..000000000000
--- a/desktop/source/app/checkinstall.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "checkinstall.hxx"
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/beans/XMaterialHolder.hpp>
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
-#include <vcl/msgbox.hxx>
-#include <tools/date.hxx>
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
-
-using ::rtl::OUString;
-
-namespace desktop
-{
-
-sal_Bool CheckInstallation( OUString& rTitle )
-{
-    try
-    {
-        Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
-        Reference< XExactName > xExactName( xSMgr->createInstance(
-                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                        "com.sun.star.comp.desktop.Evaluation" ))),
-                                    UNO_QUERY );
-        if ( xExactName.is() )
-        {
-            try
-            {
-                rTitle = xExactName->getExactName( rTitle );
-                Reference< XMaterialHolder > xMaterialHolder( xExactName, UNO_QUERY );
-                if ( xMaterialHolder.is() )
-                {
-                    com::sun::star::util::Date aExpirationDate;
-                    Any a = xMaterialHolder->getMaterial();
-                    if ( a >>= aExpirationDate )
-                    {
-                        Date aToday;
-                        Date aTimeBombDate( aExpirationDate.Day, aExpirationDate.Month, aExpirationDate.Year );
-                        if ( aToday > aTimeBombDate )
-                        {
-                            InfoBox aInfoBox( NULL, String::CreateFromAscii( "This version has expired" ) );
-                            aInfoBox.Execute();
-                            return sal_False;
-                        }
-                    }
-
-                    return sal_True;
-                }
-                else
-                {
-                    InfoBox aInfoBox( NULL, rTitle );
-                    aInfoBox.Execute();
-                    return sal_False;
-                }
-            }
-            catch ( RuntimeException& )
-            {
-                // Evaluation version expired!
-                return sal_False;
-            }
-        }
-        else
-        {
-            Reference< com::sun::star::container::XContentEnumerationAccess > rContent( xSMgr , UNO_QUERY );
-            if( rContent.is() )
-            {
-                OUString sEvalService = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Evaluation" ) );
-                Reference < com::sun::star::container::XEnumeration > rEnum = rContent->createContentEnumeration( sEvalService );
-                if ( rEnum.is() )
-                {
-                    InfoBox aInfoBox( NULL, rTitle );
-                    aInfoBox.Execute();
-                    return sal_False;
-                }
-            }
-        }
-    }
-    catch(Exception)
-    {
-    }
-
-    return sal_True;
-}
-
-} // namespace desktop
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/checkinstall.hxx b/desktop/source/app/checkinstall.hxx
deleted file mode 100644
index a4ee8c05c9ef..000000000000
--- a/desktop/source/app/checkinstall.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DESKTOP_CHECKINSTALL_HXX_
-#define _DESKTOP_CHECKINSTALL_HXX_
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
-
-namespace desktop
-{
-
-sal_Bool CheckInstallation( rtl::OUString& rTitle );
-
-}
-
-#endif // _DESKTOP_CHECKINSTALL_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index 4a3d084b8bb0..f905bd6ea296 100755
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -61,7 +61,6 @@ SHL1OBJS = \
     $(SLO)$/appfirststart.obj \
     $(SLO)$/appinit.obj \
     $(SLO)$/appsys.obj \
-    $(SLO)$/checkinstall.obj \
     $(SLO)$/check_ext_deps.obj \
     $(SLO)$/cmdlineargs.obj \
     $(SLO)$/cmdlinehelp.obj \
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 51cb8db878d1..022ccf1eada2 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -719,7 +719,7 @@ void SAL_CALL OfficeIPCThread::run()
 
             // handle request for acceptor
             OUString aAcceptString;
-            if ( aCmdLineArgs->GetAcceptString(aAcceptString) && Desktop::CheckOEM()) {
+            if ( aCmdLineArgs->GetAcceptString(aAcceptString) ) {
                 ApplicationEvent* pAppEvent =
                     new ApplicationEvent( aEmpty, aEmpty,
                                           "ACCEPT", aAcceptString );
@@ -772,7 +772,7 @@ void SAL_CALL OfficeIPCThread::run()
                 // we only do this if no document was specified on the command line,
                 // since this would be inconsistent with the the behaviour of
                 // the first process, see OpenClients() (call to OpenDefault()) in app.cxx
-                if ( aCmdLineArgs->HasModuleParam() && Desktop::CheckOEM() && (!bDocRequestSent))
+                if ( aCmdLineArgs->HasModuleParam() && (!bDocRequestSent) )
                 {
                     SvtModuleOptions aOpt;
                     SvtModuleOptions::EFactory eFactory = SvtModuleOptions::E_WRITER;
@@ -801,7 +801,7 @@ void SAL_CALL OfficeIPCThread::run()
                 }
             }
 
-            if (!aCmdLineArgs->IsQuickstart() && Desktop::CheckOEM()) {
+            if ( !aCmdLineArgs->IsQuickstart() ) {
                 sal_Bool bShowHelp = sal_False;
                 rtl::OUStringBuffer aHelpURLBuffer;
                 if (aCmdLineArgs->IsHelpWriter()) {
@@ -844,7 +844,7 @@ void SAL_CALL OfficeIPCThread::run()
                 }
             }
 
-            if ( bDocRequestSent && Desktop::CheckOEM())
+            if ( bDocRequestSent )
              {
                 // Send requests to dispatch watcher if we have at least one. The receiver
                 // is responsible to delete the request after processing it.
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
deleted file mode 100644
index 8890d26462ec..000000000000
--- a/desktop/source/so_comp/evaluation.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "evaluation.hxx"
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <rtl/ustrbuf.hxx>
-#include <uno/environment.h>
-#include <cppuhelper/factory.hxx>
-#include <unotools/configmgr.hxx>
-#include <vcl/msgbox.hxx>
-#include <tools/resmgr.hxx>
-#include <tools/resid.hxx>
-#include "../app/desktop.hrc"
-
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::registry;
-
-using ::rtl::OUString;
-
-namespace desktop {
-
-static SOEvaluation*    pSOEval=0;
-
-const char* SOEvaluation::interfaces[] =
-{
-    "com.sun.star.beans.XExactName",
-    "com.sun.star.beans.XMaterialHolder",
-    "com.sun.star.lang.XComponent",
-    "com.sun.star.lang.XServiceInfo",
-    NULL,
-};
-
-const char* SOEvaluation::implementationName = "com.sun.star.comp.desktop.Evaluation";
-const char* SOEvaluation::serviceName = "com.sun.star.office.Evaluation";
-
-OUString SOEvaluation::GetImplementationName()
-{
-    return OUString::createFromAscii(implementationName);
-}
-
-Sequence< OUString > SOEvaluation::GetSupportedServiceNames()
-{
-    sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *)) - 1;
-    Sequence< OUString > aResult( nSize );
-
-    for( sal_Int32 i = 0; i < nSize; i++ )
-        aResult[i] = OUString::createFromAscii( interfaces[i] );
-    return aResult;
-}
-
-Reference< XInterface >  SAL_CALL SOEvaluation::CreateInstance(
-    const Reference< XMultiServiceFactory >& rSMgr )
-{
-    static osl::Mutex   aMutex;
-    if ( pSOEval == 0 )
-    {
-        osl::MutexGuard guard( aMutex );
-        if ( pSOEval == 0 )
-            return (XComponent*) ( new SOEvaluation( rSMgr ) );
-    }
-    return (XComponent*)0;
-}
-
-SOEvaluation::SOEvaluation( const Reference< XMultiServiceFactory >& xFactory ) :
-    m_aListeners( m_aMutex ),
-    m_xServiceManager( xFactory )
-{
-}
-
-SOEvaluation::~SOEvaluation()
-{
-}
-
-// XComponent
-void SAL_CALL SOEvaluation::dispose() throw ( RuntimeException )
-{
-    EventObject aObject;
-    aObject.Source = (XComponent*)this;
-    m_aListeners.disposeAndClear( aObject );
-}
-
-void SAL_CALL SOEvaluation::addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException )
-{
-    m_aListeners.addInterface( aListener );
-}
-
-void SAL_CALL SOEvaluation::removeEventListener( const Reference< XEventListener > & aListener ) throw ( RuntimeException )
-{
-    m_aListeners.removeInterface( aListener );
-}
-
-// XExactName
-rtl::OUString SAL_CALL SOEvaluation::getExactName( const rtl::OUString& rApproximateName ) throw ( RuntimeException )
-{
-    // get the tabreg service for an evaluation version
-    // without this service office shouldn't run at all
-    OUString aTitle = rApproximateName;
-    OUString aEval;
-    sal_Bool bExpired = sal_True;
-    Reference < XMaterialHolder > xHolder( m_xServiceManager->createInstance(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.tab.tabreg" ) ) ), UNO_QUERY );
-    if ( xHolder.is() )
-    {
-        // get a sequence of strings for the defined locales
-        // a registered version doesn't provide data
-        bExpired = sal_False;
-        Any aData = xHolder->getMaterial();
-        Sequence < NamedValue > aSeq;
-        if ( aData >>= aSeq )
-        {
-            // this is an evaluation version, because it provides "material"
-            bExpired = sal_True;
-            for (int i=0; i<aSeq.getLength(); i++ )
-            {
-                NamedValue& rValue = aSeq[i];
-                if ( rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("expired")) )
-                    rValue.Value >>= bExpired;
-                else if (rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("title")) )
-                    rValue.Value >>= aEval;
-            }
-            // append eval string to title
-            aTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + aEval;
-            if ( bExpired )
-                throw RuntimeException();
-        }
-    }
-
-    return aTitle;
-}
-
-// XMaterialHolder
-Any SAL_CALL SOEvaluation::getMaterial() throw( RuntimeException )
-{
-    // Time bomb implementation. Return empty Any to do nothing or
-    // provide a com::sun::star::util::Date with the time bomb date.
-    Any a;
-
-    // change here to force recompile 00002
-#ifdef TIMEBOMB
-    // Code for extracting/providing time bomb date!
-    int nDay   = TIMEBOMB % 100;
-    int nMonth = ( TIMEBOMB % 10000 ) / 100;
-    int nYear  = TIMEBOMB / 10000;
-    com::sun::star::util::Date  aDate( nDay, nMonth, nYear );
-    a <<= aDate;
-#endif
-    return a;
-}
-
-// XServiceInfo
-::rtl::OUString SAL_CALL SOEvaluation::getImplementationName()
-throw ( RuntimeException )
-{
-    return SOEvaluation::GetImplementationName();
-}
-
-sal_Bool SAL_CALL SOEvaluation::supportsService( const ::rtl::OUString& rServiceName )
-throw ( RuntimeException )
-{
-    sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *))-1;
-
-    for( sal_Int32 i = 0; i < nSize; i++ )
-        if ( rServiceName.equalsAscii( interfaces[i] ))
-            return sal_True;
-    return sal_False;
-}
-
-Sequence< ::rtl::OUString > SAL_CALL SOEvaluation::getSupportedServiceNames()
-throw ( RuntimeException )
-{
-    return SOEvaluation::GetSupportedServiceNames();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/evaluation.hxx b/desktop/source/so_comp/evaluation.hxx
deleted file mode 100644
index aff94c3ac6f4..000000000000
--- a/desktop/source/so_comp/evaluation.hxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/* makefile.mk changed 20030409, LO */
-
-#ifndef _SOCOMP_EVALUATION_HXX_
-#define _SOCOMP_EVALUATION_HXX_
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/beans/XMaterialHolder.hpp>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/interfacecontainer.h>
-
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <osl/mutex.hxx>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-
-namespace desktop {
-
-class SOEvaluation : public ::cppu::WeakImplHelper4< XExactName, XMaterialHolder, XComponent, XServiceInfo >
-{
-    ::osl::Mutex                        m_aMutex;
-    ::cppu::OInterfaceContainerHelper   m_aListeners;
-    Reference< XMultiServiceFactory >   m_xServiceManager;
-
-public:
-                            SOEvaluation( const Reference < XMultiServiceFactory >& xFactory );
-    virtual                 ~SOEvaluation();
-
-    static Reference< XSingleServiceFactory >   GetSOEvaluationFactory( Reference< XMultiServiceFactory > & xSMgr );
-    static ::rtl::OUString                      GetImplementationName();
-    static Sequence< rtl::OUString >            GetSupportedServiceNames();
-
-    // XComponent
-    virtual void SAL_CALL               dispose() throw ( RuntimeException );
-    virtual void SAL_CALL               addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException );
-    virtual void SAL_CALL               removeEventListener(const Reference< XEventListener > & aListener) throw ( RuntimeException );
-
-    // XExactName
-    virtual rtl::OUString SAL_CALL      getExactName( const rtl::OUString& rApproximateName ) throw ( RuntimeException );
-
-    // XMaterialHolder
-    virtual Any SAL_CALL                getMaterial() throw ( RuntimeException );
-
-    // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL    getImplementationName() throw ( RuntimeException );
-    virtual sal_Bool SAL_CALL           supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException );
-    virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException );
-
-    static const char* interfaces[];
-    static const char* implementationName;
-    static const char* serviceName;
-    static Reference<XInterface> SAL_CALL CreateInstance(
-        const Reference< XMultiServiceFactory >&);
-
-
-
-};
-}
-#endif // _SOCOMP_EVALUATION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk
deleted file mode 100755
index 4d8d479b9658..000000000000
--- a/desktop/source/so_comp/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=desktop
-TARGET=socomp
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	$(SLO)$/evaluation.obj \
-            $(SLO)$/oemjob.obj \
-            $(SLO)$/services.obj 
-
-SHL1DEPN=	makefile.mk
-SHL1OBJS=	$(SLOFILES) 
-
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
-    $(FWELIB)           \
-    $(VCLLIB)           \
-    $(SVLLIB)           \
-    $(SVTOOLLIB)        \
-    $(COMPHELPERLIB)    \
-    $(UNOTOOLSLIB)      \
-    $(TOOLSLIB)			\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/socomp.component
-
-$(MISC)/socomp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        socomp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt socomp.component
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
deleted file mode 100644
index bdb45e5eb0a7..000000000000
--- a/desktop/source/so_comp/oemjob.cxx
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "oemjob.hxx"
-#include <rtl/bootstrap.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/file.hxx>
-#include <unotools/bootstrap.hxx>
-#include <tools/config.hxx>
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::util;
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::Bootstrap;
-
-namespace desktop{
-
-char const OEM_PRELOAD_SECTION[] = "Bootstrap";
-char const OEM_PRELOAD[]         = "Preload";
-char const STR_TRUE[]            = "1";
-char const STR_FALSE[]           = "0";
-
-const char* OEMPreloadJob::interfaces[] =
-{
-    "com.sun.star.task.XJob",
-    NULL,
-};
-const char* OEMPreloadJob::implementationName = "com.sun.star.comp.desktop.OEMPreloadJob";
-const char* OEMPreloadJob::serviceName = "com.sun.star.office.OEMPreloadJob";
-
-OUString OEMPreloadJob::GetImplementationName()
-{
-    return OUString::createFromAscii(implementationName);
-}
-
-Sequence< OUString > OEMPreloadJob::GetSupportedServiceNames()
-{
-    sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *)) - 1;
-    Sequence< OUString > aResult( nSize );
-
-    for( sal_Int32 i = 0; i < nSize; i++ )
-        aResult[i] = OUString::createFromAscii( interfaces[i] );
-    return aResult;
-}
-
-Reference< XInterface >  SAL_CALL OEMPreloadJob::CreateInstance(
-    const Reference< XMultiServiceFactory >& rSMgr )
-{
-    static osl::Mutex   aMutex;
-        osl::MutexGuard guard( aMutex );
-        return (XComponent*) ( new OEMPreloadJob( rSMgr ) );
-}
-
-OEMPreloadJob::OEMPreloadJob( const Reference< XMultiServiceFactory >& xFactory ) :
-    m_aListeners( m_aMutex ),
-    m_xServiceManager( xFactory )
-{
-}
-
-OEMPreloadJob::~OEMPreloadJob()
-{
-}
-
-// XComponent
-void SAL_CALL OEMPreloadJob::dispose() throw ( RuntimeException )
-{
-    EventObject aObject;
-    aObject.Source = (XComponent*)this;
-    m_aListeners.disposeAndClear( aObject );
-}
-
-void SAL_CALL OEMPreloadJob::addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException )
-{
-    m_aListeners.addInterface( aListener );
-}
-
-void SAL_CALL OEMPreloadJob::removeEventListener( const Reference< XEventListener > & aListener ) throw ( RuntimeException )
-{
-    m_aListeners.removeInterface( aListener );
-}
-
-// XServiceInfo
-::rtl::OUString SAL_CALL OEMPreloadJob::getImplementationName()
-throw ( RuntimeException )
-{
-    return OEMPreloadJob::GetImplementationName();
-}
-
-sal_Bool SAL_CALL OEMPreloadJob::supportsService( const ::rtl::OUString& rServiceName )
-throw ( RuntimeException )
-{
-    sal_Int32 nSize = sizeof( interfaces ) / sizeof( const char *);
-
-    for( sal_Int32 i = 0; i < nSize; i++ )
-        if ( rServiceName.equalsAscii( interfaces[i] ))
-            return sal_True;
-    return sal_False;
-}
-
-Sequence< ::rtl::OUString > SAL_CALL OEMPreloadJob::getSupportedServiceNames()
-throw ( RuntimeException )
-{
-    return OEMPreloadJob::GetSupportedServiceNames();
-}
-
-// XJob
-Any SAL_CALL OEMPreloadJob::execute(const Sequence<NamedValue>&)
-throw ( RuntimeException )
-{
-    sal_Bool bCont = sal_False;
-    // are we an OEM version at all?
-    if (checkOEMPreloadFlag())
-    {
-        // create OEM preload service dialog
-        Reference <XExecutableDialog> xDialog( m_xServiceManager->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.preload.OEMPreloadWizard"))),
-            UNO_QUERY );
-        if ( xDialog.is() ){
-            // execute OEM preload dialog and check return value
-            if ( xDialog->execute() == ExecutableDialogResults::OK ) {
-                // user accepted.
-                // make sure the job does not get called again.
-                bCont = sal_True;
-                disableOEMPreloadFlag();
-            } else {
-                // user declined...
-                // terminate.
-                bCont = sal_False;
-            }
-        }
-    } else {
-        // don't try again
-        bCont = sal_True;
-    }
-    Any r;
-    r <<= bCont;
-    return r;
-}
-
-static sal_Bool existsURL( OUString const& _sURL )
-{
-    using namespace osl;
-    DirectoryItem aDirItem;
-
-    if (_sURL.getLength() != 0)
-        return ( DirectoryItem::get( _sURL, aDirItem ) == DirectoryItem::E_None );
-
-    return sal_False;
-}
-
-// locate soffice.ini/.rc file
-static OUString locateIniFile()
-{
-    OUString aUserDataPath;
-    OUString aSofficeIniFileURL;
-
-    // Retrieve the default file URL for the soffice.ini/rc
-    Bootstrap().getIniName( aSofficeIniFileURL );
-
-    if ( utl::Bootstrap::locateUserData( aUserDataPath ) == utl::Bootstrap::PATH_EXISTS )
-    {
-        const char CONFIG_DIR[] = "/config";
-
-        sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/');
-        if ( nIndex > 0 )
-        {
-            OUString        aUserSofficeIniFileURL;
-            OUStringBuffer  aBuffer( aUserDataPath );
-            aBuffer.appendAscii( CONFIG_DIR );
-            aBuffer.append( aSofficeIniFileURL.copy( nIndex ));
-            aUserSofficeIniFileURL = aBuffer.makeStringAndClear();
-
-            if ( existsURL( aUserSofficeIniFileURL ))
-                return aUserSofficeIniFileURL;
-        }
-    }
-    // Fallback try to use the soffice.ini/rc from program folder
-    return aSofficeIniFileURL;
-}
-
-// check whether the OEMPreload flag was set in soffice.ini/.rc
-sal_Bool OEMPreloadJob::checkOEMPreloadFlag()
-{
-    OUString aSofficeIniFileURL;
-    aSofficeIniFileURL = locateIniFile();
-    Config aConfig(aSofficeIniFileURL);
-    aConfig.SetGroup( OEM_PRELOAD_SECTION );
-    ByteString sResult = aConfig.ReadKey( OEM_PRELOAD );
-    if ( sResult == STR_TRUE )
-        return sal_True;
-    else
-        return sal_False;
-}
-
-void OEMPreloadJob::disableOEMPreloadFlag()
-{
-    OUString aSofficeIniFileURL = locateIniFile();
-    if ( aSofficeIniFileURL.getLength() > 0 )
-    {
-        Config aConfig(aSofficeIniFileURL);
-        aConfig.SetGroup( OEM_PRELOAD_SECTION );
-        aConfig.WriteKey( OEM_PRELOAD, STR_FALSE );
-        aConfig.Flush();
-    }
-}
-
-} // namespace desktop
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/oemjob.hxx b/desktop/source/so_comp/oemjob.hxx
deleted file mode 100644
index 140ee0e9af10..000000000000
--- a/desktop/source/so_comp/oemjob.hxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SOCOMP_OEMJOB_HXX_
-#define _SOCOMP_OEMJOB_HXX_
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/interfacecontainer.h>
-
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <osl/mutex.hxx>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::task;
-
-namespace desktop{
-
-class OEMPreloadJob : public ::cppu::WeakImplHelper3< XJob, XComponent, XServiceInfo >
-{
-
-private:
-    ::osl::Mutex                        m_aMutex;
-    ::cppu::OInterfaceContainerHelper   m_aListeners;
-    Reference< XMultiServiceFactory >   m_xServiceManager;
-
-    sal_Bool checkOEMPreloadFlag();
-    void disableOEMPreloadFlag();
-
-public:
-    OEMPreloadJob( const Reference < XMultiServiceFactory >& xFactory );
-    virtual ~OEMPreloadJob();
-
-    static ::rtl::OUString                      GetImplementationName();
-    static Sequence< rtl::OUString >            GetSupportedServiceNames();
-
-
-    // XComponent
-    virtual void SAL_CALL dispose() throw ( RuntimeException );
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException );
-    virtual void SAL_CALL removeEventListener(const Reference< XEventListener > & aListener) throw ( RuntimeException );
-
-    // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL    getImplementationName() throw ( RuntimeException );
-    virtual sal_Bool SAL_CALL           supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException );
-    virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException );
-
-    //XJob
-    virtual Any SAL_CALL execute(const Sequence<NamedValue>& args)throw ( RuntimeException );
-
-
-    static const char* interfaces[];
-    static const char* implementationName;
-    static const char* serviceName;
-    static Reference<XInterface> SAL_CALL CreateInstance(
-        const Reference< XMultiServiceFactory >&);
-
-
-};
-}
-
-#endif // _SOCOMP_OEMJOB_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
deleted file mode 100644
index 014df23af2b6..000000000000
--- a/desktop/source/so_comp/services.cxx
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-
-#include "evaluation.hxx"
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <uno/environment.h>
-#include <cppuhelper/factory.hxx>
-#include <unotools/configmgr.hxx>
-
-#include "oemjob.hxx"
-#include "evaluation.hxx"
-
-#include <string.h>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::registry;
-using namespace ::desktop;
-
-using ::rtl::OUString;
-
-static const char* pServices[] =
-{
-    SOEvaluation::serviceName,
-    OEMPreloadJob::serviceName,
-    NULL
-};
-
-static const char* pImplementations[] =
-{
-    SOEvaluation::implementationName,
-    OEMPreloadJob::implementationName,
-    NULL
-};
-
-typedef Reference<XInterface>(* fProvider)(const Reference<XMultiServiceFactory>&);
-
-static const fProvider pInstanceProviders[] =
-{
-    SOEvaluation::CreateInstance,
-    OEMPreloadJob::CreateInstance,
-    NULL
-};
-
-static const char** pSupportedServices[] =
-{
-    SOEvaluation::interfaces,
-    OEMPreloadJob::interfaces,
-    NULL
-};
-
-static Sequence<OUString>
-getSupportedServiceNames(int p) {
-    const char **names = pSupportedServices[p];
-    Sequence<OUString> aSeq;
-    for(int i = 0; names[i] != NULL; i++) {
-        aSeq.realloc(i+1);
-        aSeq[i] = OUString::createFromAscii(names[i]);
-    }
-    return aSeq;
-}
-
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char** ppEnvironmentTypeName,
-    uno_Environment**)
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
-    const sal_Char* pImplementationName,
-    void* pServiceManager,
-    void*)
-{
-    // Set default return value for this operation - if it failed.
-    if  ( pImplementationName && pServiceManager )
-    {
-        Reference< XSingleServiceFactory > xFactory;
-        Reference< XMultiServiceFactory > xServiceManager(
-            reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-
-        // search implementation
-        for (int i = 0; (pImplementations[i]!=NULL); i++) {
-            if ( strcmp(pImplementations[i], pImplementationName ) == 0 ) {
-                // found implementation
-                xFactory = Reference<XSingleServiceFactory>(cppu::createSingleFactory(
-                    xServiceManager, OUString::createFromAscii(pImplementationName),
-                    pInstanceProviders[i], getSupportedServiceNames(i)));
-                if ( xFactory.is() ) {
-                    // Factory is valid - service was found.
-                    xFactory->acquire();
-                    return xFactory.get();
-                }
-            }
-        } // for()
-    }
-    // Return with result of this operation.
-    return NULL;
-}
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/so_comp/socomp.component b/desktop/source/so_comp/socomp.component
deleted file mode 100755
index a53035223c39..000000000000
--- a/desktop/source/so_comp/socomp.component
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<component loader="com.sun.star.loader.SharedLibrary"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.desktop.Evaluation">
-    <service name="com.sun.star.office.Evaluation"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.desktop.OEMPreloadJob">
-    <service name="com.sun.star.office.OEMPreloadJob"/>
-  </implementation>
-</component>