[Libreoffice-commits] core.git: framework/Library_fwm.mk framework/source

[Julien Nabet (via logerrit)]

 framework/Library_fwm.mk                |    4 ++++
 framework/source/jobs/helponstartup.cxx |   25 +++++--------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

New commits:
commit a503b7af8314bad4d8a1cc1288e809f642782170
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Dec 22 20:30:08 2019 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Dec 23 11:48:26 2019 +0100

    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 at collabora.co.uk>

diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index 7c979f5a3c5d..c671daab0b9b 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_Library_Library,fwm))
 
 $(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
 
+$(eval $(call gb_Library_use_custom_headers,fwm,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_set_include,fwm,\
     -I$(SRCDIR)/framework/inc \
     -I$(SRCDIR)/framework/source/inc \
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