diff options
-rw-r--r-- | sc/source/core/data/documen2.cxx | 11 | ||||
-rw-r--r-- | sc/source/core/data/dpobject.cxx | 12 | ||||
-rw-r--r-- | sc/source/core/data/dpsdbtab.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/tool/addincol.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/app/scmod2.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/dbgui/dapidata.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 8 |
7 files changed, 35 insertions, 38 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 733508e66f73..0e649dd1e7eb 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2000-10-19 15:29:41 $ + * last change: $Author: nn $ $Date: 2000-10-20 09:12:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -260,10 +260,7 @@ #include <svtools/zforlist.hxx> #include <svtools/zformat.hxx> #include <vcl/system.hxx> - -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> -#endif +#include <comphelper/processfactory.hxx> #include "document.hxx" #include "table.hxx" @@ -302,7 +299,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : - xServiceManager( ::utl::getProcessServiceFactory() ), + xServiceManager( ::comphelper::getProcessServiceFactory() ), pDrawLayer( NULL ), pColorTable( NULL ), bOwner( FALSE ), diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 8610397bf1b5..b47f14da149e 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dpobject.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2000-10-19 15:29:41 $ + * last change: $Author: nn $ $Date: 2000-10-20 09:12:06 $ * * 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/lang/XInitialization.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <tools/debug.hxx> #include <svtools/zforlist.hxx> // IsNumberFormat @@ -1418,7 +1418,7 @@ BOOL ScDPObject::HasRegisteredSources() { BOOL bFound = FALSE; - uno::Reference<lang::XMultiServiceFactory> xManager = utl::getProcessServiceFactory(); + uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory(); uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY ); if ( xEnAc.is() ) { @@ -1439,7 +1439,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources() // use implementation names... - uno::Reference<lang::XMultiServiceFactory> xManager = utl::getProcessServiceFactory(); + uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory(); uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY ); if ( xEnAc.is() ) { @@ -1480,7 +1480,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS rtl::OUString aImplName = rDesc.aServiceName; uno::Reference<sheet::XDimensionsSupplier> xRet = NULL; - uno::Reference<lang::XMultiServiceFactory> xManager = utl::getProcessServiceFactory(); + uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory(); uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY ); if ( xEnAc.is() ) { diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index 3b17ba0d60fa..080c073ce05d 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dpsdbtab.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2000-10-19 15:29:41 $ + * last change: $Author: nn $ $Date: 2000-10-20 09:12:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ #include <tools/debug.hxx> #include <vcl/msgbox.hxx> #include <svtools/zforlist.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/sheet/DataImportMode.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -184,7 +184,7 @@ BOOL ScDatabaseDPData::OpenDatabase() try { pImpl->xRowSet = uno::Reference<sdbc::XRowSet>( - utl::getProcessServiceFactory()->createInstance( + comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xRowProp( pImpl->xRowSet, uno::UNO_QUERY ); diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index dac835aed3d4..35f0dd462fc2 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: addincol.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-10-06 17:35:22 $ + * last change: $Author: nn $ $Date: 2000-10-20 09:12:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,7 @@ #pragma hdrstop -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <tools/debug.hxx> #include <tools/intn.hxx> #include <tools/isolang.hxx> @@ -260,7 +260,7 @@ void ScUnoAddInCollection::Initialize() { DBG_ASSERT( !bInitialized, "Initialize twice?" ) - uno::Reference<lang::XMultiServiceFactory> xManager = utl::getProcessServiceFactory(); + uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory(); uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY ); if ( xEnAc.is() ) { @@ -428,7 +428,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& //! pass XIntrospection to ReadFromAddIn - uno::Reference<lang::XMultiServiceFactory> xManager = utl::getProcessServiceFactory(); + uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory(); if ( xManager.is() ) { uno::Reference<beans::XIntrospection> xIntro( diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 01699ef29966..c0f9a5d8f1fe 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scmod2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: nn $ $Date: 2000-10-20 09:09:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,7 +69,7 @@ #ifdef ONE_LINGU -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <vos/xception.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -103,7 +103,7 @@ void ScModule::GetSpellSettings( USHORT& rDefLang, BOOL& rAutoSpell, BOOL& rHide TRY { - uno::Reference< lang::XMultiServiceFactory > xManager = utl::getProcessServiceFactory(); + uno::Reference< lang::XMultiServiceFactory > xManager = comphelper::getProcessServiceFactory(); uno::Reference< beans::XPropertySet > xProp( xManager->createInstance( rtl::OUString::createFromAscii( SERVICE_LINGUPROP ) ), uno::UNO_QUERY ); @@ -133,7 +133,7 @@ void ScModule::SetAutoSpellProperty( BOOL bSet ) // config item must be loaded/stored from outside TRY { - uno::Reference< lang::XMultiServiceFactory > xManager = utl::getProcessServiceFactory(); + uno::Reference< lang::XMultiServiceFactory > xManager = comphelper::getProcessServiceFactory(); uno::Reference< beans::XPropertySet > xProp( xManager->createInstance( rtl::OUString::createFromAscii( SERVICE_LINGUPROP ) ), uno::UNO_QUERY ); @@ -157,7 +157,7 @@ void ScModule::SetHideAutoProperty( BOOL bSet ) // config item must be loaded/stored from outside TRY { - uno::Reference< lang::XMultiServiceFactory > xManager = utl::getProcessServiceFactory(); + uno::Reference< lang::XMultiServiceFactory > xManager = comphelper::getProcessServiceFactory(); uno::Reference< beans::XPropertySet > xProp( xManager->createInstance( rtl::OUString::createFromAscii( SERVICE_LINGUPROP ) ), uno::UNO_QUERY ); @@ -188,7 +188,7 @@ BOOL ScModule::HasThesaurusLanguage( USHORT nLang ) BOOL bHasLang = FALSE; TRY { - uno::Reference< lang::XMultiServiceFactory > xManager = utl::getProcessServiceFactory(); + uno::Reference< lang::XMultiServiceFactory > xManager = comphelper::getProcessServiceFactory(); uno::Reference< linguistic::XThesaurus > xThes( xManager->createInstance( rtl::OUString::createFromAscii( SERVICE_THESAURUS ) ), uno::UNO_QUERY ); diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 108f4a12dac5..1ed6aa334ae2 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dapidata.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-10-09 17:39:56 $ + * last change: $Author: nn $ $Date: 2000-10-20 09:15:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,7 +69,7 @@ #include <tools/debug.hxx> #include <vcl/waitobj.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/data/XDatabaseFavorites.hpp> #include <com/sun/star/data/XDatabaseEngine.hpp> @@ -122,7 +122,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : // get database names uno::Reference<data::XDatabaseFavorites> xFavorites( - utl::getProcessServiceFactory()->createInstance( + comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii( DP_SERVICE_DBENGINE ) ), uno::UNO_QUERY); if (xFavorites.is()) @@ -195,7 +195,7 @@ void ScDataPilotDatabaseDlg::FillObjects() try { uno::Reference<data::XDatabaseEngine> xEngine( - utl::getProcessServiceFactory()->createInstance( + comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii( DP_SERVICE_DBENGINE ) ), uno::UNO_QUERY); if ( !xEngine.is() ) return; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index ae6ea5ec48f1..20d62e515a22 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbdocimp.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-10-20 09:14:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ // INCLUDE --------------------------------------------------------- -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <vcl/msgbox.hxx> #include <sdb/sdbstat.hxx> // DBObject enum values #include <tools/debug.hxx> @@ -314,7 +314,7 @@ BOOL ScDBDocFunc::DoImport( USHORT nTab, const ScImportParam& rParam, USHORT nInserted = 0; uno::Reference<sdbc::XRowSet> xRowSet( - utl::getProcessServiceFactory()->createInstance( + comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); |