summaryrefslogtreecommitdiff
path: root/desktop/inc
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 /desktop/inc
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 'desktop/inc')
-rw-r--r--desktop/inc/app.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 28b2c63d965a..0dfa7ca82ed2 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -148,7 +148,7 @@ class Desktop : public Application
static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > CreateApplicationServiceManager();
// returns a non-null reference or throws an exception
- void RegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr );
+ void RegisterServices();
void DeregisterServices();
void DestroyApplicationServiceManager( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr );