Clean up previous commit

Change-Id: Iddade9d297be8f4a4e69b3bec5ab7588bf68c112

basic/Library_sb.mk

@@ -92,7 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 	basic/source/uno/dlgcont \
 	basic/source/uno/modsizeexceeded \
 	basic/source/uno/namecont \
-	basic/source/uno/sbmodule \
 	basic/source/uno/scriptcont \
 	basic/source/runtime/comenumwrapper \
 	basic/source/runtime/ddectrl \

basic/source/inc/dlgcont.hxx

@@ -91,9 +91,6 @@ public:
     // XLibraryQueryExecutable
     virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&)
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    // Service
-    static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static();
-    static OUString getImplementationName_static();
 };
 
 

basic/source/inc/scriptcont.hxx

@@ -121,10 +121,6 @@ public:
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-    // Service
-    static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static();
-    static OUString getImplementationName_static();
 };
 
 

basic/source/uno/dlgcont.cxx

@@ -32,7 +32,6 @@
 #include <com/sun/star/resource/StringResourceWithLocation.hpp>
 #include <com/sun/star/document/GraphicObjectResolver.hpp>
 #include "dlgcont.hxx"
-#include "sbmodule.hxx"
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <osl/mutex.hxx>
@@ -451,15 +450,10 @@ SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) thr
 
 OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException, std::exception)
 {
-    return getImplementationName_static();
+    return OUString("com.sun.star.comp.sfx2.DialogLibraryContainer");
 }
 
 Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
-{
-    return getSupportedServiceNames_static();
-}
-
-Sequence< OUString > SfxDialogLibraryContainer::getSupportedServiceNames_static()
 {
     Sequence< OUString > aServiceNames( 2 );
     aServiceNames[0] = "com.sun.star.script.DocumentDialogLibraryContainer";
@@ -468,12 +462,6 @@ Sequence< OUString > SfxDialogLibraryContainer::getSupportedServiceNames_static(
     return aServiceNames;
 }
 
-OUString SfxDialogLibraryContainer::getImplementationName_static()
-{
-    return OUString("com.sun.star.comp.sfx2.DialogLibraryContainer");
-}
-
-
 // Implementation class SfxDialogLibrary
 
 // Ctor

basic/source/uno/sbmodule.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sbmodule.hxx"
-#include <rtl/instance.hxx>
-
-
-namespace basic
-{
-
-
-    struct BasicModuleCreator
-    {
-        BasicModule m_aBasicModule;
-    };
-    namespace
-    {
-        class theBasicModuleInstance : public rtl::Static<BasicModuleCreator, theBasicModuleInstance> {};
-    }
-
-    BasicModule::BasicModule()
-        :BaseClass()
-    {
-    }
-
-    BasicModule& BasicModule::getInstance()
-    {
-        return theBasicModuleInstance::get().m_aBasicModule;
-    }
-
-
-} // namespace basic
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

basic/source/uno/sbmodule.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
-#define INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
-
-#include <comphelper/componentmodule.hxx>
-
-
-namespace basic
-{
-
-
-    class BasicModule : public ::comphelper::OModule
-    {
-        friend struct BasicModuleCreator;
-        typedef ::comphelper::OModule BaseClass;
-
-    public:
-        static BasicModule& getInstance();
-
-    private:
-        BasicModule();
-    };
-
-    /* -------------------------------------------------------------------- */
-    class BasicModuleClient : public ::comphelper::OModuleClient
-    {
-    private:
-        typedef ::comphelper::OModuleClient BaseClass;
-
-    public:
-        BasicModuleClient() : BaseClass( BasicModule::getInstance() )
-        {
-        }
-    };
-
-    /* -------------------------------------------------------------------- */
-    template < class TYPE >
-    class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE >
-    {
-    private:
-        typedef ::comphelper::OAutoRegistration< TYPE > BaseClass;
-
-    public:
-        OAutoRegistration() : BaseClass( BasicModule::getInstance() )
-        {
-        }
-    };
-
-    /* -------------------------------------------------------------------- */
-    template < class TYPE >
-    class OSingletonRegistration : public ::comphelper::OSingletonRegistration< TYPE >
-    {
-    private:
-        typedef ::comphelper::OSingletonRegistration< TYPE > BaseClass;
-
-    public:
-        OSingletonRegistration() : BaseClass( BasicModule::getInstance() )
-        {
-        }
-    };
-
-
-} // namespace basic
-
-
-#endif // INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

basic/source/uno/scriptcont.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "scriptcont.hxx"
-#include "sbmodule.hxx"
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
@@ -1193,16 +1192,11 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString&
 OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( )
     throw (RuntimeException, std::exception)
 {
-    return getImplementationName_static();
+    return OUString("com.sun.star.comp.sfx2.ScriptLibraryContainer" );
 }
 
 Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceNames( )
     throw (RuntimeException, std::exception)
-{
-    return getSupportedServiceNames_static();
-}
-
-Sequence< OUString > SfxScriptLibraryContainer::getSupportedServiceNames_static()
 {
     Sequence< OUString > aServiceNames( 2 );
     aServiceNames[0] = "com.sun.star.script.DocumentScriptLibraryContainer";
@@ -1211,11 +1205,6 @@ Sequence< OUString > SfxScriptLibraryContainer::getSupportedServiceNames_static(
     return aServiceNames;
 }
 
-OUString SfxScriptLibraryContainer::getImplementationName_static()
-{
-    return OUString("com.sun.star.comp.sfx2.ScriptLibraryContainer" );
-}
-
 // Implementation class SfxScriptLibrary
 
 // Ctor

basic/util/sb.component

@@ -18,9 +18,9 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="sb" xmlns="http://openoffice.org/2010/uno-components">
+    xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer"
-       constructor="com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation">
+      constructor="com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation">
     <service name="com.sun.star.script.DialogLibraryContainer"/>
     <service name="com.sun.star.script.DocumentDialogLibraryContainer"/>
   </implementation>