summaryrefslogtreecommitdiff
path: root/framework/source/jobs
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2019-12-22 20:30:08 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-23 11:48:26 +0100
commita503b7af8314bad4d8a1cc1288e809f642782170 (patch)
tree4e02e34338ed95241ad3761af994664954649f84 /framework/source/jobs
parent4501ea4283524fea6cd196456d21ab82bba44dd2 (diff)
tdf#46037: remove configurationhelper in framework/helponstartup
Change-Id: I56b3e0351255e2b73871d69189338fdf3a97e9be Reviewed-on: https://gerrit.libreoffice.org/85716 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/jobs')
-rw-r--r--framework/source/jobs/helponstartup.cxx25
1 files changed, 5 insertions, 20 deletions
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index b5c38a86c641..60dfa421fddc 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -22,8 +22,10 @@
#include <services.h>
#include <targets.h>
+#include <officecfg/Office/Common.hxx>
+#include <officecfg/Setup.hxx>
+
// include others
-#include <comphelper/configurationhelper.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
@@ -53,28 +55,11 @@ DEFINE_INIT_SERVICE(HelpOnStartup,
m_xDesktop = css::frame::Desktop::create(m_xContext);
- m_xConfig.set(
- ::comphelper::ConfigurationHelper::openConfig(
- m_xContext,
- "/org.openoffice.Setup/Office/Factories",
- ::comphelper::EConfigurationModes::ReadOnly),
- css::uno::UNO_QUERY_THROW);
-
// ask for office locale
- ::comphelper::ConfigurationHelper::readDirectKey(
- m_xContext,
- "/org.openoffice.Setup",
- "L10N",
- "ooLocale",
- ::comphelper::EConfigurationModes::ReadOnly) >>= m_sLocale;
+ m_sLocale = officecfg::Setup::L10N::ooLocale::get(m_xContext);
// detect system
- ::comphelper::ConfigurationHelper::readDirectKey(
- m_xContext,
- "/org.openoffice.Office.Common",
- "Help",
- "System",
- ::comphelper::EConfigurationModes::ReadOnly) >>= m_sSystem;
+ m_sSystem = officecfg::Office::Common::Help::System::get(m_xContext);
// Start listening for disposing events of these services,
// so we can react e.g. for an office shutdown