diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 12:13:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 12:13:57 +0100 |
| commit | 4b5e98967f62607d3c6f75ea2490bac4787cc62b (patch) | |
| tree | 05aead98ad05a2d3b57085f2619d5fa014cc5957 /desktop/source/app/appinit.cxx | |
| parent | 79080b68f3d367e1ef82155d221e221b2a96a4c8 (diff) | |
Remove SvtStartOptions
...the single remaining user can use officecfg/Setup.hxx instead.
Change-Id: Icc1b56d820a9fcd7ecc52e279bcdde3aac4499d4
Diffstat (limited to 'desktop/source/app/appinit.cxx')
| -rw-r--r-- | desktop/source/app/appinit.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 06b65782bd67..7012243704fc 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -38,6 +38,7 @@ #include <uno/current_context.hxx> #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/bootstrap.hxx> +#include <officecfg/Setup.hxx> #include <osl/file.hxx> #include <osl/module.h> #include <rtl/uri.hxx> @@ -53,7 +54,6 @@ #include <unotools/ucbhelper.hxx> #include <unotools/tempfile.hxx> #include <vcl/svapp.hxx> -#include <unotools/startoptions.hxx> #include <unotools/pathoptions.hxx> #include <unotools/internaloptions.hxx> @@ -119,7 +119,7 @@ void Desktop::InitApplicationServiceManager() comphelper::setProcessServiceFactory(sm); } -void Desktop::RegisterServices() +void Desktop::RegisterServices(Reference< XComponentContext > const & context) { if( !m_bServicesRegistered ) { @@ -137,7 +137,8 @@ void Desktop::RegisterServices() Application::EnableHeadlessMode(false); // read accept string from configuration - rtl::OUString conDcpCfg(SvtStartOptions().GetConnectionURL()); + OUString conDcpCfg( + officecfg::Setup::Office::ooSetupConnectionURL::get(context)); if (!conDcpCfg.isEmpty()) { createAcceptor(conDcpCfg); } |