diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-12 17:53:48 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-12 17:59:13 +0200 |
commit | a90983bd658b6f69a353ccdf0d332ed280b69711 (patch) | |
tree | af1364059594ed162c721c3cd29810567b2c8ec8 /framework | |
parent | 01ea434011fdf868c612539179bb30aedb0495d0 (diff) |
Remove component_getImplementationEnvironment methods
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/macros/registration.hxx | 12 | ||||
-rw-r--r-- | framework/source/lomenubar/exports.cxx | 6 | ||||
-rw-r--r-- | framework/source/register/register3rdcomponents.cxx | 4 | ||||
-rw-r--r-- | framework/source/register/registerlogindialog.cxx | 4 | ||||
-rw-r--r-- | framework/source/register/registerservices.cxx | 4 | ||||
-rw-r--r-- | framework/source/register/registertemp.cxx | 4 |
6 files changed, 0 insertions, 34 deletions
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 74ab29d2c4bf..94815f726b75 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -57,7 +57,6 @@ Please use follow public macros only! IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) - COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment() COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() _________________________________________________________________________________________________________________*/ @@ -79,17 +78,6 @@ ________________________________________________________________________________ //***************************************************************************************************************** // public -// define helper to get information about service environment -//***************************************************************************************************************** -#define COMPONENTGETIMPLEMENTATIONENVIRONMENT \ - extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName , \ - uno_Environment** ) \ - { \ - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; \ - } - -//***************************************************************************************************************** -// public // define method to instanciate new services //***************************************************************************************************************** #define COMPONENTGETFACTORY( IFFACTORIES ) \ diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx index a6b789b7ac16..c4fd5389bd8b 100644 --- a/framework/source/lomenubar/exports.cxx +++ b/framework/source/lomenubar/exports.cxx @@ -54,12 +54,6 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL lomenubar_component_getImplementationEnvironment(const sal_Char** ppEnvTypeName, - uno_Environment** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void* SAL_CALL lomenubar_component_getFactory(const sal_Char* pImplName , void* pServiceManager, void* /*pRegistryKey*/ ) diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index c4fa80798507..a045ea7cba0f 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -46,8 +46,6 @@ #include <service2.hxx> #endif - COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -58,8 +56,6 @@ #include <dispatch/systemexec.hxx> #include <jobs/shelljob.hxx> -COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else IFFACTORY( ::framework::TabWinFactory ) else IFFACTORY( ::framework::SystemExec ) else diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index c0f54947e8e3..f9d7e0091960 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -47,8 +47,6 @@ #include <service2.hxx> #endif - COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -57,8 +55,6 @@ #include <services/logindialog.hxx> -COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) ) diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index a69f44a03f2d..54695d733e0c 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -44,8 +44,6 @@ #include <service2.hxx> #endif - COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -91,8 +89,6 @@ #include <services/substitutepathvars.hxx> #include <services/pathsettings.hxx> -COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 9680c2c288ff..b420fdfe02cd 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -46,8 +46,6 @@ #include <service2.hxx> #endif - COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -76,8 +74,6 @@ #include <uielement/toolbarsmenucontroller.hxx> #include <uielement/popupmenucontroller.hxx> -COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else |