Remove SvtStartOptions

...the single remaining user can use officecfg/Setup.hxx instead.

Change-Id: Icc1b56d820a9fcd7ecc52e279bcdde3aac4499d4

3 files changed, 12 insertions, 5 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 0a4c071cb869..dfa74c4dfe0c 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -32,6 +32,10 @@
 #include <com/sun/star/uno/Reference.h>
 #include <osl/mutex.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 using namespace com::sun::star::task;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -131,7 +135,9 @@ class Desktop : public Application
             // throws an exception upon failure
 
     private:
-        void                    RegisterServices();
+        void RegisterServices(
+            com::sun::star::uno::Reference<
+                com::sun::star::uno::XComponentContext > const & context);
         void                    DeregisterServices();
 
         void                    CreateTemporaryDirectory();
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cfa6a52b313a..34ef4c439236 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1447,7 +1447,7 @@ int Desktop::Main()
     Reference< XDesktop > xDesktop;
     try
     {
-        RegisterServices();
+        RegisterServices(comphelper::getProcessComponentContext());
 
         SetSplashScreenProgress(25);
 
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);
         }