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.

---
 linguistic/source/convdic.cxx    |  6 +++---
 linguistic/source/convdicxml.cxx |  1 -
 linguistic/source/convdicxml.hxx |  5 +++--
 linguistic/source/dicimp.cxx     |  6 +++---
 linguistic/source/gciterator.cxx |  6 +++---
 linguistic/source/hhconvdic.cxx  |  1 -
 linguistic/source/hyphdsp.cxx    | 13 +++++++------
 linguistic/source/iprcache.cxx   |  1 -
 linguistic/source/lngopt.cxx     |  1 -
 linguistic/source/lngsvcmgr.cxx  | 14 +++++++-------
 linguistic/source/misc.cxx       | 11 ++++++-----
 linguistic/source/misc2.cxx      |  4 ++--
 linguistic/source/spelldsp.cxx   | 10 +++++-----
 linguistic/source/spelldta.cxx   |  1 -
 linguistic/source/thesdsp.cxx    |  6 +++---
 linguistic/workben/sspellimp.cxx |  1 -
 16 files changed, 42 insertions(+), 45 deletions(-)

(limited to 'linguistic')

diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index c1b59ed974be..bd484a0e05d2 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -39,7 +39,7 @@
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
@@ -91,7 +91,7 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
         return;
     DBG_ASSERT(!INetURLObject( rMainURL ).HasError(), "invalid URL");
 
-    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
 
     // get xInputStream stream
     uno::Reference< io::XInputStream > xIn;
@@ -266,7 +266,7 @@ void ConvDic::Save()
         return;
     DBG_ASSERT(!INetURLObject( aMainURL ).HasError(), "invalid URL");
 
-    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
 
     // get XOutputStream stream
     uno::Reference< io::XStream > xStream;
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 56ddd94f4487..58900271c127 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -35,7 +35,6 @@
 #include <i18npool/mslangid.hxx>
 #include <tools/stream.hxx>
 #include <osl/mutex.hxx>
-#include <unotools/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 
 #include <cppuhelper/factory.hxx>   // helper for factories
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 998b40a00d29..6e9026e97350 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <comphelper/processfactory.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <cppuhelper/implbase3.hxx>
@@ -56,7 +57,7 @@ public:
     ConvDicXMLExport( ConvDic &rConvDic,
         const rtl::OUString &rFileName,
         com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler) :
