From b11bd0323ee3dc44c6f343d1eed00151e02e9851 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 14 Nov 2011 11:49:31 +0100
Subject: Removed comphelper -> unotools processfactory.hxx duplication.

---
 framework/inc/pch/precompiled_framework.hxx        | 1 -
 framework/source/fwe/classes/framelistanalyzer.cxx | 6 +++---
 framework/source/loadenv/loadenv.cxx               | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'framework')

diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index 9dc3898bb3d3..19db302200c5 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -444,7 +444,6 @@
 #include "unotools/configpathes.hxx"
 #include "unotools/intlwrapper.hxx"
 #include "unotools/localfilehelper.hxx"
-#include "unotools/processfactory.hxx"
 #include "unotools/streamwrap.hxx"
 #include "unotools/tempfile.hxx"
 #include "unotools/ucbstreamhelper.hxx"
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index 25c7f921bbd9..e0ab6cb3fef2 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -47,7 +47,7 @@
 
 //_______________________________________________
 //  includes of other projects
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 
 //_______________________________________________
@@ -158,7 +158,7 @@ void FrameListAnalyzer::impl_analyze()
     {
         try
         {
-            css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory();
+            css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
             css::uno::Reference< css::frame::XModuleManager > xModuleMgr(xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW);
             ::rtl::OUString sModule = xModuleMgr->identify(m_xReferenceFrame);
             m_bReferenceIsBacking = (sModule.equals(SERVICENAME_STARTMODULE));
@@ -229,7 +229,7 @@ void FrameListAnalyzer::impl_analyze()
             {
                 try
                 {
-                    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory();
+                    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
                     css::uno::Reference< css::frame::XModuleManager > xModuleMgr(xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY);
                     ::rtl::OUString sModule = xModuleMgr->identify(xFrame);
                     if (sModule.equals(SERVICENAME_STARTMODULE))
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index f12d0561f436..61c520d4d67b 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -92,7 +92,7 @@
 #include <toolkit/unohlp.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -705,7 +705,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
     }
 
     // following operatons can work on an internal type name only :-(
-    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory();
+    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
     css::uno::Reference< css::document::XTypeDetection > xDetect(xSMGR->createInstance(SERVICENAME_TYPEDETECTION), css::uno::UNO_QUERY);
 
     ::rtl::OUString sType = xDetect->queryTypeByURL(sURL);
-- 
cgit