[Libreoffice-commits] .: binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Nov 14 04:03:09 PST 2011
binfilter/bf_so3/source/dialog/insdlg.cxx | 4 ++--
binfilter/bf_so3/source/dialog/plfilter.cxx | 1 -
binfilter/bf_so3/source/inplace/plugin.cxx | 6 +++---
binfilter/bf_so3/source/persist/transuno.cxx | 4 ++--
binfilter/bf_starmath/source/starmath_mathml.cxx | 1 -
binfilter/bf_starmath/source/starmath_unomodel.cxx | 1 -
binfilter/bf_svtools/source/config/svt_inetoptions.cxx | 1 -
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx | 4 ++--
binfilter/bf_svtools/source/config/svt_saveopt.cxx | 6 +++---
binfilter/bf_svtools/source/config/svt_viewoptions.cxx | 4 ++--
binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx | 6 +++---
binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigItem.cxx | 6 +++---
12 files changed, 20 insertions(+), 24 deletions(-)
New commits:
commit 5d038379f98a0b0d636c84bb4414c410bc12771d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Nov 14 11:49:53 2011 +0100
Removed comphelper -> unotools processfactory.hxx duplication.
diff --git a/binfilter/bf_so3/source/dialog/insdlg.cxx b/binfilter/bf_so3/source/dialog/insdlg.cxx
index ea8083d..d9caf70 100644
--- a/binfilter/bf_so3/source/dialog/insdlg.cxx
+++ b/binfilter/bf_so3/source/dialog/insdlg.cxx
@@ -64,7 +64,7 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <bf_svtools/svstdarr.hxx>
@@ -121,7 +121,7 @@ void SvObjectServerList::FillInsertObjects()
*/
{
try{
- Reference< XMultiServiceFactory > _globalMSFactory= utl::getProcessServiceFactory();
+ Reference< XMultiServiceFactory > _globalMSFactory= comphelper::getProcessServiceFactory();
if( _globalMSFactory.is())
{
OUString sProviderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ));
diff --git a/binfilter/bf_so3/source/dialog/plfilter.cxx b/binfilter/bf_so3/source/dialog/plfilter.cxx
index 723a158..7e1912f 100644
--- a/binfilter/bf_so3/source/dialog/plfilter.cxx
+++ b/binfilter/bf_so3/source/dialog/plfilter.cxx
@@ -28,7 +28,6 @@
#include <set>
#include <map>
-#include <unotools/processfactory.hxx>
#include <tools/debug.hxx>
#include <vcl/stdtext.hxx>
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index 6ab2dd5..9f60852 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.cxx
@@ -36,7 +36,7 @@
#include <vcl/svapp.hxx>
#include <vcl/stdtext.hxx>
#include <tools/debug.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
#include "bf_so3/ipclient.hxx"
#include <bf_so3/svstor.hxx>
@@ -261,7 +261,7 @@ BOOL SvPlugInObject::StartPlugIn( )
pArgs[i] = rCmd.GetArgument();
}
- Reference< XMultiServiceFactory > xFac( ::utl::getProcessServiceFactory() );
+ Reference< XMultiServiceFactory > xFac( ::comphelper::getProcessServiceFactory() );
Reference< XPluginManager > xPMgr( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.plugin.PluginManager" )) ), UNO_QUERY );
if (! xPMgr.is() )
ShowServiceNotAvailableError( NULL, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PluginManager" ) ), TRUE );
@@ -491,7 +491,7 @@ ErrCode SvPlugInObject::Verb
(void)pWorkRectPixel;
ErrCode nRet = ERRCODE_SO_NOT_INPLACEACTIVE;
- Reference< XMultiServiceFactory > xFac( ::utl::getProcessServiceFactory() );
+ Reference< XMultiServiceFactory > xFac( ::comphelper::getProcessServiceFactory() );
Sequence< OUString > aNames( xFac->getAvailableServiceNames() );
const OUString * pNames = aNames.getConstArray();
INT32 nPos;
diff --git a/binfilter/bf_so3/source/persist/transuno.cxx b/binfilter/bf_so3/source/persist/transuno.cxx
index ca2c649..f28ce80 100644
--- a/binfilter/bf_so3/source/persist/transuno.cxx
+++ b/binfilter/bf_so3/source/persist/transuno.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XContentProviderManager.hpp>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
#include <transuno.hxx>
@@ -83,7 +83,7 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
SvBindingTransport_Impl::getProcessServiceFactory (void)
{
return com::sun::star::uno::Reference<com::sun::star::uno::XInterface>(
- utl::getProcessServiceFactory(), com::sun::star::uno::UNO_QUERY_THROW);
+ comphelper::getProcessServiceFactory(), com::sun::star::uno::UNO_QUERY_THROW);
}
/*
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index 22b5912..e81a8f2 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -62,7 +62,6 @@ one go*/
#include <bf_xmloff/xmluconv.hxx>
#include <bf_xmloff/xmlmetai.hxx>
-#include <unotools/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <com/sun/star/xml/sax/XErrorHandler.hpp>
diff --git a/binfilter/bf_starmath/source/starmath_unomodel.cxx b/binfilter/bf_starmath/source/starmath_unomodel.cxx
index e601751..a39f687 100644
--- a/binfilter/bf_starmath/source/starmath_unomodel.cxx
+++ b/binfilter/bf_starmath/source/starmath_unomodel.cxx
@@ -37,7 +37,6 @@
#include <bf_svtools/ctrltool.hxx>
#include <bf_svtools/itemprop.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <unotools/processfactory.hxx>
#include <bf_svx/paperinf.hxx>
#include <vcl/settings.hxx>
#include <toolkit/awt/vclxdevice.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
index 2831fe4..9260706 100644
--- a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
@@ -55,7 +55,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/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index e1428ec..b6607b9 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -36,7 +36,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>
#include <rtl/logfile.hxx>
@@ -123,7 +123,7 @@ struct FactoryInfo
{
free();
// @@@ should be supplied from outside!
- xSMgr = ::utl::getProcessServiceFactory();
+ xSMgr = ::comphelper::getProcessServiceFactory();
}
//---------------------------------------------------------------------------------------------------------
diff --git a/binfilter/bf_svtools/source/config/svt_saveopt.cxx b/binfilter/bf_svtools/source/config/svt_saveopt.cxx
index 809a09e..6ece21d 100644
--- a/binfilter/bf_svtools/source/config/svt_saveopt.cxx
+++ b/binfilter/bf_svtools/source/config/svt_saveopt.cxx
@@ -41,7 +41,7 @@
#include <osl/mutex.hxx>
#include <comphelper/configurationhelper.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -313,7 +313,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);
@@ -475,7 +475,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/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
index 990f035..385bb08 100644
--- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
@@ -42,7 +42,7 @@
#include <rtl/ustrbuf.hxx>
#include <unotools/configpathes.hxx>
#include <comphelper/configurationhelper.hxx>
-#include <unotools/processfactory.hxx>
+#include <comphelper/processfactory.hxx>
#include <itemholder1.hxx>
namespace binfilter
@@ -337,7 +337,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/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx
index 3845da5..1beac6f 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx
@@ -36,7 +36,7 @@
#include <rtl/ustring.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>
@@ -50,7 +50,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 namespace ::rtl ;
namespace binfilter
@@ -147,7 +146,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/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigItem.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigItem.cxx
index 7f355cb..d4fb8a8 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigItem.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigItem.cxx
@@ -30,7 +30,7 @@
#include <bf_svtools/FilterConfigItem.hxx>
#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>
@@ -38,7 +38,6 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
using namespace ::rtl;
-using namespace ::utl ; // getProcessServiceFactory
using namespace ::com::sun::star::lang ; // XMultiServiceFactory
using namespace ::com::sun::star::beans ; // PropertyValue
using namespace ::com::sun::star::uno ; // Reference
@@ -122,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" ) ) ),
More information about the Libreoffice-commits
mailing list