-        SvXMLExport ( utl::getProcessServiceFactory(), rFileName,
+        SvXMLExport ( comphelper::getProcessServiceFactory(), rFileName,
                       ::com::sun::star::util::MeasureUnit::CM, rHandler ),
         rDic        ( rConvDic ),
         bSuccess    ( sal_False )
@@ -96,7 +97,7 @@ public:
 
     //!!  see comment for pDic member
     ConvDicXMLImport( ConvDic *pConvDic, const rtl::OUString /*&rFileName*/ ) :
-        SvXMLImport ( utl::getProcessServiceFactory(), IMPORT_ALL ),
+        SvXMLImport ( comphelper::getProcessServiceFactory(), IMPORT_ALL ),
         pDic        ( pConvDic )
     {
         nLanguage       = LANGUAGE_NONE;
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 462e2da3c782..22927eb4d163 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -40,7 +40,7 @@
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -275,7 +275,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
     if (rMainURL.getLength() == 0)
         return 0;
 
-    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
 
     // get XInputStream stream
     uno::Reference< io::XInputStream > xStream;
@@ -419,7 +419,7 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL)
         return 0;
     DBG_ASSERT(!INetURLObject( rURL ).HasError(), "lng : invalid URL");
 
-    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
 
     // get XOutputStream stream
     uno::Reference< io::XStream > xStream;
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 5939b1d97152..3385b73ebc5d 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -62,7 +62,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/factory.hxx>
 #include <i18npool/mslangid.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
 
 #include <deque>
@@ -454,7 +454,7 @@ uno::Reference< linguistic2::XProofreader > GrammarCheckingIterator::GetGrammarC
             try
             {
                 uno::Reference< lang::XMultiServiceFactory > xMgr(
-                        utl::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+                        comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
                 uno::Reference< linguistic2::XProofreader > xGC(
                         xMgr->createInstance( aSvcImplName ), uno::UNO_QUERY_THROW );
                 uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xGC, uno::UNO_QUERY_THROW );
@@ -989,7 +989,7 @@ uno::Reference< util::XChangesBatch > GrammarCheckingIterator::GetUpdateAccess()
         {
             // get configuration provider
             uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider;
-            uno::Reference< lang::XMultiServiceFactory > xMgr = utl::getProcessServiceFactory();
+            uno::Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
             if (xMgr.is())
             {
                 xConfigurationProvider = uno::Reference< lang::XMultiServiceFactory > (
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 706005a68c62..aabcc86ff9ce 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -36,7 +36,6 @@
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <osl/mutex.hxx>
-#include <unotools/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 
 #include <cppuhelper/factory.hxx>   // helper for factories
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index d745b10f4d4e..d1137ee29e71 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -39,7 +39,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <osl/mutex.hxx>
 
 #include "hyphdsp.hxx"
@@ -47,8 +47,6 @@
 #include "linguistic/lngprops.hxx"
 #include "lngsvcmgr.hxx"
 
-
-using namespace utl;
 using namespace osl;
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
@@ -342,7 +340,8 @@ Reference< XHyphenatedWord > SAL_CALL
             {
                 Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray();
 
-                Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
+                Reference< XMultiServiceFactory > xMgr(
+                    comphelper::getProcessServiceFactory() );
                 if (xMgr.is())
                 {
                     // build service initialization argument
@@ -477,7 +476,8 @@ Reference< XHyphenatedWord > SAL_CALL
             {
                 Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray();
 
-                Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
+                Reference< XMultiServiceFactory > xMgr(
+                    comphelper::getProcessServiceFactory() );
                 if (xMgr.is())
                 {
                     // build service initialization argument
@@ -607,7 +607,8 @@ Reference< XPossibleHyphens > SAL_CALL
             {
                 Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray();
 
-                Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
+                Reference< XMultiServiceFactory > xMgr(
+                    comphelper::getProcessServiceFactory() );
                 if (xMgr.is())
                 {
                     // build service initialization argument
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index 60fead4a3374..b473d94eb57c 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
-#include <unotools/processfactory.hxx>
 #include <linguistic/lngprops.hxx>
 
 using namespace utl;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index cafaba97bb60..85bbfdcb78f8 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <unotools/processfactory.hxx>
 #include <i18npool/mslangid.hxx>
 
 using namespace utl;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 0893c0719436..11454a72c43e 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -39,7 +39,7 @@
 
 #include <tools/solar.h>
 #include <unotools/lingucfg.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <i18npool/lang.h>
 #include <i18npool/mslangid.hxx>
 #include <cppuhelper/factory.hxx>
@@ -87,7 +87,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
 {
     uno::Sequence< lang::Locale > aRes;
 
-    uno::Reference< lang::XMultiServiceFactory >  xFac( utl::getProcessServiceFactory() );
+    uno::Reference< lang::XMultiServiceFactory >  xFac( comphelper::getProcessServiceFactory() );
     sal_Int32 nNames = rSvcImplNames.getLength();
     if (nNames  &&  xFac.is())
     {
@@ -682,7 +682,7 @@ void LngSvcMgr::GetGrammarCheckerDsp_Impl( sal_Bool bSetSvcList  )
         try
         {
             uno::Reference< lang::XMultiServiceFactory > xMgr(
-                    utl::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+                    comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
             xGCI = uno::Reference< linguistic2::XProofreadingIterator >(
                     xMgr->createInstance( A2OU( SN_GRAMMARCHECKINGITERATOR ) ), uno::UNO_QUERY_THROW );
         }
@@ -733,7 +733,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
     {
         pAvailSpellSvcs = new SvcInfoArray;
 
-        uno::Reference< lang::XMultiServiceFactory >  xFac( utl::getProcessServiceFactory() );
+        uno::Reference< lang::XMultiServiceFactory >  xFac( comphelper::getProcessServiceFactory() );
         if (xFac.is())
         {
             uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xFac, uno::UNO_QUERY );
@@ -799,7 +799,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
     {
         pAvailGrammarSvcs = new SvcInfoArray;
 
-        uno::Reference< lang::XMultiServiceFactory >  xFac( utl::getProcessServiceFactory() );
+        uno::Reference< lang::XMultiServiceFactory >  xFac( comphelper::getProcessServiceFactory() );
         if (xFac.is())
         {
             uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xFac, uno::UNO_QUERY );
@@ -864,7 +864,7 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl()
     if (!pAvailHyphSvcs)
     {
         pAvailHyphSvcs = new SvcInfoArray;
-        uno::Reference< lang::XMultiServiceFactory >  xFac( utl::getProcessServiceFactory() );
+        uno::Reference< lang::XMultiServiceFactory >  xFac( comphelper::getProcessServiceFactory() );
         if (xFac.is())
         {
             uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xFac, uno::UNO_QUERY );
@@ -930,7 +930,7 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl()
     {
         pAvailThesSvcs = new SvcInfoArray;
 
-        uno::Reference< lang::XMultiServiceFactory >  xFac( utl::getProcessServiceFactory() );
+        uno::Reference< lang::XMultiServiceFactory >  xFac( comphelper::getProcessServiceFactory() );
         if (xFac.is())
         {
             uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xFac, uno::UNO_QUERY );
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 0bc393605752..d32517a13a25 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/linguistic2/DictionaryType.hpp>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 
@@ -61,7 +61,6 @@
 #include "linguistic/hyphdta.hxx"
 #include <i18npool/mslangid.hxx>
 
-using namespace utl;
 using namespace osl;
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
@@ -90,7 +89,7 @@ osl::Mutex &    GetLinguMutex()
 LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang )
 {
     static LocaleDataWrapper aLclDtaWrp(
-                getProcessServiceFactory(),
+                comphelper::getProcessServiceFactory(),
                 CreateLocale( SvtSysLocale().GetUILanguage() ) );
 
     const Locale &rLcl = aLclDtaWrp.getLoadedLocale();
@@ -789,7 +788,8 @@ uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName )
 
     if (pServiceName)
     {
-        uno::Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
+        uno::Reference< XMultiServiceFactory > xMgr(
+            comphelper::getProcessServiceFactory() );
         if (xMgr.is())
         {
             try
@@ -838,7 +838,8 @@ AppExitListener::AppExitListener()
 {
     // add object to Desktop EventListeners in order to properly call
     // the AtExit function at appliction exit.
-    uno::Reference< XMultiServiceFactory > xMgr = getProcessServiceFactory();
+    uno::Reference< XMultiServiceFactory > xMgr(
+        comphelper::getProcessServiceFactory() );
 
     if (xMgr.is())
     {
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index 4bfcb74e9551..d8b6014bcc45 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -34,7 +34,7 @@
 #include <ucbhelper/content.hxx>
 #include <tools/debug.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/ucbhelper.hxx>
@@ -81,7 +81,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl(
     rtl::OUString                    aWritablePath;
 
     bool bSuccess = true;
-    uno::Reference< lang::XMultiServiceFactory >  xMgr( utl::getProcessServiceFactory() );
+    uno::Reference< lang::XMultiServiceFactory >  xMgr( comphelper::getProcessServiceFactory() );
     if (xMgr.is())
     {
         try
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 97f96ce227b4..b5f6439c241c 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -36,7 +36,7 @@
 
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
 #include <osl/mutex.hxx>
@@ -48,8 +48,6 @@
 #include "lngsvcmgr.hxx"
 #include "linguistic/lngprops.hxx"
 
-
-using namespace utl;
 using namespace osl;
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
@@ -393,7 +391,8 @@ sal_Bool SpellCheckerDispatcher::isValid_Impl(
             const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray();
             Reference< XSpellChecker >  *pRef  = pEntry->aSvcRefs .getArray();
 
-            Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
+            Reference< XMultiServiceFactory > xMgr(
+                comphelper::getProcessServiceFactory() );
             if (xMgr.is())
             {
                 // build service initialization argument
@@ -576,7 +575,8 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
             const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray();
             Reference< XSpellChecker >  *pRef  = pEntry->aSvcRefs .getArray();
 
-            Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
+            Reference< XMultiServiceFactory > xMgr(
+                comphelper::getProcessServiceFactory() );
             if (xMgr.is())
             {
                 // build service initialization argument
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 90d1d6092318..681f2ada74ab 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <tools/debug.hxx>
-#include <unotools/processfactory.hxx>
 #include <osl/mutex.hxx>
 
 #include <vector>
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 7e4f72308597..8e144e395a74 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -35,13 +35,12 @@
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
 #include <osl/mutex.hxx>
 
 #include "thesdsp.hxx"
 #include "linguistic/lngprops.hxx"
 
-using namespace utl;
 using namespace osl;
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
@@ -177,7 +176,8 @@ Sequence< Reference< XMeaning > > SAL_CALL
             const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray();
             Reference< XThesaurus > *pRef = pEntry->aSvcRefs.getArray();
 
-            Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
+            Reference< XMultiServiceFactory > xMgr(
+                comphelper::getProcessServiceFactory() );
             if (xMgr.is())
             {
                 // build service initialization argument
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index bed18d9df855..aa3c8d2ec5d3 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <tools/debug.hxx>
-#include <unotools/processfactory.hxx>
 #include <osl/mutex.hxx>
 
 #include <sspellimp.hxx>
-- 
cgit