diff options
author | Mathias Bauer <mba@openoffice.org> | 2000-10-23 11:26:53 +0000 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2000-10-23 11:26:53 +0000 |
commit | 085817945f993ee262b4e2fb586f1f8b06862fe1 (patch) | |
tree | bfdb60be3354e9f6dd2bbda4dcf90460cd104319 /sfx2 | |
parent | 050ff43c3f682b0e837d633db38d73d134a0e4ff (diff) |
MUST: processfactory.hxx moved to comphelper
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/app.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/appl/appbas.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/appl/appinit.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/appl/appopen.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/appl/appuno.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/appl/makefile.mk | 7 | ||||
-rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 29 | ||||
-rw-r--r-- | sfx2/source/bastyp/helper.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/statcach.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/doc/docfac.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/docfilt.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/view/frame.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/view/topfrm.cxx | 8 |
19 files changed, 94 insertions, 106 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 4b45ddcdf5de..a039fd828b4c 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mba $ $Date: 2000-10-19 17:02:28 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -157,7 +157,7 @@ #include <com/sun/star/container/XEnumeration.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #include <basic/basmgr.hxx> @@ -1575,7 +1575,7 @@ sal_Bool SfxApplication::IsPlugin() // Set default return value if method failed. sal_Bool bReturn = sal_False; // Get Desktop to get a list of all current tasks on it. - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTasksSupplier > xDesktop( ::utl::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTasksSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY ); DBG_ASSERT( !(xDesktop.is()==sal_False), "SfxFrame::IsPlugin_Impl()Can't get reference to desktop service!\n" ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > xList = xDesktop->getTasks()->createEnumeration(); while( xList->hasMoreElements() == sal_True ) diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 0b356a5dbf5c..619c3856c785 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appbas.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> @@ -731,7 +731,7 @@ BasicManager* SfxApplication::GetBasicManager() MakeVariable( pBas, pAppObj, "SubstPathVars", SID_SUBSTPATHVARS,SbxSTRING, SbxCLASS_METHOD ); */ // ::com::sun::star::frame::Desktop - Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr = ::utl::getProcessServiceFactory(); + Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory(); Any aDesktop; Reference< XDesktop > xDesktop( xSMgr->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY ); aDesktop <<= xDesktop ; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 5b2b4d5bfa8e..a942c045a5a4 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appinit.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -142,7 +142,7 @@ #include <com/sun/star/awt/XDialog.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #pragma hdrstop @@ -240,7 +240,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a static bool configureUcb(String const & rUcbUrl) { Reference< XMultiServiceFactory > - xFactory(utl::getProcessServiceFactory()); + xFactory(comphelper::getProcessServiceFactory()); if (!xFactory.is()) { DBG_ERROR("configureUcb: No XMultiServiceFactory"); @@ -639,7 +639,7 @@ FASTBOOL SfxApplication::Initialize_Impl() //! FSysEnableSysErrorBox( FALSE ); (pb) replaceable? - Reference < XDesktop > xDesktop ( ::utl::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); + Reference < XDesktop > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); xDesktop->addTerminateListener( new SfxTerminateListener_Impl() ); if( !CheckTryBuy_Impl() ) @@ -840,7 +840,7 @@ IMPL_LINK( SfxApplication, SpecialService_Impl, void*, pVoid ) if ( pAppData_Impl->bBean ) return 0; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() ); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); ::com::sun::star::uno::Reference< ::com::sun::star::installation::XInstallationCheck > xInst( xMgr->createInstance( DEFINE_CONST_UNICODE("com.sun.star.installation.FontCheck") ), ::com::sun::star::uno::UNO_QUERY ); if ( xInst.is() ) xInst->checkWithDialog( sal_False ); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 9609dc5e4b09..d62fc6f1b8e4 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appopen.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mba $ $Date: 2000-10-19 17:02:28 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,7 +123,7 @@ #include <svtools/ehdl.hxx> #include <svtools/sbxobj.hxx> #include <svtools/urihelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #pragma hdrstop @@ -1259,7 +1259,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( pFrame ) xFrame = pFrame->GetFrameInterface(); else - xFrame = Reference < XFrame >( ::utl::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY ); + xFrame = Reference < XFrame >( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY ); // make URL ready URL aURL; @@ -1281,7 +1281,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } aURL.Complete = aFileName; - Reference < XURLTransformer > xTrans( ::utl::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); + Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); xTrans->parseStrict( aURL ); // load document using dispatch framework @@ -1332,7 +1332,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // synchron loading without a given frame SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE ); - Reference < XComponentLoader > xDesktop( ::utl::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY ); + Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY ); Reference < XModel > xModel( xDesktop->loadComponentFromURL( pFileNameItem->GetValue(), ::rtl::OUString::createFromAscii("_blank"), 0, aArgs ), UNO_QUERY ); if ( xModel.is() ) xController = xModel->getCurrentController(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 300eb1ae4770..715422c960e5 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appserv.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mba $ $Date: 2000-10-04 17:34:23 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,7 +72,7 @@ #include <com/sun/star/frame/XTasksSupplier.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #ifndef _SV_CONFIG_HXX @@ -448,7 +448,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) } // prepare documents for closing - Reference < XDesktop > xDesktop ( ::utl::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); + Reference < XDesktop > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); BOOL bQuit = xDesktop->terminate(); // Returnwert setzten, ggf. terminieren @@ -727,7 +727,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_CLOSEWINS: { - Reference < XTasksSupplier > xDesktop ( ::utl::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); + Reference < XTasksSupplier > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); Reference< XIndexAccess > xTasks( xDesktop->getTasks(), UNO_QUERY ); if ( !xTasks.is() ) break; @@ -1033,7 +1033,7 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) case SID_CLOSEDOCS: case SID_CLOSEWINS: { - Reference < XTasksSupplier > xDesktop ( ::utl::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); + Reference < XTasksSupplier > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); Reference< XIndexAccess > xTasks( xDesktop->getTasks(), UNO_QUERY ); if ( !xTasks.is() || !xTasks->getCount() ) rSet.DisableItem(nWhich); diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 4e479300a238..cd2244e91fc6 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appuno.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mba $ $Date: 2000-10-04 16:07:22 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,9 +153,7 @@ #ifndef _COM_SUN_STAR_REGISTRY_REGISTRYVALUETYPE_HPP_ #include <com/sun/star/registry/RegistryValueType.hpp> #endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> -#endif +#include <comphelper/processfactory.hxx> #ifndef _COM_SUN_STAR_AWT_POSSIZE_HPP_ #include <com/sun/star/awt/PosSize.hpp> #endif @@ -540,7 +538,7 @@ void SfxComponentFactory::Init_Impl() { // TRY { - Reference< XPropertySet > xMan( ::utl::getProcessServiceFactory(), UNO_QUERY ); + Reference< XPropertySet > xMan( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); Any aAny = xMan->getPropertyValue( DEFINE_CONST_UNICODE("Registry") ); aAny >>= xRegistry; if ( xRegistry.is() ) @@ -731,7 +729,7 @@ void SfxComponentFactory::Init_Impl() if ( xRegistry.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::utl::getProcessServiceFactory(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); sal_uInt16 nCount = aKeyArr.Count(); sal_uInt16 n; for ( n=0; n<nCount; n++ ) @@ -789,7 +787,7 @@ void SAL_CALL SfxJavaLoader::load(const ::com::sun::star::uno::Reference< ::com: aURL.Complete = rURL; aArgs = rArgs; - SfxURLTransformer aTrans ( ::utl::getProcessServiceFactory() ); + SfxURLTransformer aTrans ( ::comphelper::getProcessServiceFactory() ); aTrans.parseStrict( aURL ); String aName( aURL.Path ); @@ -944,7 +942,7 @@ void SAL_CALL DownloaderLoader::load ( const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLoadEventListener > & rListener ) throw ( ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > aRef = rFrame->getContainerWindow () ; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() ) ; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ) ; DownloadController* pController = new DownloadController(xMgr) ; diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index c2e17160ff53..f37936d187d2 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: cd $ $Date: 2000-10-23 08:06:37 $ +# last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -124,12 +124,11 @@ SLOFILES = \ $(SLO)$/exchobj.obj \ $(SLO)$/appsys.obj \ $(SLO)$/loadenv.obj \ - $(SLO)$/frstinit.obj \ $(SLO)$/basmgr.obj \ $(SLO)$/oinstanceprovider.obj \ $(SLO)$/opipeconnection.obj \ $(SLO)$/opluginframefactory.obj \ - $(SLO)$/pluginacceptthread.obj \ + $(SLO)$/pluginacceptthread.obj \ $(SLO)$/officeacceptthread.obj EXCEPTIONSFILES=\ diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 9c2769fb2383..9bd46c349fe5 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fltfnc.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mba $ $Date: 2000-10-09 10:41:29 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,15 +213,9 @@ #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif -/* (mhu) -#ifndef _COM_SUN_STAR_CHAOS_DOCUMENTHEADERFIELD_HPP_ -#include <com/sun/star/chaos/DocumentHeaderField.hpp> -#endif -*/ - #include <sal/types.h> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/ucb/XContent.hpp> @@ -230,9 +224,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -/* (mhu) -using namespace ::com::sun::star::chaos; -*/ using namespace ::rtl; using namespace ::vos; @@ -1338,7 +1329,7 @@ sal_uInt32 SfxExecutableFilterContainer::Execute( const INetURLObject& rURLObj = rMedium.GetURLObject(); String aName( rURLObj.GetMainURL() ); - SfxURLTransformer aTrans ( ::utl::getProcessServiceFactory() ); + SfxURLTransformer aTrans ( ::comphelper::getProcessServiceFactory() ); ::rtl::OUString aTargetURL = aName; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; @@ -1398,13 +1389,13 @@ sal_uInt32 SfxExecutableFilterContainer::Execute( return bOk ? ERRCODE_ABORT : ERRCODE_IO_NOTSUPPORTED; } - SfxURLTransformer aTrans ( ::utl::getProcessServiceFactory() ); + SfxURLTransformer aTrans ( ::comphelper::getProcessServiceFactory() ); ::rtl::OUString aTargetURL = aName; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), aArgs ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() ); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xReg( xMgr->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.FrameLoaderFactory") ), ::com::sun::star::uno::UNO_QUERY ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrameLoader > xLoader( xReg->createInstance( DEFINE_CONST_UNICODE("private:iexplorer") ), ::com::sun::star::uno::UNO_QUERY ); @@ -1440,7 +1431,7 @@ sal_uInt32 SfxExecutableFilterContainer::Execute( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), aArgs ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() ); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrameLoader > xFrameLoader ( xMgr->createInstance( DEFINE_CONST_UNICODE("com.sun.star.comp.sfx2.DownloaderLoader") ), ::com::sun::star::uno::UNO_QUERY ); if ( xFrameLoader.is() ) { @@ -1982,7 +1973,7 @@ sal_uInt32 SfxExecutableFilterContainer::Execute( { ::com::sun::star::util::URL aURL; aURL.Complete = rMedium.GetName(); - SfxURLTransformer aTrans ( ::utl::getProcessServiceFactory() ); + SfxURLTransformer aTrans ( ::comphelper::getProcessServiceFactory() ); aTrans.parseStrict( aURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); if ( xDisp.is() ) @@ -3052,7 +3043,7 @@ sal_uInt32 SfxPluginFilterContainer::Execute( SfxMedium& rMedium, SfxFrame*& pFr rMedium.GetItemSet()->Put( SfxStringItem( SID_CONTENTTYPE, rMedium.GetFilter()->GetMimeType() ) ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), aArgs ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrameLoader > xLoader( (::cppu::OWeakObject*)new PluginLoader(::utl::getProcessServiceFactory()), ::com::sun::star::uno::UNO_QUERY ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrameLoader > xLoader( (::cppu::OWeakObject*)new PluginLoader(::comphelper::getProcessServiceFactory()), ::com::sun::star::uno::UNO_QUERY ); rMedium.GetItemSet()->Put( SfxStringItem( SID_FILTER_NAME, rMedium.GetFilter()->GetName() ) ); USHORT nRet = pFrame->LoadComponent_Impl( aTargetURL, aArgs, xLoader, rMedium.GetItemSet() ); @@ -3082,7 +3073,7 @@ IMPL_LINK( SfxPluginFilterContainer, LoadHdl_Impl, void*, pVoid ) return 0; bInitialized = sal_True; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::utl::getProcessServiceFactory(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); ::com::sun::star::uno::Reference< ::com::sun::star::plugin::XPluginManager > xPlugMgr( xMan->createInstance( DEFINE_CONST_UNICODE("com.sun.star.plugin.PluginManager") ), ::com::sun::star::uno::UNO_QUERY ); if( xPlugMgr.is() ) { diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index cd1b4d5e9fde..60f2eafaf848 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helper.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:52:28 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,7 +110,7 @@ #include <tools/datetime.hxx> #include <vcl/svapp.hxx> #include <ucbhelper/content.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <osl/file.hxx> using namespace ::ucb; @@ -119,7 +119,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::uno; using namespace com::sun::star::ucb; using namespace rtl; -using namespace utl; +using namespace comphelper; using namespace osl; DECLARE_LIST( StringList_Impl, OUString* ); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index e4e8293c9123..15420eed9241 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bindings.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2000-10-20 17:10:51 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,7 +104,7 @@ #ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include <com/sun/star/frame/XController.hpp> #endif -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <svtools/itemdel.hxx> #pragma hdrstop @@ -2538,7 +2538,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) aURL.Complete = aCmd; } - Reference < XURLTransformer > xTrans( ::utl::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); + Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); xTrans->parseStrict( aURL ); if ( !xDisp.is() ) xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 65a6a430f2f1..15e56c17539f 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -2,9 +2,9 @@ * * $RCSfile: statcach.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2000-10-20 17:11:46 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ #include <svtools/eitem.hxx> #include <svtools/intitem.hxx> #include <svtools/stritem.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #pragma hdrstop @@ -302,7 +302,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons } aURL.Complete = aCmd; - Reference < XURLTransformer > xTrans( ::utl::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); + Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); xTrans->parseStrict( aURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); if ( xDisp.is() ) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index ff821be8732f..6422df8272a8 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoctitm.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:52:29 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,7 +91,7 @@ #ifndef _COM_SUN_STAR_FRAME_FRAMEACTION_HPP_ #include <com/sun/star/frame/FrameAction.hpp> #endif -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include "unoctitm.hxx" #include "viewfrm.hxx" @@ -116,7 +116,7 @@ SfxUnoControllerItem::SfxUnoControllerItem( SfxControllerItem *pItem, SfxBinding DBG_ASSERT( !pCtrlItem || !pCtrlItem->IsBound(), "ControllerItem fehlerhaft!" ); aCommand.Complete = rCmd; - Reference < XURLTransformer > xTrans( ::utl::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); + Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); xTrans->parseStrict( aCommand ); pBindings->RegisterUnoController_Impl( this ); } diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 0b718d84e3cb..db60190a67a3 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmodel.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kso $ $Date: 2000-10-11 07:36:46 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,7 @@ #include <tools/tempfile.hxx> #include <svtools/stritem.hxx> #include <svtools/eitem.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <ucbhelper/content.hxx> #include <tools/urlobj.hxx> @@ -273,7 +273,7 @@ sal_Bool SfxMailModel_Impl::Send() String aFileName, aContentType; if ( SaveDocument( aFileName, aContentType ) ) { - Reference < XMultiServiceFactory > xMgr = ::utl::getProcessServiceFactory(); + Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory(); #if SUPD<609 Reference < XDataContainer > xData( xMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.chaos.DataContainer") ), UNO_QUERY ); diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 0bbea96cf24e..ec46b408ffab 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfac.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:52:32 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #include <com/sun/star/registry/XSimpleRegistry.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #ifndef _EMBOBJ_HXX //autogen @@ -233,7 +233,7 @@ void SfxObjectFactory::DoInitFactory() if ( pImpl->aServiceName.len() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::utl::getProcessServiceFactory(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > xRegistry = ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > ( xMan->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.registry.DefaultRegistry" ) ), ::com::sun::star::uno::UNO_QUERY ); if ( xRegistry.is() ) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index b1b579451b67..748c2a845aa4 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfile.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: mba $ $Date: 2000-10-20 17:15:36 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,7 +118,7 @@ #include <tools/tempfile.hxx> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #ifndef _UNOTOOLS_STREAMHELPER_HXX_ #include <unotools/streamhelper.hxx> @@ -958,7 +958,7 @@ sal_Bool SfxMedium::TryStorage() if ( aStorage.Is() ) return sal_True; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr( ::utl::getProcessServiceFactory() ); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr( ::comphelper::getProcessServiceFactory() ); ::com::sun::star::uno::Reference< ::com::sun::star::util::XArchiver > xPacker( xSMgr->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.util.Archiver" ) ), ::com::sun::star::uno::UNO_QUERY ); @@ -987,7 +987,7 @@ sal_Bool SfxMedium::TryStorage() // unpack all files to temp dir - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xFactory = ::utl::getProcessServiceFactory(); + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteractionHandler( xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.uui.InteractionHandler") ), UNO_QUERY ); diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index e1d9edc6f42a..77a0e6bbf3a0 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfilt.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:52:32 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ #include <com/sun/star/plugin/XPluginContext.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #pragma hdrstop @@ -233,7 +233,7 @@ const ::com::sun::star::plugin::PluginDescription* SfxFilter::GetPlugData() { bPlugDataSearched = sal_True; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::utl::getProcessServiceFactory(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); ::com::sun::star::uno::Reference< ::com::sun::star::plugin::XPluginManager > xPlugMgr( xMan->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.plugin.PluginManager" ) ), ::com::sun::star::uno::UNO_QUERY ); DBG_ASSERT( xPlugMgr.is(), "### cannot create instance com.sun.star.plugin.PluginManager!" ); @@ -270,7 +270,7 @@ sal_Bool SfxFilter::IsFirstPlugin() const const ::com::sun::star::plugin::PluginDescription* pData = GetPlugData(); if( pData ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::utl::getProcessServiceFactory(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); ::com::sun::star::uno::Reference< ::com::sun::star::plugin::XPluginManager > xPlugMgr( xMan->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.plugin.PluginManager" ) ), ::com::sun::star::uno::UNO_QUERY ); DBG_ASSERT( xPlugMgr.is(), "### cannot create instance com.sun.star.plugin.PluginManager!" ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 4ba316266cae..17e16baa2749 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objstor.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: pb $ $Date: 2000-10-17 13:39:45 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,7 +104,7 @@ #include <cppuhelper/weak.hxx> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #ifndef _SO_CLSIDS_HXX @@ -1131,7 +1131,7 @@ sal_Bool SfxObjectShell::ConvertFrom sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium ) { String aName( GetMedium()->GetFilter()->GetFilterName() ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::utl::getProcessServiceFactory(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); ::com::sun::star::uno::Reference< ::com::sun::star::io::XDataImporter > xLoader( xMan->createInstance( aName ), ::com::sun::star::uno::UNO_QUERY ); if ( xLoader.is() ) { @@ -1156,7 +1156,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) xExport = pImp->xFilter; else { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::utl::getProcessServiceFactory(); + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); xExport = ::com::sun::star::uno::Reference< ::com::sun::star::io::XDataExporter > ( xMan->createInstance( aName ), ::com::sun::star::uno::UNO_QUERY ); } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 94f84915b8e2..ca6ead1093b6 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mba $ $Date: 2000-10-12 17:30:55 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,7 +91,7 @@ #include <com/sun/star/awt/PosSize.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #include <vcl/msgbox.hxx> @@ -2031,7 +2031,7 @@ sal_Bool SfxFrame::ActivateNextChildWindow_Impl( sal_Bool bForward ) String aCmd( DEFINE_CONST_UNICODE( ".uno:" ) ); aCmd += String::CreateFromAscii( SFX_SLOTPOOL().GetUnoSlot( bForward ? SID_NEXTWINDOW : SID_PREVWINDOW )->GetUnoName() ); aTargetURL.Complete = aCmd; - Reference < XURLTransformer > xTrans( ::utl::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); + Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); xTrans->parseStrict( aTargetURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > aTmpRef( GetFrameInterface() ); @@ -2123,7 +2123,7 @@ sal_Bool SfxFrame::IsPlugin_Impl() const // Set default return value if method failed. sal_Bool bReturn = sal_False; // Get Desktop to get a list of all current tasks on it. - Reference< XTasksSupplier > xDesktop( ::utl::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY ); + Reference< XTasksSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY ); DBG_ASSERT( !(xDesktop.is()==sal_False), "SfxFrame::IsPlugin_Impl()Can't get reference to desktop service!\n" ); Reference< XEnumeration > xList = xDesktop->getTasks()->createEnumeration(); while( xList->hasMoreElements() == sal_True ) diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index 33293b399b5e..30cb26c86903 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: topfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2000-10-16 14:34:00 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:23:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ #include <com/sun/star/frame/XFrame.hpp> #endif #ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #endif #ifndef _COM_SUN_STAR_FRAME_XFRAMESSUPPLIER_HPP_ #include <com/sun/star/frame/XFramesSupplier.hpp> @@ -300,7 +300,7 @@ static AsynchronLink* pPendingCloser = 0; SfxTopFrame* SfxTopFrame::Create( SfxObjectShell* pDoc, USHORT nViewId, BOOL bHidden, const SfxItemSet* pSet ) { - Reference < XFrame > xDesktop ( ::utl::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); + Reference < XFrame > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); Reference < XFrame > xFrame = xDesktop->findFrame( DEFINE_CONST_UNICODE("_blank"), 0 ); SfxTopFrame *pFrame = Create( xFrame ); pFrame->pImp->bHidden = bHidden; |