diff options
Diffstat (limited to 'forms')
-rw-r--r-- | forms/inc/pch/precompiled_forms.hxx | 1 | ||||
-rw-r--r-- | forms/source/xforms/submission.cxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/submission/replace.cxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/submission/serialization_app_xml.cxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/submission/serialization_urlencoded.cxx | 5 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission.hxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission_get.cxx | 1 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission_post.cxx | 1 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission_put.cxx | 1 | ||||
-rw-r--r-- | forms/source/xforms/unohelper.cxx | 4 |
10 files changed, 12 insertions, 17 deletions
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 ); |