diff options
96 files changed, 128 insertions, 280 deletions
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx index 2845d35e3ef8..59037813cb04 100644 --- a/connectivity/inc/pch/precompiled_connectivity.hxx +++ b/connectivity/inc/pch/precompiled_connectivity.hxx @@ -324,7 +324,6 @@ #include "unotools/configmgr.hxx" #include "unotools/confignode.hxx" -#include "unotools/processfactory.hxx" #include "unotools/sharedunocomponent.hxx" #include "osl/mutex.hxx" diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index bb751a4c100f..6a94a086906f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index e5c741d4376a..8caeb751e71c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -61,7 +61,7 @@ static ::osl::Mutex m_aMetaMutex; #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdb/ErrorCondition.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index b56a373c0e5d..58e8cc06c73f 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -50,7 +50,7 @@ #include "MQuery.hxx" #include <MQueryHelper.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include "com/sun/star/mozilla/XProxyRunner.hpp" using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 2ef66e5fe52f..764248d9770d 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -38,7 +38,7 @@ #include "MTypeConverter.hxx" #include "MNSMozabProxy.hxx" #include <com/sun/star/uno/Reference.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #if OSL_DEBUG_LEVEL > 0 diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index 8ae9926c9377..45d4711c56ca 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <unotools/processfactory.hxx> #include <cppuhelper/servicefactory.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDriver.hpp> diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 1a49208148ec..f7de26e400f6 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <unotools/processfactory.hxx> #include <cppuhelper/servicefactory.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDriver.hpp> diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index 2f807d83399f..89d51f7fa731 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <unotools/processfactory.hxx> #include <cppuhelper/servicefactory.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDriver.hpp> diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 9436944924eb..3f305a627c2a 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -67,7 +67,7 @@ //----------------------------------------------- // include other projects -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <svtools/acceleratorexecute.hxx> #include <comphelper/processfactory.hxx> #include <svtools/svlbitm.hxx> @@ -850,7 +850,7 @@ void SfxAcceleratorConfigPage::InitAccCfg() try { // no - initialize this instance - m_xSMGR = ::utl::getProcessServiceFactory(); + m_xSMGR = ::comphelper::getProcessServiceFactory(); m_xUICmdDescription = css::uno::Reference< css::container::XNameAccess >(m_xSMGR->createInstance(SERVICE_UICMDDESCRIPTION), css::uno::UNO_QUERY_THROW); diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 6ae157ad4426..f2917e1f64d1 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -58,7 +58,7 @@ #include "cuires.hrc" #include <sfx2/app.hxx> #include <sfx2/minfitem.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/documentinfo.hxx> #include <svtools/imagemgr.hxx> #include <rtl/ustrbuf.hxx> diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index a9eb0dcd4fac..18e4aa4ca871 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -68,7 +68,6 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <unotools/processfactory.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 407a0c29d9bc..f1bd7f744377 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -28,7 +28,7 @@ #include <set> #include <map> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <tools/debug.hxx> #include <vcl/stdtext.hxx> @@ -57,7 +57,7 @@ typedef map< String, StrSet, ltstr > FilterMap; //================================================================================================== void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequence< rtl::OUString >& rPluginTypes ) { - Reference< XMultiServiceFactory > xMan( ::utl::getProcessServiceFactory() ); + Reference< XMultiServiceFactory > xMan( ::comphelper::getProcessServiceFactory() ); Reference< XPluginManager > xPMgr( xMan->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager") ) ), UNO_QUERY ); diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index daa7a324ab60..3f246d16342e 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -498,7 +498,6 @@ #include "unotools/configmgr.hxx" #include "unotools/confignode.hxx" #include "unotools/eventlisteneradapter.hxx" -#include "unotools/processfactory.hxx" #include "osl/mutex.hxx" diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx index 76707f723674..a98c50de48fb 100644 --- a/dbaccess/inc/pch/precompiled_dbaxml.hxx +++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx @@ -496,7 +496,6 @@ #include "unotools/configmgr.hxx" #include "unotools/confignode.hxx" #include "unotools/eventlisteneradapter.hxx" -#include "unotools/processfactory.hxx" #include "vos/mutex.hxx" diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index 76707f723674..a98c50de48fb 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -496,7 +496,6 @@ #include "unotools/configmgr.hxx" #include "unotools/confignode.hxx" #include "unotools/eventlisteneradapter.hxx" -#include "unotools/processfactory.hxx" #include "vos/mutex.hxx" diff --git a/dbaccess/inc/pch/precompiled_dbui.hxx b/dbaccess/inc/pch/precompiled_dbui.hxx index 3ab80e8fcccd..847a74c232f8 100644 --- a/dbaccess/inc/pch/precompiled_dbui.hxx +++ b/dbaccess/inc/pch/precompiled_dbui.hxx @@ -499,7 +499,6 @@ #include "unotools/configmgr.hxx" #include "unotools/confignode.hxx" #include "unotools/eventlisteneradapter.hxx" -#include "unotools/processfactory.hxx" #include "vos/mutex.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 753b0fa4e245..bc039514c055 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -77,7 +77,7 @@ #endif //_ADO_DATALINK_BROWSE_ #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 84b0b0ae09e9..0683659f35e8 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -45,7 +45,7 @@ #include "tools/getprocessworkingdir.hxx" #include "ucbhelper/contentbroker.hxx" #include "ucbhelper/configurationkeys.hxx" -#include "unotools/processfactory.hxx" +#include "comphelper/processfactory.hxx" #include "unotools/configmgr.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "cppuhelper/bootstrap.hxx" @@ -384,7 +384,7 @@ Reference<XComponentContext> bootstrapStandAlone( Reference<lang::XMultiServiceFactory> xServiceManager( xContext->getServiceManager(), UNO_QUERY_THROW ); // set global process service factory used by unotools config helpers - ::utl::setProcessServiceFactory( xServiceManager ); + ::comphelper::setProcessServiceFactory( xServiceManager ); // initialize the ucbhelper ucb, // because the package implementation uses it diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index afa7a3e9a800..81f0cc6ad79b 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -834,7 +834,6 @@ #include "unotools/configpathes.hxx" #include "unotools/configvaluecontainer.hxx" #include "unotools/localfilehelper.hxx" -#include "unotools/processfactory.hxx" #include "comphelper/servicehelper.hxx" #include "unotools/streamwrap.hxx" #include "unotools/textsearch.hxx" diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx index 7b266a1a7e6e..75145e2d4154 100644 --- a/extensions/inc/pch/precompiled_extensions.hxx +++ b/extensions/inc/pch/precompiled_extensions.hxx @@ -519,7 +519,6 @@ #include "unotools/configitem.hxx" #include "unotools/confignode.hxx" -#include "unotools/processfactory.hxx" #include "tools/fldunit.hxx" diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index 5f8158a3e760..1eb28d4eff4d 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -32,7 +32,6 @@ #include <osl/mutex.hxx> #include <tools/urlobj.hxx> #include <cppuhelper/weak.hxx> -#include <unotools/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index e759bc23d818..e905c0f33c9c 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_set_include,icg,\ )) $(eval $(call gb_Library_add_linked_libs,icg,\ + comphelper \ tk \ vcl \ utl \ diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 9d0a8855601e..282ca5aa481c 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -52,7 +52,7 @@ #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> #include <comphelper/sequenceasvector.hxx> #include <comphelper/locale.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 50a9df31df01..949b8cd11424 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -49,7 +49,7 @@ #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/style/HorizontalAlignment.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> #include "main.hxx" @@ -73,7 +73,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod maXDrawPages = aDrawPageSup->getDrawPages(); if ( maXDrawPages.is() ) { - maXServiceManagerSC = utl::getProcessServiceFactory(); + maXServiceManagerSC = comphelper::getProcessServiceFactory(); if ( maXServiceManagerSC.is() ) { uno::Any aAny( rModel->queryInterface( ::getCppuType((const uno::Reference< lang::XMultiServiceFactory >*)0) )); diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index b183108f4405..d5fd5864f74b 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -46,7 +46,6 @@ #include "vcl/svapp.hxx" #include "toolkit/awt/vclxdevice.hxx" #include "unotools/localfilehelper.hxx" -#include "unotools/processfactory.hxx" #include "svtools/FilterConfigItem.hxx" #include "svtools/filter.hxx" #include "svl/solar.hrc" diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx index 1951442ada6f..6c808fbb4dce 100644 --- a/forms/inc/pch/precompiled_forms.hxx +++ b/forms/inc/pch/precompiled_forms.hxx @@ -378,7 +378,6 @@ #include "unotools/desktopterminationobserver.hxx" #include "unotools/idhelper.hxx" -#include "unotools/processfactory.hxx" #include "unotools/streamhelper.hxx" #include "unotools/textsearch.hxx" #include "unotools/ucbstreamhelper.hxx" diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 1e6b22f42bf6..d50a21978839 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -62,7 +62,7 @@ #include <cppuhelper/typeprovider.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/interaction.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <memory> @@ -111,7 +111,7 @@ Submission::Submission() : msReplace( OUSTRING("none") ), msSeparator(), msIncludeNamespacePrefixes(), - m_aFactory(utl::getProcessServiceFactory()) + m_aFactory(comphelper::getProcessServiceFactory()) { initializePropertySet(); } diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index b3af353d554c..9fbbf7af8f92 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -35,7 +35,7 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> @@ -59,7 +59,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla return CSubmission::UNKNOWN_ERROR; try { - Reference< XMultiServiceFactory > xFactory = utl::getProcessServiceFactory(); + Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); if (aReplace.equalsIgnoreAsciiCaseAscii("all") || aReplace.equalsIgnoreAsciiCaseAscii("document")) { Reference< XComponentLoader > xLoader; if (aFrame.is()) diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx index b9e06d29f3a5..c790f4f23f62 100644 --- a/forms/source/xforms/submission/serialization_app_xml.cxx +++ b/forms/source/xforms/submission/serialization_app_xml.cxx @@ -32,7 +32,7 @@ #include "serialization.hxx" #include "serialization_app_xml.hxx" -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xml/dom/XNodeList.hpp> @@ -43,7 +43,7 @@ #include <libxml/tree.h> CSerializationAppXML::CSerializationAppXML() - : m_aFactory(utl::getProcessServiceFactory()) + : m_aFactory(comphelper::getProcessServiceFactory()) , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), CSS::uno::UNO_QUERY)) { diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx index 021acad5b830..6bc417b0cb31 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.cxx +++ b/forms/source/xforms/submission/serialization_urlencoded.cxx @@ -37,21 +37,20 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <stdio.h> #include "serialization_urlencoded.hxx" -using namespace utl; using namespace CSS::uno; using namespace CSS::io; using namespace CSS::xml::xpath; using namespace CSS::xml::dom; CSerializationURLEncoded::CSerializationURLEncoded() - : m_aFactory(getProcessServiceFactory()) + : m_aFactory(comphelper::getProcessServiceFactory()) , m_aPipe(Reference< XOutputStream > (m_aFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), UNO_QUERY)) { diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index d01fb8fb0aba..37e0e07d7a58 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -33,7 +33,7 @@ #include <rtl/ustring.h> #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Exception.hpp> @@ -142,7 +142,7 @@ public: CSubmission(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) : m_aURLObj(aURL) , m_aFragment(aFragment) - , m_aFactory(::utl::getProcessServiceFactory()) + , m_aFactory(::comphelper::getProcessServiceFactory()) {} virtual ~CSubmission() {} diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index e4b99f675af5..597b0cf74d2e 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -38,7 +38,6 @@ #include <rtl/strbuf.hxx> #include <rtl/string.hxx> #include <osl/file.hxx> -#include <unotools/processfactory.hxx> #include <ucbhelper/content.hxx> using namespace CSS::uno; diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index b991a31a420e..3fab778b7078 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -36,7 +36,6 @@ #include "serialization_urlencoded.hxx" #include <osl/file.hxx> -#include <unotools/processfactory.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/activedatasink.hxx> #include <com/sun/star/ucb/PostCommandArgument2.hpp> diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx index 6ffb98c6ac4a..be6a05e871f9 100644 --- a/forms/source/xforms/submission/submission_put.cxx +++ b/forms/source/xforms/submission/submission_put.cxx @@ -36,7 +36,6 @@ #include "serialization_urlencoded.hxx" #include <osl/file.hxx> -#include <unotools/processfactory.hxx> #include <ucbhelper/content.hxx> using namespace CSS::uno; diff --git a/forms/source/xforms/unohelper.cxx b/forms/source/xforms/unohelper.cxx index 475f366401a6..da32801a89ad 100644 --- a/forms/source/xforms/unohelper.cxx +++ b/forms/source/xforms/unohelper.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> using com::sun::star::uno::Reference; @@ -59,7 +59,7 @@ using rtl::OUString; Reference<XInterface> xforms::createInstance( const OUString& sServiceName ) { - Reference<XMultiServiceFactory> xFactory = utl::getProcessServiceFactory(); + Reference<XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); Reference<XInterface> xInstance = xFactory->createInstance( sServiceName ); 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); diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 615c4885cfe6..62b192ffc732 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> -#include <unotools/processfactory.hxx> #include <osl/mutex.hxx> #include <hyphen.h> diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx index e7bf20ff0e40..336b37363514 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.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 <dictmgr.hxx> diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 2d7aa3d2c8e9..4426a88ac553 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -36,7 +36,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 <lingutil.hxx> diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk index 1cbecd32dd83..068e71a50deb 100644 --- a/lingucomponent/source/thesaurus/libnth/makefile.mk +++ b/lingucomponent/source/thesaurus/libnth/makefile.mk @@ -74,6 +74,7 @@ SLOFILES= \ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ + $(COMPHELPERLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(TOOLSLIB) \ diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx index 1566b099ff33..6bb696e9fca7 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx @@ -30,7 +30,6 @@ #include "precompiled_lingucomponent.hxx" #include <com/sun/star/uno/Reference.h> #include <tools/debug.hxx> -#include <unotools/processfactory.hxx> #include <osl/mutex.hxx> #include "nthesdta.hxx" diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 161da6afef04..ab9e5431abfb 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> #include <unotools/pathoptions.hxx> #include <unotools/lingucfg.hxx> @@ -64,7 +64,6 @@ // XML-header to query SPELLML support #define SPELLML_SUPPORT "<?xml?>" -using namespace utl; using namespace osl; using namespace com::sun::star; using namespace com::sun::star::beans; @@ -82,7 +81,8 @@ using ::rtl::OUStringToOString; static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl() { uno::Reference< XLinguServiceManager > xRes; - uno::Reference< XMultiServiceFactory > xMgr = getProcessServiceFactory(); + uno::Reference< XMultiServiceFactory > xMgr( + comphelper::getProcessServiceFactory() ); if (xMgr.is()) { xRes = uno::Reference< XLinguServiceManager > ( xMgr->createInstance( 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> diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 2c1f826140bc..6add2fb92a0a 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -36,7 +36,6 @@ #include "informationdialog.hxx" #include <unotools/localfilehelper.hxx> -#include <unotools/processfactory.hxx> #include <vector> #include "com/sun/star/util/URL.hpp" #include "com/sun/star/util/XURLTransformer.hpp" diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 6fcc0d0ac1c1..e80c080ca2d9 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -624,7 +624,6 @@ #include "unotools/intlwrapper.hxx" #include "unotools/localedatawrapper.hxx" #include "unotools/localfilehelper.hxx" -#include "unotools/processfactory.hxx" #include "unotools/progresshandlerwrap.hxx" #include "unotools/streamhelper.hxx" #include "unotools/streamwrap.hxx" diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 869fd0fdc879..c354b5143192 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -63,7 +63,7 @@ #include <unotools/saveopt.hxx> #include <svl/stritem.hxx> #include <svl/itemprop.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> #include <sax/tools/converter.hxx> #include <xmloff/xmlnmspe.hxx> @@ -106,7 +106,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium) { sal_Bool bRet=sal_True; uno::Reference<lang::XMultiServiceFactory> - xServiceFactory(utl::getProcessServiceFactory()); + xServiceFactory(comphelper::getProcessServiceFactory()); OSL_ENSURE(xServiceFactory.is(),"got no service manager"); //Get model diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index a00fa3b6baaf..6ab4cbf79e82 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -58,7 +58,7 @@ one go*/ #include <unotools/saveopt.hxx> #include <svl/stritem.hxx> #include <svl/itemprop.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> #include <sax/tools/converter.hxx> #include <xmloff/xmlnmspe.hxx> @@ -101,7 +101,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) sal_uLong nError = ERRCODE_SFX_DOLOADFAILED; uno::Reference<lang::XMultiServiceFactory> xServiceFactory( - utl::getProcessServiceFactory()); + comphelper::getProcessServiceFactory()); OSL_ENSURE(xServiceFactory.is(), "XMLReader::Read: got no service manager"); if ( !xServiceFactory.is() ) return nError; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index fae257901e07..2cb17987b2ac 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -36,7 +36,7 @@ #include <svtools/ctrltool.hxx> #include <svl/itemprop.hxx> #include <unotools/localedatawrapper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <editeng/paperinf.hxx> #include <vcl/settings.hxx> #include <vcl/print.hxx> diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index 9f7e56a0591e..235ff7639a1b 100644 --- a/svl/inc/pch/precompiled_svl.hxx +++ b/svl/inc/pch/precompiled_svl.hxx @@ -418,7 +418,6 @@ #include <unotools/configpathes.hxx> #include <unotools/nativenumberwrapper.hxx> #include <unotools/numberformatcodewrapper.hxx> -#include <unotools/processfactory.hxx> #include <osl/mutex.hxx> diff --git a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx index 63a88e733efb..3422b1eee69f 100644 --- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/configurationhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> namespace css = ::com::sun::star; @@ -41,7 +41,7 @@ AccessibilityOptTest::AccessibilityOptTest() { m_xCfg = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - ::utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), s_sAccessibility, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx index 09eae2f5d37e..dde561d08406 100644 --- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx @@ -37,7 +37,7 @@ #include <comphelper/configurationhelper.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> namespace css = ::com::sun::star; @@ -390,7 +390,7 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getNewHi { m_xHistoriesXCU = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - ::utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), s_sHistories, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY_THROW); @@ -426,7 +426,7 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getOldHi { m_xCommonXCU = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - ::utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), s_sCommonHistory, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY_THROW); diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx index b02c7deba53b..c1f597a12e5c 100644 --- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/configurationhelper.hxx> namespace css = ::com::sun::star; @@ -52,7 +52,7 @@ PrintOptTest::PrintOptTest() { m_xCfg = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - ::utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")), ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx index 6ce70e0c5d0b..e251685bcb4c 100644 --- a/svtools/inc/pch/precompiled_svtools.hxx +++ b/svtools/inc/pch/precompiled_svtools.hxx @@ -418,7 +418,6 @@ #include <unotools/configpathes.hxx> #include <unotools/nativenumberwrapper.hxx> #include <unotools/numberformatcodewrapper.hxx> -#include <unotools/processfactory.hxx> #include <vcl/dndhelp.hxx> #include <tools/fldunit.hxx> diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 97a58b6b2ab3..3ce43078118f 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/configurationhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/loghelper.hxx> #include <svl/smplhint.hxx> @@ -115,7 +115,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl() { m_xCfg = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - utl::getProcessServiceFactory(), + comphelper::getProcessServiceFactory(), s_sAccessibility, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index bd12e9fb521f..641d1ac33f4a 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -51,7 +51,7 @@ #include <comphelper/configurationhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/loghelper.hxx> @@ -173,7 +173,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot) { m_xCfg = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - utl::getProcessServiceFactory(), + comphelper::getProcessServiceFactory(), ROOTNODE_PRINTOPTION, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx index 32674cc9850c..0ebf0292ed5c 100644 --- a/svtools/source/filter/FilterConfigCache.cxx +++ b/svtools/source/filter/FilterConfigCache.cxx @@ -32,7 +32,7 @@ #include <svtools/filter.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.h> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -46,7 +46,6 @@ using namespace ::com::sun::star::lang ; // XMultiServiceFactory using namespace ::com::sun::star::container ; // XNameAccess using namespace ::com::sun::star::uno ; // Reference using namespace ::com::sun::star::beans ; // PropertyValue -using namespace ::utl ; // getProcessServiceFactory(); using ::rtl::OUString; const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] = @@ -139,7 +138,8 @@ Reference< XInterface > openConfig(const char* sPackage) static OUString TYPEPKG( RTL_CONSTASCII_USTRINGPARAM( "types" ) ); static OUString FILTERPKG( RTL_CONSTASCII_USTRINGPARAM( "filters" ) ); - Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory(); + Reference< XMultiServiceFactory > xSMGR( + comphelper::getProcessServiceFactory() ); Reference< XInterface > xCfg; try { diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx index c6dbc5197ce8..b62decea2666 100644 --- a/svtools/source/filter/FilterConfigItem.cxx +++ b/svtools/source/filter/FilterConfigItem.cxx @@ -32,7 +32,7 @@ #include <tools/debug.hxx> #include <unotools/configmgr.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XChangesBatch.hpp> @@ -121,7 +121,8 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree ) { bModified = sal_False; - Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory(); // get global uno service manager + Reference< XMultiServiceFactory > xSMGR( + comphelper::getProcessServiceFactory() ); Reference< XMultiServiceFactory > xCfgProv( xSMGR->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) ) ), diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 5173aa8a2249..19b303405aa5 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -904,7 +904,6 @@ #include "unotools/configpathes.hxx" #include "unotools/configvaluecontainer.hxx" #include "unotools/localfilehelper.hxx" -#include "unotools/processfactory.hxx" #include "comphelper/servicehelper.hxx" #include "unotools/streamwrap.hxx" #include "unotools/textsearch.hxx" diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index be92ac7ebba9..0e19dbcfef3c 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -31,7 +31,7 @@ #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <ucbhelper/content.hxx> #include <tools/resmgr.hxx> #include <tools/urlobj.hxx> @@ -403,7 +403,7 @@ sal_Bool KillFile( const INetURLObject& rURL ) GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : mpFilter( pFilter ) { - uno::Reference< lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() ); + uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); if( xMgr.is() ) { diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index b154f630f1b4..3f25d7229edb 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -888,7 +888,6 @@ #include "unotools/intlwrapper.hxx" #include "unotools/localedatawrapper.hxx" #include "unotools/localfilehelper.hxx" -#include "unotools/processfactory.hxx" #include "unotools/streamwrap.hxx" #include "unotools/tempfile.hxx" #include "unotools/transliterationwrapper.hxx" diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 656fb20061ae..d44172314d42 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/linguistic2/XProofreadingIterator.hpp> #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <rtl/logfile.hxx> @@ -138,7 +138,7 @@ SV_IMPL_PTRARR( SwGrfFmtColls, SwGrfFmtCollPtr) { if (!m_xGCIterator.is() && SvtLinguConfig().HasGrammarChecker()) { - uno::Reference< lang::XMultiServiceFactory > xMgr( utl::getProcessServiceFactory() ); + uno::Reference< lang::XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() ); if (xMgr.is()) { try diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx index 2fe58eb1946f..46ad840409a5 100644 --- a/sw/source/core/doc/docxforms.cxx +++ b/sw/source/core/doc/docxforms.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/xforms/XModel.hpp> #include <com/sun/star/xforms/XFormsUIHelper1.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <tools/diagnose_ex.h> @@ -71,7 +71,7 @@ bool SwDoc::isXForms() const Reference<XInterface> lcl_createInstance( const sal_Char* pServiceName ) { OSL_ENSURE( pServiceName != NULL, "no service name" ); - return utl::getProcessServiceFactory()->createInstance( + return comphelper::getProcessServiceFactory()->createInstance( OUString::createFromAscii( pServiceName ) ); } diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index ae86b4de27e1..c537a3ae43fb 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -88,7 +88,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <rtl/ustring.hxx> @@ -762,7 +762,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) xFrame = pSfxViewFrame->GetFrame().GetFrameInterface(); com::sun::star::util::URL aURL; uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, UNO_QUERY ); - uno::Reference< lang::XMultiServiceFactory > xMgr( utl::getProcessServiceFactory(), uno::UNO_QUERY ); + uno::Reference< lang::XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); try { diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 3937493899d5..6b9f32bdb4e7 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -140,7 +140,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/misc/fontdefs \ unotools/source/misc/sharedunocomponent \ unotools/source/misc/syslocale \ - unotools/source/processfactory/processfactory \ unotools/source/streaming/streamhelper \ unotools/source/streaming/streamwrap \ unotools/source/ucbhelper/localfilehelper \ diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk index 2c62667b8d74..27a5cb375df9 100644 --- a/unotools/Package_inc.mk +++ b/unotools/Package_inc.mk @@ -82,7 +82,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/optionsdlg.hxx,unoto $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/options.hxx,unotools/options.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/pathoptions.hxx,unotools/pathoptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/printwarningoptions.hxx,unotools/printwarningoptions.hxx)) -$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/processfactory.hxx,unotools/processfactory.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/progresshandlerwrap.hxx,unotools/progresshandlerwrap.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/querydeep.hxx,unotools/querydeep.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/readwritemutexguard.hxx,unotools/readwritemutexguard.hxx)) diff --git a/unotools/inc/unotools/processfactory.hxx b/unotools/inc/unotools/processfactory.hxx deleted file mode 100644 index a9573ec7f401..000000000000 --- a/unotools/inc/unotools/processfactory.hxx +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#define _UNOTOOLS_PROCESSFACTORY_HXX_ - -#include "unotools/unotoolsdllapi.h" -#include <comphelper/processfactory.hxx> -#include <com/sun/star/uno/Reference.hxx> - -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; -} } } } - -namespace utl -{ - -/** - * This function set the process service factory. - * - * @author Juergen Schmidt - */ -UNOTOOLS_DLLPUBLIC void setProcessServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr); - -/** - * This function get the process service factory. If no service factory is set the function returns - * a null interface. - * - * @author Juergen Schmidt - */ -UNOTOOLS_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getProcessServiceFactory(); - -} - -#endif // _UNOTOOLS_PROCESSFACTORY_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index e11b99dc4d6a..6eb0288e8fa0 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -44,7 +44,7 @@ #include "rtl/ustring.hxx" #include "unotools/configitem.hxx" #include "unotools/configmgr.hxx" -#include "unotools/processfactory.hxx" +#include "comphelper/processfactory.hxx" namespace { @@ -76,7 +76,7 @@ css::uno::Reference< css::lang::XMultiServiceFactory > getConfigurationProvider() { return css::uno::Reference< css::lang::XMultiServiceFactory >( (css::uno::Reference< css::lang::XMultiServiceFactory >( - utl::getProcessServiceFactory(), css::uno::UNO_SET_THROW)-> + comphelper::getProcessServiceFactory(), css::uno::UNO_SET_THROW)-> createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index d6990fb40fa8..80a8eccc4bb6 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -53,7 +53,7 @@ #include <comphelper/configurationhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/loghelper.hxx> @@ -150,14 +150,14 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() { m_xCfg = Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( - utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), s_sHistories, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY ); m_xCommonXCU = Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( - utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), s_sCommonHistory, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY ); diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx index 1995a1a032c4..85a6ad65c680 100644 --- a/unotools/source/config/inetoptions.cxx +++ b/unotools/source/config/inetoptions.cxx @@ -51,7 +51,6 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <unotools/configitem.hxx> -#include <unotools/processfactory.hxx> #include <osl/diagnose.h> #include <salhelper/refobj.hxx> #include <rtl/logfile.hxx> diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index c5d3af5e8b27..89a1a815851d 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -33,7 +33,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> @@ -121,7 +121,7 @@ struct FactoryInfo { free(); // @@@ should be supplied from outside! - xSMgr = ::utl::getProcessServiceFactory(); + xSMgr = ::comphelper::getProcessServiceFactory(); } //--------------------------------------------------------------------------------------------------------- @@ -1366,7 +1366,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor) { - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory(); + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); if (!xSMGR.is()) return E_UNKNOWN_FACTORY; diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 28614e00975c..16588c783771 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -39,7 +39,7 @@ #include <osl/mutex.hxx> #include <comphelper/configurationhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <rtl/logfile.hxx> #include "itemholder1.hxx" @@ -594,7 +594,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() try { css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( - ::utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")), ::comphelper::ConfigurationHelper::E_READONLY); @@ -781,7 +781,7 @@ void SvtSaveOptions_Impl::Commit() PutProperties( aNames, aValues ); css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( - ::utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")), ::comphelper::ConfigurationHelper::E_STANDARD); diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index dc5599437b24..1fa7f79d2181 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -51,7 +51,7 @@ #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/util/ChangesEvent.hpp> #include <comphelper/configurationhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/loghelper.hxx> using namespace utl; @@ -181,7 +181,7 @@ SvtUserOptions_Impl::SvtUserOptions_Impl() : { m_xCfg = Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( - utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), s_sData, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY ); diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 9fe4aba17ed7..ae0cebf3c550 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -43,7 +43,7 @@ #include <rtl/ustrbuf.hxx> #include <unotools/configpathes.hxx> #include <comphelper/configurationhelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <itemholder1.hxx> @@ -361,7 +361,7 @@ SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const ::rtl::OUString& sList ) { m_xRoot = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - ::utl::getProcessServiceFactory(), + ::comphelper::getProcessServiceFactory(), PACKAGE_VIEWS, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); diff --git a/unotools/source/processfactory/processfactory.cxx b/unotools/source/processfactory/processfactory.cxx deleted file mode 100644 index e514c01bf324..000000000000 --- a/unotools/source/processfactory/processfactory.cxx +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_unotools.hxx" -#include <osl/mutex.hxx> -#include <unotools/processfactory.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace osl; - -namespace utl -{ - // just use the comphelper versions of both functions. The versions here in unotools will become obsolete - // from SRC610 on. - - void setProcessServiceFactory(const Reference< XMultiServiceFactory >& xSMgr) - { - ::comphelper::setProcessServiceFactory(xSMgr); - } - - Reference< XMultiServiceFactory > getProcessServiceFactory() - { - return ::comphelper::getProcessServiceFactory(); - } - -} // namesapce utl - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 852e7ffac16c..d00cbf536095 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -41,7 +41,6 @@ #include "svdata.hxx" #include "unotools/streamwrap.hxx" -#include "unotools/processfactory.hxx" #include "comphelper/processfactory.hxx" diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index 22f11be546ca..ee46c7c826f6 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -463,7 +463,6 @@ #include "unotools/bootstrap.hxx" #include "unotools/charclass.hxx" #include "unotools/configmgr.hxx" -#include "unotools/processfactory.hxx" #include "unotools/streamwrap.hxx" #include "tools/fldunit.hxx" diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index aa6990f3b750..f97ff97135cb 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -48,7 +48,7 @@ #include <rtl/ustring.hxx> #include <tools/debug.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> using com::sun::star::lang::XMultiServiceFactory; @@ -197,7 +197,7 @@ const sal_Char sDocumentBuilder[] = "com.sun.star.xml.dom.DocumentBuilder"; Reference<XNode> lcl_createDomInstance() { - Reference<XMultiServiceFactory> xFactory = utl::getProcessServiceFactory(); + Reference<XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); DBG_ASSERT( xFactory.is(), "can't get service factory" ); Reference<XDocumentBuilder> xBuilder( diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 74da38f20c1f..2dc236e2652d 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -52,7 +52,6 @@ #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> -#include <unotools/processfactory.hxx> #include <vector> diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index f47e7aaeab4f..d5b38a8c543e 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/xsd/DataTypeClass.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <tools/debug.hxx> #include <xmloff/xmltoken.hxx> @@ -60,7 +60,7 @@ using com::sun::star::lang::XMultiServiceFactory; using com::sun::star::xforms::XFormsSupplier; using com::sun::star::xforms::XDataTypeRepository; using com::sun::star::container::XNameContainer; -using utl::getProcessServiceFactory; +using comphelper::getProcessServiceFactory; using com::sun::star::uno::makeAny; using com::sun::star::uno::Any; using com::sun::star::uno::Exception; |