diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:24 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:24 +0200 |
| commit | f18378b2d9d6a5996322231fc6618ab2ea2d9906 (patch) | |
| tree | 06d2b5ded42cb7b467d1bcc4076183820195a086 /framework | |
| parent | 34d4fb1fe53d819880561b4062b71dedca770095 (diff) | |
| parent | c385e76c10b173b9820967825f0ce0c6fb71e9dd (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/lomenubar/exports.cxx | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx index 85570118d19d..8ee63aa3e4c5 100644 --- a/framework/source/lomenubar/exports.cxx +++ b/framework/source/lomenubar/exports.cxx @@ -53,37 +53,12 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& extern "C" { -//================================================================================================== SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName, uno_Environment** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -//================================================================================================== -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*pServiceManager*/, - void* pRegistryKey ) -{ - if (!pRegistryKey) - return sal_False; - - try - { - css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY); - - writeInfo( xKey, DESKTOPJOB_IMPLEMENTATION_NAME, DESKTOPJOB_SERVICE_NAME); - writeInfo( xKey, FRAMEJOB_IMPLEMENTATION_NAME, FRAMEJOB_SERVICE_NAME); - - return sal_True; - } - catch(const css::registry::InvalidRegistryException&) - { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } - - return sal_False; -} - -//================================================================================================== SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName , void* pServiceManager, void* /*pRegistryKey*/ ) |