diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-14 11:49:31 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-14 11:50:26 +0100 |
commit | b11bd0323ee3dc44c6f343d1eed00151e02e9851 (patch) | |
tree | 3bf904470b651ef0a647fab125d896a6b55fcbb0 /svtools | |
parent | e3712f9d350a4dbef0951e72f0de9a31eabba065 (diff) |
Removed comphelper -> unotools processfactory.hxx duplication.
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/pch/precompiled_svtools.hxx | 1 | ||||
-rw-r--r-- | svtools/source/config/accessibilityoptions.cxx | 4 | ||||
-rw-r--r-- | svtools/source/config/printoptions.cxx | 4 | ||||
-rw-r--r-- | svtools/source/filter/FilterConfigCache.cxx | 6 | ||||
-rw-r--r-- | svtools/source/filter/FilterConfigItem.cxx | 5 |
5 files changed, 10 insertions, 10 deletions
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" ) ) ), |