summaryrefslogtreecommitdiff
path: root/ucbhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-05-02 16:41:06 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-05-02 16:55:29 +0200
commit5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5 (patch)
tree9a163219cb9c32b8f945ce9ad71219b06f62aa90 /ucbhelper
parent9911ee515dd3d1e077dbf9c1fb4fd5c42a3c49b6 (diff)
Cleaned up CommandLineArgs
* Support for dead arguments has been removed. ** Especially, dead UCB_CONFIGURATION_KEY1/2_xxx values have also been removed, and code initializing UCB has been simplified accordingly. * For the sake of simplicity, behaviour has been changed slightly. For example, passing both --calc --writer now always lets --writer win (whereas in the past the one mentioned first, i.e., --calc in this example, would win). Change-Id: Id40a19b9ef96db0d439cadd96ba491bf640d28fb
Diffstat (limited to 'ucbhelper')
-rw-r--r--ucbhelper/inc/ucbhelper/configurationkeys.hxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/ucbhelper/inc/ucbhelper/configurationkeys.hxx b/ucbhelper/inc/ucbhelper/configurationkeys.hxx
index d99f5788c1d3..2fe5d8ae352d 100644
--- a/ucbhelper/inc/ucbhelper/configurationkeys.hxx
+++ b/ucbhelper/inc/ucbhelper/configurationkeys.hxx
@@ -34,12 +34,7 @@
accessed in the configuration database.
*/
#define UCB_CONFIGURATION_KEY1_LOCAL "Local"
-#define UCB_CONFIGURATION_KEY1_SERVER "Server"
-#define UCB_CONFIGURATION_KEY2_UNIVERSAL_CONTENT_BROKER \
- "UniversalContentBroker"
#define UCB_CONFIGURATION_KEY2_OFFICE "Office"
-#define UCB_CONFIGURATION_KEY2_WEB_SERVER "WebServer"
-#define UCB_CONFIGURATION_KEY2_CLIENT_ACCESS "ClientAccess"
#endif // _UCBHELPER_CONFIGURATIONKEYS_HXX_