use comphelper methods

17 files changed, 129 insertions, 90 deletions

diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 65e6b1b56210..2f6614511c52 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swmodule.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2000-10-12 11:56:29 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,8 +153,8 @@
 #ifndef _CPPUHELPER_FACTORY_HXX_
 #include <cppuhelper/factory.hxx>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #include "docsh.hxx"
 #include "swmodule.hxx"
@@ -360,7 +360,7 @@ SwModule::SwModule( SvFactory* pFact,
     xDicListEvtListener = uno::Reference< linguistic::XDictionaryListEventListener > (
             new SwDicListEvtListener( ::GetDictionaryList() ) );
 
-    Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+    Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
     if( xMgr.is() )
     {
         m_xScannerManager = Reference< XScannerManager >(
@@ -435,7 +435,7 @@ void SwDLL::RegisterInterfaces()
     SwWebDrawFormShell::RegisterInterface(pMod);
     SwWebOleShell::RegisterInterface(pMod);
 
-    uno::Reference< lang::XMultiServiceFactory >  xMgr = utl::getProcessServiceFactory();
+    uno::Reference< lang::XMultiServiceFactory >  xMgr = comphelper::getProcessServiceFactory();
     uno::Reference< container::XSet >  xSet(xMgr, uno::UNO_QUERY);
     if (xSet.is())
     {
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 92119177a194..49d4b4c1123c 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinsdlg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-06 13:32:56 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,8 +115,8 @@
 #ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _UTL_UNO3_DB_TOOLS_HXX_
 #include <unotools/dbtools.hxx>
@@ -1579,7 +1579,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const SbaSelectionList* pSelList )
             // "NextField" einfuegen
 #ifdef REPLACE_OFADBMGR
             SwDBFormatData aDBFormatData;
-            Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+            Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
             if( xMgr.is() )
             {
                 Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.util.NumberFormatter" ));
@@ -2338,6 +2338,9 @@ void _DB_ColumnConfig::SetData( _DB_ColumnConfigData* pData )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/06 13:32:56  jp
+    should changes: don't use IniManager
+
     Revision 1.1.1.1  2000/09/18 17:14:33  hr
     initial import
 
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index f048c9cbd6ca..a41b77267436 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbmgr.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-06 13:32:56 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -260,8 +260,8 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _ISOLANG_HXX
 #include <tools/isolang.hxx>
@@ -1871,7 +1871,7 @@ Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rDataSourc
 {
     Reference< sdbc::XConnection> xConnection;
     Reference<XNameAccess> xDBContext;
-    Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+    Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
     if( xMgr.is() )
     {
         Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.sdb.DatabaseContext" ));
@@ -2081,7 +2081,7 @@ BOOL SwNewDBMgr::OpenMergeSource(const String& rDataSource,
                 pMergeData->bEndOfDB = !pMergeData->xResultSet->next();
                 ++pMergeData->nSelectionIndex;
             }
-            Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+            Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
             if( xMgr.is() )
             {
                 Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.util.NumberFormatter" ));
@@ -2516,7 +2516,7 @@ const String&   SwNewDBMgr::GetAddressDBName()
 Sequence<OUString> SwNewDBMgr::GetExistingDatabaseNames()
 {
     Reference<XNameAccess> xDBContext;
-    Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+    Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
     if( xMgr.is() )
     {
         Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.sdb.DatabaseContext" ));
@@ -2532,6 +2532,9 @@ Sequence<OUString> SwNewDBMgr::GetExistingDatabaseNames()
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/06 13:32:56  jp
+    should changes: don't use IniManager
+
     Revision 1.1.1.1  2000/09/18 17:14:33  hr
     initial import
 
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 75c7ef3fd41e..f87b9fb69416 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtree.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:34 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,8 +96,8 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #else
@@ -168,7 +168,7 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId, const String& r
     bInitialized    (FALSE)
 {
 #ifdef REPLACE_OFADBMGR
-    Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+    Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
     if( xMgr.is() )
     {
         Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.sdb.DatabaseContext" ));
@@ -701,6 +701,9 @@ BOOL  SwDBTreeList::QueryDrop( DropEvent& rEvt)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:34  hr
+    initial import
+
     Revision 1.41  2000/09/18 16:05:19  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 751e59f8299c..f4176485d986 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envlop1.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-09-26 13:06:56 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,8 +99,8 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
@@ -489,6 +489,9 @@ void SwEnvPage::Reset(const SfxItemSet& rSet)
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.2  2000/09/26 13:06:56  os
+use of configuration service
+
 Revision 1.1.1.1  2000/09/18 17:14:35  hr
 initial import
 
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index d9176354a29d..6663051314c6 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: label1.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-06 13:33:58 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -155,8 +155,8 @@
 #ifndef _LABEL_HRC
 #include <label.hrc>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #ifdef REPLACE_OFADBMGR
@@ -166,9 +166,6 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
-#endif
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
@@ -180,7 +177,7 @@ using namespace com::sun::star::uno;
 #endif  //REPLACE_OFADBMGR
 
 using namespace ::com::sun::star;
-using namespace ::utl;
+using namespace ::comphelper;
 using namespace ::rtl;
 
 // dont use RTL_CONSTASCII_STRINGPARAM for UNO_NAME ...
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 51fb0631bece..5b52c07283e3 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: changedb.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,8 +82,8 @@
 #ifndef _COM_SUN_STAR_SDB_XDATABASEACCESS_HPP_
 #include <com/sun/star/sdb/XDatabaseAccess.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #else
@@ -211,7 +211,7 @@ void SwChangeDBDlg::FillDBPopup()
 {
 #ifdef REPLACE_OFADBMGR
     Reference<XNameAccess> xDBContext;
-    Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+    Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
     if( xMgr.is() )
     {
         Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.sdb.DatabaseContext" ));
@@ -525,6 +525,9 @@ void SwChangeDBDlg::ShowDBName(const String& rDBName)
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:36  hr
+      initial import
+
       Revision 1.43  2000/09/18 16:05:27  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index f2c7a221d751..b92e278aac6f 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldmgr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,8 +102,8 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #else
@@ -2084,7 +2084,7 @@ Reference<XNameAccess> SwFldMgr::GetDBContext()
 {
     if(!xDBContext.is())
     {
-        Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+        Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
         if( xMgr.is() )
         {
             Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.sdb.DatabaseContext" ));
@@ -2099,6 +2099,9 @@ Reference<XNameAccess> SwFldMgr::GetDBContext()
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:36  hr
+      initial import
+
       Revision 1.285  2000/09/18 16:05:29  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 90d45881f0be..ef4bdb577aaa 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,8 @@
 #include <hintids.hxx>
 #endif
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -162,7 +162,7 @@ static sal_uInt16 nKey1Pos = USHRT_MAX;
 static sal_uInt16 nKey2Pos = USHRT_MAX;
 
 using namespace ::rtl;
-using namespace ::utl;
+using namespace ::comphelper;
 using namespace ::com::sun::star;
 #define C2U(cChar) OUString::createFromAscii(cChar)
 /*--------------------------------------------------------------------
@@ -1754,6 +1754,9 @@ void    SwAuthMarkModalDlg::Apply()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:44  hr
+    initial import
+
     Revision 1.105  2000/09/18 16:05:53  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 99b8d6ff7997..0070a5efc302 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: olmenu.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,8 +92,8 @@
 #ifndef _LINGU_LNGPROPS_HHX_
 #include <lingu/lngprops.hxx>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _UNO_LINGU_HXX
 #include <svx/unolingu.hxx>
@@ -398,7 +398,7 @@ SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic
     {
 
         uno::Reference< lang::XMultiServiceFactory >
-                                    xMgr = utl::getProcessServiceFactory();
+                                    xMgr = comphelper::getProcessServiceFactory();
         xOther = uno::Reference< linguistic::XOtherLingu >( xMgr->createInstance(
                             C2U("com.sun.star.linguistic.OtherLingu") ), uno::UNO_QUERY );
         if (xOther.is())
@@ -644,6 +644,9 @@ sal_uInt16  SwSpellPopup::Execute( Window* pWin, const Point& rWordPos )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:44  hr
+      initial import
+
       Revision 1.64  2000/09/18 16:05:54  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 69f89eba3fcd..29c7e1a8c366 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: glosbib.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,8 +88,8 @@
 #ifndef _SFXINIMGR_HXX
 #include <svtools/iniman.hxx>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _COM_SUN_STAR_UCB_XCONTENTPROVIDER_HPP_
 #include <com/sun/star/ucb/XContentProvider.hpp>
@@ -191,7 +191,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
             nCaseReadonly |= PATH_READONLY;
         else
         {
-            Reference< lang::XMultiServiceFactory > xMSF = utl::getProcessServiceFactory();
+            Reference< lang::XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory();
             try
             {
                 INetURLObject aTempObj(aTempFile.GetName());
@@ -679,6 +679,9 @@ void    SwGlossaryGroupTLB::Clear()
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:44  hr
+      initial import
+
       Revision 1.64  2000/09/18 16:05:56  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 94d688e3cbc7..ea5d1b7b78da 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: glosdoc.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-06 13:35:57 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,8 +96,8 @@
 #ifndef _UCBHELPER_CONTENTBROKER_HXX
 #include <ucbhelper/contentbroker.hxx>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
@@ -335,7 +335,7 @@ sal_Bool SwGlossaries::FindGroupName(String & rGroup)
     }
     //man darf zweimal suchen, denn bei mehreren Verzeichnissen koennte der caseinsensitive Name mehrfach auftreten
     const International& rInt = Application::GetAppInternational();
-    Reference< lang::XMultiServiceFactory > xMSF = utl::getProcessServiceFactory();
+    Reference< lang::XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory();
 
     for(i = 0; i < nCount; i++)
     {
@@ -911,6 +911,9 @@ String  SwGlossaries::GetExtension()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/06 13:35:57  jp
+    should changes: don't use IniManager
+
     Revision 1.1.1.1  2000/09/18 17:14:44  hr
     initial import
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index f3d1cd23e7cb..409fa6767c80 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: glossary.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2000-10-12 15:50:41 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,8 +124,8 @@
 #ifndef _UNOOBJ_HXX
 #include <unoobj.hxx>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _UCBHELPER_CONTENT_HXX
 #include <ucbhelper/content.hxx>
@@ -227,7 +227,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::ucb;
-using namespace ::utl;
+using namespace ::comphelper;
 using namespace ::ucb;
 using namespace ::rtl;
 
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 8e869ff3481b..9d02cb92a692 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textsh2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,8 +128,8 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #else
@@ -171,7 +171,7 @@ using namespace com::sun::star::beans;
 void lcl_ReplaceDataSource(String& sDBName, String& sTblName, String& sStatmnt)
 {
     Reference<XNameAccess> xDBContext;
-    Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
+    Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
     if( xMgr.is() )
     {
         Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.sdb.DatabaseContext" ));
@@ -577,6 +577,9 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, String*, pString )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:47  hr
+    initial import
+
     Revision 1.115  2000/09/18 16:06:06  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index f52edc830598..f1a8f20a1aa4 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tautofmt.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-10-20 09:51:34 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,8 +81,8 @@
 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #ifndef _UIPARAM_HXX
@@ -674,7 +674,7 @@ AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes ) :
         nDataColWidth2  ( (USHORT)(((aPrvSize.Width()-4)-(nLabelColWidth*2)) / 4) ),
         nRowHeight      ( (USHORT)((aPrvSize.Height()-4) / 5) )
 {
-    Reference< XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
+    Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
     pNumFmt = new SvNumberFormatter( xMSF, LANGUAGE_SYSTEM );
 
     Init();
@@ -1724,6 +1724,9 @@ void lcl_SwLinkLine(const SwLineStruct& dLine,
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/20 09:51:34  os
+    change: use SvNumberFormatter ctor using XMultiServiceFactory
+
     Revision 1.1.1.1  2000/09/18 17:14:48  hr
     initial import
 
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 4d96890b9037..28e604a8811b 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmtlb.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-10-20 09:51:30 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,8 @@
 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #ifndef _SV_SVAPP_HXX //autogen
@@ -185,7 +185,7 @@ void NumFormatListBox::Init(short nFormatType, BOOL bUsrFmts)
 
     if (bUsrFmts == FALSE)
        {
-        Reference< XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
+        Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
         pOwnFormatter = new SvNumberFormatter(xMSF, eCurLanguage);
     }
 
@@ -601,6 +601,9 @@ void NumFormatListBox::Clear()
       Source Code Control System - History
 
       $Log: not supported by cvs2svn $
+      Revision 1.2  2000/10/20 09:51:30  os
+      change: use SvNumberFormatter ctor using XMultiServiceFactory
+
       Revision 1.1.1.1  2000/09/18 17:14:50  hr
       initial import
 
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index 20e172a49c30..6c65aafb1d8a 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unotools.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:50 $
+ *  last change: $Author: os $ $Date: 2000-10-20 14:18:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,8 +121,8 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
 #include <com/sun/star/container/XNameContainer.hpp>
 #endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 #ifndef _SFXDISPATCH_HXX //autogen wg. SfxDispatcher
 #include <sfx2/dispatch.hxx>
@@ -261,7 +261,7 @@ SwOneExampleFrame::SwOneExampleFrame(Window& rWin,
 
     rWin.Enable(sal_False);
     uno::Reference< lang::XMultiServiceFactory >
-                                    xMgr = utl::getProcessServiceFactory();
+                                    xMgr = comphelper::getProcessServiceFactory();
     uno::Reference< uno::XInterface >  xInst = xMgr->createInstance( C2U("com.sun.star.frame.FrameControl") );
     _xControl = uno::Reference< awt::XControl >(xInst, uno::UNO_QUERY);
     if(_xControl.is())
@@ -590,6 +590,9 @@ MenuResource::MenuResource(const ResId& rResId) :
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:50  hr
+    initial import
+
     Revision 1.34  2000/09/18 16:06:19  willem.vandorp
     OpenOffice header added.