diff options
author | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2010-11-21 15:28:10 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-11-22 12:10:30 +0000 |
commit | f3eb77586e067a46211334a78987652815f47744 (patch) | |
tree | 640886220e29602e113c0553286a70bf38e389ba /extensions/workben | |
parent | 9140ff3adcb0d34bdaef8fb8b73c96947c592ec0 (diff) |
further removing of dead code
Hello,
here in components some other pieces to delete. Again some small parts
in case I was to generous in deleting.
regards
>From 1535d5e774e7d1ef08696344be8fcdfc6828f2c3 Mon Sep 17 00:00:00 2001
From: pjacquod <pjacquod@alumni.ethz.ch>
Date: Sun, 21 Nov 2010 12:10:15 +0100
Subject: [PATCH 1/5] remove dead code components workben
Diffstat (limited to 'extensions/workben')
-rw-r--r-- | extensions/workben/testpgp.cxx | 93 |
1 files changed, 2 insertions, 91 deletions
diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index 6027a68e4d70..0773dc711646 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -512,75 +512,6 @@ inline rtl::OWString S2U (const sal_Char *ascii) return rtl::OWString::createFromAscii (ascii); } -#if 0 /* OLD */ - -/* - * queryModuleActivator. - */ -BOOL queryModuleActivator ( - const XServiceManagerRef &rxManager, - XServiceActivatorRef &rxActivator) -{ - XServiceProviderRef xProv; - XInterfaceRef xProvInst; - - xProv = rxManager->queryServiceProvider ( - L"stardiv.uno.ServiceActivator.module"); - if (!xProv.is()) - { - printf ("Error: no ServiceActivator service.\n"); - return FALSE; - } - - xProvInst = xProv->createInstance(); - if (!xProvInst.is()) - { - printf ("Error: no ServiceActivator instance.\n"); - return FALSE; - } - - return xProvInst->queryInterface ( - XServiceActivator::getSmartUik(), rxActivator); -} - -/* - * install. - */ -BOOL install ( - const XServiceActivatorRef &rxActivator, - const char *prefix) -{ - String aModule ("module://"); - char pBuffer[1024]; - - vos:ORealDynamicLoader::computeModuleName ( - prefix, pBuffer, sizeof(pBuffer)); - aModule += pBuffer; - - return rxActivator->install ( - StringToUString (aModule, CHARSET_SYSTEM)); -} - -/* - * uninstall. - */ -BOOL uninstall ( - const XServiceActivatorRef &rxActivator, - const char *prefix) -{ - String aModule ("module://"); - char pBuffer[1024]; - - vos::ORealDynamicLoader::computeModuleName ( - prefix, pBuffer, sizeof(pBuffer)); - aModule += pBuffer; - - return rxActivator->deinstall ( - StringToUString (aModule, CHARSET_SYSTEM)); -} - -#endif /* OLD */ - /* * main. */ @@ -675,17 +606,7 @@ int SAL_CALL main (int argc, char **argv) if (nOptions & OPTION_INSTALL) { -#if 0 /* OLD */ - XServiceActivatorRef xActivator; - if (queryModuleActivator (xManager, xActivator)) - { - if (install (xActivator, "pgp")) - printf ("Module PGP installed.\n"); - else - printf ("Error: module PGP not installed.\n"); - } - nOptions &= ~OPTION_INSTALL; -#endif /* OLD */ + } if (nOptions & (OPTION_DECRYPT | OPTION_ENCRYPT | OPTION_SIGN)) @@ -823,17 +744,7 @@ int SAL_CALL main (int argc, char **argv) if (nOptions & OPTION_UNINSTALL) { -#if 0 /* OLD */ - XServiceActivatorRef xActivator; - if (queryModuleActivator (xManager, xActivator)) - { - if (uninstall (xActivator, "pgp")) - printf ("Module PGP uninstalled.\n"); - else - printf ("Error: module PGP not uninstalled.\n"); - } - nOptions &= ~OPTION_UNINSTALL; -#endif /* OLD */ + } return 0; |