4 files changed, 8 insertions, 7 deletions
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 5ab03ab10e8f..004cd59383af 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 
+#include <comphelper/configuration.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/mediadescriptor.hxx>
@@ -490,7 +491,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
 
     impl_appendComponentTitle   (sTitle, xComponent);
 #ifndef MACOSX
-    if (!utl::ConfigManager::IsFuzzing())
+    if (!comphelper::IsFuzzing())
     {
         // fdo#70376: We want the window title to contain just the
         // document name (from the above "component title").
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 61806538585b..f1c450bd6530 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -33,7 +33,7 @@
 
 #include <comphelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <unotools/configmgr.hxx>
+#include <comphelper/configuration.hxx>
 #include <unotools/configpaths.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
@@ -127,7 +127,7 @@ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::uno::XComponent
 
 void JobExecutor::initListeners()
 {
-    if (utl::ConfigManager::IsFuzzing())
+    if (comphelper::IsFuzzing())
         return;
 
     // read the list of all currently registered events inside configuration.
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 12a45fa93117..6560af7f1eb3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -58,7 +58,7 @@
 #include <sal/log.hxx>
 #include <comphelper/errcode.hxx>
 #include <vcl/threadex.hxx>
-#include <unotools/configmgr.hxx>
+#include <comphelper/configuration.hxx>
 
 namespace framework{
 
@@ -673,7 +673,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
     if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") )
         aCommand = aURL.Path;
 
-    if (!m_xCommandOptions && !utl::ConfigManager::IsFuzzing())
+    if (!m_xCommandOptions && !comphelper::IsFuzzing())
         m_xCommandOptions.reset(new SvtCommandOptions);
 
     // Make std::unordered_map lookup if the current URL is in the disabled list
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index ce48cfd44123..f2e5758b90e1 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/enumhelper.hxx>
-#include <unotools/configmgr.hxx>
+#include <comphelper/configuration.hxx>
 #include <utility>
 
 namespace {
@@ -128,7 +128,7 @@ private:
 ModuleManager::ModuleManager(css::uno::Reference< css::uno::XComponentContext >  xContext)
     : m_xContext(std::move(xContext))
 {
-    if (!utl::ConfigManager::IsFuzzing())
+    if (!comphelper::IsFuzzing())
     {
         m_xCFG.set( comphelper::ConfigurationHelper::openConfig(
                     m_xContext, "/org.openoffice.Setup/Office/Factories",