diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-05-02 16:41:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-05-02 16:55:29 +0200 |
| commit | 5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5 (patch) | |
| tree | 9a163219cb9c32b8f945ce9ad71219b06f62aa90 /svx | |
| parent | 9911ee515dd3d1e077dbf9c1fb4fd5c42a3c49b6 (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 'svx')
| -rw-r--r-- | svx/source/gengal/gengal.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index ce923fb6104b..00c55676026f 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -224,15 +224,11 @@ void GalApp::Init() void GalApp::InitUCB() { rtl::OUString aEmpty; - Sequence< Any > aArgs(6); + Sequence< Any > aArgs(2); aArgs[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL)); aArgs[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE)); - aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE")); - aArgs[3] <<= aEmpty; - aArgs[4] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL")); - aArgs[5] <<= aEmpty; if (! ::ucbhelper::ContentBroker::initialize( xMSF, aArgs ) ) fprintf( stderr, "Failed to init content broker\n" ); |