summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-14 11:49:31 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-14 11:50:26 +0100
commitb11bd0323ee3dc44c6f343d1eed00151e02e9851 (patch)
tree3bf904470b651ef0a647fab125d896a6b55fcbb0 /unotools
parente3712f9d350a4dbef0951e72f0de9a31eabba065 (diff)
Removed comphelper -> unotools processfactory.hxx duplication.
Diffstat (limited to 'unotools')
-rw-r--r--unotools/Library_utl.mk1
-rw-r--r--unotools/Package_inc.mk1
-rw-r--r--unotools/inc/unotools/processfactory.hxx61
-rw-r--r--unotools/source/config/configmgr.cxx4
-rw-r--r--unotools/source/config/historyoptions.cxx6
-rw-r--r--unotools/source/config/inetoptions.cxx1
-rw-r--r--unotools/source/config/moduleoptions.cxx6
-rw-r--r--unotools/source/config/saveopt.cxx6
-rw-r--r--unotools/source/config/useroptions.cxx4
-rw-r--r--unotools/source/config/viewoptions.cxx4
-rw-r--r--unotools/source/processfactory/processfactory.cxx56
11 files changed, 15 insertions, 135 deletions
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: */