summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/Library_sb.mk1
-rw-r--r--basic/source/inc/dlgcont.hxx3
-rw-r--r--basic/source/inc/scriptcont.hxx4
-rw-r--r--basic/source/uno/dlgcont.cxx22
-rw-r--r--basic/source/uno/sbservices.cxx50
-rw-r--r--basic/source/uno/sbservices.hxx35
-rw-r--r--basic/source/uno/scriptcont.cxx22
-rw-r--r--basic/util/sb.component6
8 files changed, 19 insertions, 124 deletions
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index eefe8e0b5320..36c1be94ac40 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -93,7 +93,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/uno/modsizeexceeded \
basic/source/uno/namecont \
basic/source/uno/sbmodule \
- basic/source/uno/sbservices \
basic/source/uno/scriptcont \
basic/source/runtime/comenumwrapper \
basic/source/runtime/ddectrl \
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 4259674e5b28..33155afec22a 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -94,9 +94,6 @@ public:
// Service
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static();
static OUString getImplementationName_static();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create
- ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceManager )
- throw( ::com::sun::star::uno::Exception );
};
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 116e05cc1357..2f21441d5175 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -125,10 +125,6 @@ public:
// Service
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static();
static OUString getImplementationName_static();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create
- ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceManager )
- throw( ::com::sun::star::uno::Exception );
-
};
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index b9d128b91355..6f22b9560cce 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/document/GraphicObjectResolver.hpp>
#include "dlgcont.hxx"
#include "sbmodule.hxx"
-#include "sbservices.hxx"
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <osl/mutex.hxx>
@@ -450,11 +449,6 @@ SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) thr
// Service
-void createRegistryInfo_SfxDialogLibraryContainer()
-{
- static OAutoRegistration< SfxDialogLibraryContainer > aAutoRegistration;
-}
-
OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException, std::exception)
{
return getImplementationName_static();
@@ -479,14 +473,6 @@ OUString SfxDialogLibraryContainer::getImplementationName_static()
return OUString("com.sun.star.comp.sfx2.DialogLibraryContainer");
}
-Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Reference< XComponentContext >& ) throw( Exception )
-{
- Reference< XInterface > xRet =
- static_cast< XInterface* >( static_cast< OWeakObject* >(new SfxDialogLibraryContainer()) );
- return xRet;
-}
-
-
// Implementation class SfxDialogLibrary
@@ -608,4 +594,12 @@ bool SAL_CALL SfxDialogLibrary::isLibraryElementValid( ::com::sun::star::uno::An
}
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation(::com::sun::star::uno::XComponentContext*,
+ ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new basic::SfxDialogLibraryContainer());
+}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
deleted file mode 100644
index e3eafb958ea4..000000000000
--- a/basic/source/uno/sbservices.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- 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 "sbservices.hxx"
-
-namespace basic
-{
- static void initializeModule()
- {
- static bool bInitialized( false );
- if ( !bInitialized )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !bInitialized )
- {
- createRegistryInfo_SfxDialogLibraryContainer();
- createRegistryInfo_SfxScriptLibraryContainer();
- }
- }
- }
-
-
-} // namespace basic
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sb_component_getFactory(
- const sal_Char* pImplementationName, void*, void* )
-{
- ::basic::initializeModule();
- return ::basic::BasicModule::getInstance().getComponentFactory( pImplementationName );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/uno/sbservices.hxx b/basic/source/uno/sbservices.hxx
deleted file mode 100644
index a344b27f734a..000000000000
--- a/basic/source/uno/sbservices.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- 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_SBSERVICES_HXX
-#define INCLUDED_BASIC_SOURCE_UNO_SBSERVICES_HXX
-
-#include <sal/config.h>
-
-namespace basic {
-
-void createRegistryInfo_SfxDialogLibraryContainer();
-
-void createRegistryInfo_SfxScriptLibraryContainer();
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 43da15a09699..73bcbec7c1d1 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -19,7 +19,6 @@
#include "scriptcont.hxx"
#include "sbmodule.hxx"
-#include "sbservices.hxx"
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
@@ -1191,11 +1190,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString&
// Service
-void createRegistryInfo_SfxScriptLibraryContainer()
-{
- static OAutoRegistration< SfxScriptLibraryContainer > aAutoRegistration;
-}
-
OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( )
throw (RuntimeException, std::exception)
{
@@ -1222,14 +1216,6 @@ OUString SfxScriptLibraryContainer::getImplementationName_static()
return OUString("com.sun.star.comp.sfx2.ScriptLibraryContainer" );
}
-Reference< XInterface > SAL_CALL SfxScriptLibraryContainer::Create( const Reference< XComponentContext >& )
- throw( Exception )
-{
- Reference< XInterface > xRet = static_cast< XInterface* >( static_cast< OWeakObject* >(new SfxScriptLibraryContainer()) );
- return xRet;
-}
-
-
// Implementation class SfxScriptLibrary
// Ctor
@@ -1352,9 +1338,15 @@ void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
mModuleInfos.erase( mModuleInfos.find( ModuleName ) );
}
+} // namespace basic
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation(::com::sun::star::uno::XComponentContext*,
+ ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new basic::SfxScriptLibraryContainer());
+}
-} // namespace basic
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/util/sb.component b/basic/util/sb.component
index 15e99982e151..710c37f35f1a 100644
--- a/basic/util/sb.component
+++ b/basic/util/sb.component
@@ -19,11 +19,13 @@
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
prefix="sb" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer">
+ <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer"
+ constructor="com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation">
<service name="com.sun.star.script.DialogLibraryContainer"/>
<service name="com.sun.star.script.DocumentDialogLibraryContainer"/>
</implementation>
- <implementation name="com.sun.star.comp.sfx2.ScriptLibraryContainer">
+ <implementation name="com.sun.star.comp.sfx2.ScriptLibraryContainer"
+ constructor="com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation">
<service name="com.sun.star.script.DocumentScriptLibraryContainer"/>
<service name="com.sun.star.script.ScriptLibraryContainer"/>
</implementation>
generated by cgit (git 2.34.1) at 2024-06-11 00:23:29 +0000