diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 1d8ffc1780e3..9a6bda525241 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: apphdl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-09-28 15:22:17 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:31:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,22 +65,13 @@
 
 #pragma hdrstop
 
-#include "hintids.hxx"
+#ifndef _HINTIDS_HXX
+#include <hintids.hxx>
+#endif
 
 #ifndef _URLOBJ_HXX
 #include <tools/urlobj.hxx>
 #endif
-#ifndef _SFXDISPATCH_HXX //autogen
-#include <sfx2/dispatch.hxx>
-#endif
-
-#ifndef _SFXEVENT_HXX //autogen
-#include <sfx2/event.hxx>
-#endif
-
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svtools/svstdarr.hxx>
@@ -88,6 +79,18 @@
 #ifndef SVTOOLS_URIHELPER_HXX
 #include <svtools/urihelper.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_UNDOOPT_HXX
+#include <svtools/undoopt.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+#ifndef _SFXDISPATCH_HXX //autogen
+#include <sfx2/dispatch.hxx>
+#endif
+#ifndef _SFXEVENT_HXX //autogen
+#include <sfx2/event.hxx>
+#endif
 #ifndef _SVX_SRCHITEM_HXX
 #include <svx/srchitem.hxx>
 #endif
@@ -143,28 +146,69 @@
 #include <navicfg.hxx>
 #endif
 
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "finder.hxx"
-#include "docsh.hxx"
-#include "cmdid.h"          // Funktion-Ids
-#include "initui.hxx"
-#include "uitool.hxx"
-#include "swmodule.hxx"
-#include "wdocsh.hxx"
-#include "wview.hxx"
-#include "wizzard.hxx"      // Wizzards
-#include "usrpref.hxx"
-#include "gloslst.hxx"      // SwGlossaryList
-#include "glosdoc.hxx"      // SwGlossaryList
-#include "doc.hxx"
-#include "cfgitems.hxx"
-#include "prtopt.hxx"
-#include "srcvcfg.hxx"
-#include "modcfg.hxx"
-#include "globals.h"        // globale Konstanten z.B.
-#include "cfgid.h"
-#include "app.hrc"
+#ifndef _VIEW_HXX
+#include <view.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _DOCSH_HXX
+#include <docsh.hxx>
+#endif
+#ifndef _CMDID_H
+#include <cmdid.h>          // Funktion-Ids
+#endif
+#ifndef _INITUI_HXX
+#include <initui.hxx>
+#endif
+#ifndef _UITOOL_HXX
+#include <uitool.hxx>
+#endif
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _WDOCSH_HXX
+#include <wdocsh.hxx>
+#endif
+#ifndef _WVIEW_HXX
+#include <wview.hxx>
+#endif
+#ifndef _WIZZARD_HXX
+#include <wizzard.hxx>      // Wizzards
+#endif
+#ifndef _USRPREF_HXX
+#include <usrpref.hxx>
+#endif
+#ifndef _GLOSLST_HXX
+#include <gloslst.hxx>      // SwGlossaryList
+#endif
+#ifndef _GLOSDOC_HXX
+#include <glosdoc.hxx>      // SwGlossaryList
+#endif
+#ifndef _DOC_HXX
+#include <doc.hxx>
+#endif
+#ifndef _CFGITEMS_HXX
+#include <cfgitems.hxx>
+#endif
+#ifndef _PRTOPT_HXX
+#include <prtopt.hxx>
+#endif
+#ifndef _SRCVCFG_HXX
+#include <srcvcfg.hxx>
+#endif
+#ifndef _MODCFG_HXX
+#include <modcfg.hxx>
+#endif
+#ifndef _GLOBALS_H
+#include <globals.h>        // globale Konstanten z.B.
+#endif
+#ifndef _CFGID_H
+#include <cfgid.h>
+#endif
+#ifndef _APP_HRC
+#include <app.hrc>
+#endif
 #ifndef _USRPREF_HXX //autogen
 #include <usrpref.hxx>
 #endif
@@ -177,7 +221,9 @@
 #ifndef _FONTCFG_HXX //autogen
 #include <fontcfg.hxx>
 #endif
-#include "barcfg.hxx"
+#ifndef _BARCFG_HXX
+#include <barcfg.hxx>
+#endif
 #ifndef _UINUMS_HXX //autogen
 #include <uinums.hxx>
 #endif
@@ -463,7 +509,9 @@ void SwModule::StateOther(SfxItemSet &rSet)
             break;
             case SID_ATTR_ADDRESS:
             {
-                rSet.Put(pPathFinder->GetAddress());
+                SvxAddressItem aAddress( *SFX_APP()->GetIniManager() );
+                aAddress.SetWhich( nWhich );
+                rSet.Put( aAddress );
             }
             break;
             case SID_ATTR_UNDO_COUNT:
@@ -783,8 +831,8 @@ void SwModule::ExecOther(SfxRequest& rReq)
 
                 if(aParam == C2S("~~~GetMacroPath"))
                 {
-                    aPath = SFX_INIMANAGER()->Get( SFX_KEY_CONFIG_DIR );
-                    aPath = URIHelper::SmartRelToAbs(aPath);
+                    SvtPathOptions aPathOpt;
+                    aPath = URIHelper::SmartRelToAbs( aPathOpt.GetConfigPath() );
                     if(aPath.Len())
                         aPath += INET_PATH_TOKEN;
                 }
@@ -815,7 +863,7 @@ void SwModule::ExecOther(SfxRequest& rReq)
         {
             if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(nWhich, sal_False, &pItem))
             {
-                pPathFinder->SetAddress( *(SvxAddressItem*)pItem );
+                ((SvxAddressItem*)pItem)->Store( *SFX_APP()->GetIniManager() );
             }
         }
         break;
@@ -839,8 +887,11 @@ void SwModule::ExecOther(SfxRequest& rReq)
             }
             SwEditShell::SetUndoActionCount( nNew );
             // intern kommt der Request aus dem Dialog, dort werden die Options gesetzt
-            if(rReq.IsAPI())
-                OFF_APP()->GetOptions().SetUndoCount(  nNew );
+            if( rReq.IsAPI() )
+            {
+                SvtUndoOptions aOpt;
+                aOpt.SetUndoCount(  nNew );
+            }
             break;
         }
         break;
@@ -859,7 +910,6 @@ void SwModule::ExecOther(SfxRequest& rReq)
                     SwView* pActView = ::GetActiveView();
                     sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pActView);
                     ::SetDfltMetric(eUnit, bWebView);
-                    OFF_APP()->GetOptions().SetMetric(eUnit);
                 }
                 break;
             }
@@ -1091,6 +1141,9 @@ const SwMasterUsrPref *SwModule::GetUsrPref(sal_Bool bWeb) const
 
 /*-------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/09/28 15:22:17  os
+    use of configuration service in view options
+
     Revision 1.1.1.1  2000/09/18 17:14:31  hr
     initial import
 
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 8cb3bc9ab8d9..1776a9ea20a6 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appopt.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-09-28 15:22:17 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:31:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,14 +64,29 @@
 #endif
 
 #pragma hdrstop
-#include <sot/dtrans.hxx>
-#include "uiparam.hxx"
-#include "hintids.hxx"
 
+#ifndef _UIPARAM_HXX
+#include <uiparam.hxx>
+#endif
+#ifndef _HINTIDS_HXX
+#include <hintids.hxx>
+#endif
+#ifndef _CMDID_H
+#include <cmdid.h>          // Funktion-Ids
+#endif
 
+#define _SVSTDARR_STRINGSDTOR
+#include <svtools/svstdarr.hxx>
+
+#ifndef _MSGBOX_HXX //autogen
+#include <vcl/msgbox.hxx>
+#endif
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
+
+#include <sot/dtrans.hxx>
+
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
@@ -84,9 +99,6 @@
 #ifndef _SVX_HTMLMODE_HXX //autogen
 #include <svx/htmlmode.hxx>
 #endif
-#ifndef _MSGBOX_HXX //autogen
-#include <vcl/msgbox.hxx>
-#endif
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
@@ -102,43 +114,72 @@
 #ifndef _SVX_BACKGRND_HXX //autogen
 #include <svx/backgrnd.hxx>
 #endif
-
 #ifndef _OFF_OFAIDS_HRC
 #include <offmgr/ofaids.hrc>
 #endif
+
 #ifndef _OPTPAGE_HXX //autogen
 #include <optpage.hxx>
 #endif
-#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
-#ifndef _OPTPAGE_HXX //autogen
-#include <optpage.hxx>
+#ifndef _OPTINS_HXX
+#include <optins.hxx>
 #endif
-#ifndef _SYSTEM_HXX //autogen
-#include <vcl/system.hxx>
+#ifndef _OPTLOAD_HXX
+#include <optload.hxx>
+#endif
+#ifndef _EDTWIN_HXX
+#include <edtwin.hxx>
+#endif
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _VIEW_HXX
+#include <view.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _UITOOL_HXX
+#include <uitool.hxx>
+#endif
+#ifndef _INITUI_HXX
+#include <initui.hxx>                   // fuer ::GetGlossaries()
+#endif
+#ifndef _FLDBAS_HXX
+#include <fldbas.hxx>      //fuer UpdateFields
+#endif
+#ifndef _WVIEW_HXX
+#include <wview.hxx>
+#endif
+#ifndef _CFGITEMS_HXX
+#include <cfgitems.hxx>
+#endif
+#ifndef _PRTOPT_HXX
+#include <prtopt.hxx>
+#endif
+#ifndef _PVIEW_HXX
+#include <pview.hxx>
+#endif
+#ifndef _USRPREF_HXX
+#include <usrpref.hxx>
+#endif
+#ifndef _MODCFG_HXX
+#include <modcfg.hxx>
+#endif
+#ifndef _GLOSDOC_HXX
+#include <glosdoc.hxx>
+#endif
+#ifndef _UIITEMS_HXX
+#include <uiitems.hxx>
 #endif
 
-#include "optins.hxx"
-#include "optload.hxx"
-#include <edtwin.hxx>
-#include "finder.hxx"
-#include "swmodule.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "uitool.hxx"
-#include "initui.hxx"                   // fuer ::GetGlossaries()
-#include "fldbas.hxx"      //fuer UpdateFields
-#include "cmdid.h"          // Funktion-Ids
-#include "globals.hrc"
-#include "globals.h"        // globale Konstanten z.B.
-#include "wview.hxx"
-#include "cfgitems.hxx"
-#include "prtopt.hxx"
-#include "pview.hxx"
-#include "usrpref.hxx"
-#include "modcfg.hxx"
-#include "glosdoc.hxx"
-#include "uiitems.hxx"
+
+#ifndef _GLOBALS_HRC
+#include <globals.hrc>
+#endif
+#ifndef _GLOBALS_H
+#include <globals.h>        // globale Konstanten z.B.
+#endif
 
 
 
@@ -545,6 +586,9 @@ SfxTabPage*  SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
 
 /*-------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/09/28 15:22:17  os
+    use of configuration service in view options
+
     Revision 1.1.1.1  2000/09/18 17:14:31  hr
     initial import
 
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index c2000d3db50f..fcdfa27525d4 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docsh2.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-09-26 13:33:18 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:31:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -101,6 +101,9 @@
 #ifndef _ZFORMAT_HXX //autogen
 #include <svtools/zformat.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 #ifndef _SFXDOCINF_HXX //autogen
 #include <sfx2/docinf.hxx>
 #endif
@@ -820,8 +823,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 BOOL bOverwrite = FALSE;
                 BOOL bNumbering = FALSE;
                 USHORT nRet = USHRT_MAX;
+                SvtPathOptions aPathOpt;
                 SwLoadTemplateDlg* pDlg = new SwLoadTemplateDlg(0);
-                pDlg->SetPath( SFX_INIMANAGER()->Get( SFX_KEY_WORK_PATH ));
+                pDlg->SetPath( aPathOpt.GetWorkPath() );
                 String sSW5(String::CreateFromAscii(FILTER_SW5));
 
                 SfxObjectFactory &rFact = GetFactory();
@@ -1242,10 +1246,10 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     pFileDlg->SetCurFilter( pFlt->GetUIName() );
                 }
 
+                SvtPathOptions aPathOpt;
                 Window *pTemplateFT = AddTemplateBtn(pFileDlg);
                 pFileDlg->SetText( SW_RESSTR( nStrId ));
-                pFileDlg->SetPath( SFX_INIMANAGER()->Get(
-                                            SFX_KEY_WORK_PATH ) );
+                pFileDlg->SetPath( aPathOpt.GetWorkPath() );
 
                 if( RET_OK == pFileDlg->Execute() )
                 {
@@ -1669,6 +1673,9 @@ void    SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* pView )
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/09/26 13:33:18  jp
+    SFXDISPATHER removed
+
     Revision 1.1.1.1  2000/09/18 17:14:31  hr
     initial import
 
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index ba1cf1a974dc..05d6feb4a568 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docst.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:31 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:31:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,9 +85,6 @@
 #ifndef _NEWSTYLE_HXX //autogen
 #include <sfx2/newstyle.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SFXMACITEM_HXX //autogen
 #include <svtools/macitem.hxx>
 #endif
@@ -330,7 +327,6 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
     const SfxItemSet* pArgs = rReq.GetArgs();
     const SfxPoolItem* pItem;
     SwWrtShell* pActShell = 0;
-    SFX_APP()->GetOptions().SetMetric(::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, this)));
     BOOL bSetReturn = TRUE;
     switch (nSlot)
     {
@@ -519,7 +515,6 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
 {
     ASSERT(GetWrtShell(), "Keine Shell, keine Styles");
     SfxStyleSheetBase *pStyle = 0;
-    SFX_APP()->GetOptions().SetMetric(::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, this)));
 
     USHORT nRet = nMask;
     BOOL bModified = pDoc->IsModified();
@@ -1186,7 +1181,7 @@ void SwDocShell::FormatPage( const String& rPage, BOOL bColumn, SwWrtShell*
     Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, FALSE, bColumn, pActShell);
 }
 
-Bitmap __EXPORT SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
+Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
 {
     if( SFX_STYLE_FAMILY_PSEUDO == eFamily )
         return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM ));
@@ -1195,6 +1190,9 @@ Bitmap __EXPORT SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:31  hr
+    initial import
+
     Revision 1.149  2000/09/18 16:05:11  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 46c35bf3f88c..20048a964041 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uinums.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:33 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:32:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,9 @@
 #ifndef SVTOOLS_URIHELPER_HXX
 #include <svtools/urihelper.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 #ifndef _STREAM_HXX //autogen
 #include <tools/stream.hxx>
 #endif
@@ -82,6 +85,9 @@
 #ifndef _SFX_INIMGR_HXX
 #include <sfx2/inimgr.hxx>
 #endif
+#ifndef _SFXDOCFILE_HXX
+#include <sfx2/docfile.hxx>
+#endif
 #ifndef _SFXITEMITER_HXX //autogen
 #include <svtools/itemiter.hxx>
 #endif
@@ -164,16 +170,15 @@ SwBaseNumRules::~SwBaseNumRules()
 {
     if( bModified )
     {
-        String sNm( SFX_INIMANAGER()->Get( SFX_KEY_USERCONFIG_PATH ));
-        sNm = URIHelper::SmartRelToAbs(sNm);
-
+        SvtPathOptions aPathOpt;
+        String sNm( URIHelper::SmartRelToAbs( aPathOpt.GetUserConfigPath() ));
         sNm += INET_PATH_TOKEN;
         sNm += sFileName;
         INetURLObject aTempObj(sNm);
         sNm = aTempObj.GetFull();
-        SvFileStream aStrm( sNm, STREAM_WRITE | STREAM_TRUNC |
-                                        STREAM_SHARE_DENYALL );
-        Store( aStrm );
+        SfxMedium aStrm( sNm, STREAM_WRITE | STREAM_TRUNC |
+                                        STREAM_SHARE_DENYALL, TRUE );
+        Store( *aStrm.GetOutStream() );
     }
 
     for( USHORT i = 0; i < nMaxRules; ++i )
@@ -191,8 +196,8 @@ void  SwBaseNumRules::Init()
     String sNm( sFileName );
     if( SFX_INIMANAGER()->SearchFile( sNm, SFX_KEY_USERCONFIG_PATH ))
     {
-        SvFileStream aStrm( sNm, STREAM_STD_READ );
-        Load( aStrm );
+        SfxMedium aStrm( sNm, STREAM_STD_READ, TRUE );
+        Load( *aStrm.GetInStream() );
     }
 }
 
@@ -756,6 +761,9 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:33  hr
+    initial import
+
     Revision 1.69  2000/09/18 16:05:18  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index e0c0ad1f3b02..92119177a194 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.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:33 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:32:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -176,9 +176,6 @@
 #ifndef _SFXAPP_HXX //autogen
 #include <sfx2/app.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SFXITEMSET_HXX //autogen
 #include <svtools/itemset.hxx>
 #endif
@@ -948,7 +945,6 @@ IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox )
 IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
 {
     SwWrtShell& rSh = pView->GetWrtShell();
-    SFX_APP()->GetOptions().SetMetric( ::GetDfltMetric(0 != PTR_CAST(SwWebView, pView)) );
     BOOL bNewSet = FALSE;
     if( !pTblSet )
     {
@@ -2342,6 +2338,9 @@ void _DB_ColumnConfig::SetData( _DB_ColumnConfigData* pData )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:33  hr
+    initial import
+
     Revision 1.40  2000/09/18 16:05:18  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 46c7b4a25710..f048c9cbd6ca 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.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:33 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:32:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,6 +109,9 @@
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
+#ifndef _SFXINIMGR_HXX //autogen
+#include <svtools/iniman.hxx>
+#endif
 #ifndef _SFX_PRINTER_HXX //autogen
 #include <sfx2/printer.hxx>
 #endif
@@ -167,9 +170,6 @@
 #ifndef _FLDBAS_HXX
 #include <fldbas.hxx>
 #endif
-#ifndef _FINDER_HXX
-#include <finder.hxx>
-#endif
 #ifndef _INITUI_HXX
 #include <initui.hxx>
 #endif
@@ -695,6 +695,15 @@ String  lcl_FindColumn(const String& sFormatStr,USHORT  &nUsedPos, BYTE &nSepara
     Beschreibung:
  --------------------------------------------------------------------*/
 
+inline String lcl_GetDBInsertMode( String sDBName )
+{
+    sDBName.SearchAndReplace( DB_DELIM, '.');
+    return  SFX_APP()->GetIniManager()->Get( String::CreateFromAscii(
+                RTL_CONSTASCII_STRINGPARAM( "DataBaseFormatInfo" )),
+                FALSE, FALSE, sDBName );
+}
+
+
 #ifdef REPLACE_OFADBMGR
 void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
 #else
@@ -714,11 +723,11 @@ void SwNewDBMgr::ImportDBEntry(SbaDBDataDef* pDef, SwWrtShell* pSh)
         String sSymDBName(pMergeData->sDataSource);
         sSymDBName += DB_DELIM;
         sSymDBName += pMergeData->sTableOrQuery;
-        String sFormatStr = pPathFinder->GetDBInsertMode(sSymDBName);
+        String sFormatStr( lcl_GetDBInsertMode( sSymDBName ));
 #else
         const ODbRowRef&  xRow = rParam.GetCursor()->GetRow();
         ULONG nCount = (UINT16)xRow->size();
-        String sFormatStr = pPathFinder->GetDBInsertMode(rParam.GetSymDBName());
+        String sFormatStr( lcl_GetDBInsertMode( rParam.GetSymDBName() ));
 #endif
         USHORT nFmtLen = sFormatStr.Len();
         if( nFmtLen )
@@ -2523,6 +2532,9 @@ Sequence<OUString> SwNewDBMgr::GetExistingDatabaseNames()
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:33  hr
+    initial import
+
     Revision 1.372  2000/09/18 16:05:18  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 48f462772af7..4e5f4a7e7915 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: romenu.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:33:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,13 +68,18 @@
 #include <hintids.hxx>
 
 
-#ifndef _SFXDISPATCH_HXX //autogen
-#include <sfx2/dispatch.hxx>
+#ifndef _URLOBJ_HXX //autogen
+#include <tools/urlobj.hxx>
 #endif
-#ifndef _IODLG_HXX
-#include "sfx2/iodlg.hxx"
+#ifndef _GRAPH_HXX //autogen
+#include <vcl/graph.hxx>
+#endif
+#ifndef _MSGBOX_HXX //autogen
+#include <vcl/msgbox.hxx>
+#endif
+#ifndef _CLIP_HXX //autogen
+#include <vcl/clip.hxx>
 #endif
-
 #ifndef _SOT_FORMATS_HXX
 #include <sot/formats.hxx>
 #endif
@@ -84,48 +89,39 @@
 #ifndef _SFXSTRITEM_HXX //autogen
 #include <svtools/stritem.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+#ifndef _FILTER_HXX //autogen
+#include <svtools/filter.hxx>
+#endif
+#ifndef _IMAP_HXX //autogen
+#include <svtools/imap.hxx>
+#endif
+#ifndef _INETIMG_HXX //autogen
+#include <svtools/inetimg.hxx>
+#endif
 #ifndef _SFXDOCFILE_HXX //autogen
 #include <sfx2/docfile.hxx>
 #endif
+#ifndef _SFXDISPATCH_HXX //autogen
+#include <sfx2/dispatch.hxx>
+#endif
+#ifndef _IODLG_HXX
+#include <sfx2/iodlg.hxx>
+#endif
 #ifndef _XOUTBMP_HXX //autogen
 #include <svx/xoutbmp.hxx>
 #endif
 #ifndef _SVX_IMPGRF_HXX //autogen
 #include <svx/impgrf.hxx>
 #endif
-#ifndef _URLOBJ_HXX //autogen
-#include <tools/urlobj.hxx>
-#endif
-#ifndef _GRAPH_HXX //autogen
-#include <vcl/graph.hxx>
-#endif
 #ifndef _GALLERY_HXX_ //autogen
 #include <svx/gallery.hxx>
 #endif
-#ifndef _FILTER_HXX //autogen
-#include <svtools/filter.hxx>
-#endif
-#ifndef _MSGBOX_HXX //autogen
-#include <vcl/msgbox.hxx>
-#endif
-#ifndef _CLIP_HXX //autogen
-#include <vcl/clip.hxx>
-#endif
-#ifndef _SFX_INIMGR_HXX //autogen
-#include <sfx2/inimgr.hxx>
-#endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
-#endif
 #ifndef _SVX_BRSHITEM_HXX //autogen
 #include <svx/brshitem.hxx>
 #endif
-#ifndef _IMAP_HXX //autogen
-#include <svtools/imap.hxx>
-#endif
-#ifndef _INETIMG_HXX //autogen
-#include <svtools/inetimg.hxx>
-#endif
 
 
 #ifndef _FRMATR_HXX
@@ -178,8 +174,6 @@
 #include <docvw.hrc>
 #endif
 
-#define C2S(cChar) UniString::CreateFromAscii(cChar)
-
 
 SwReadOnlyPopup::~SwReadOnlyPopup()
 {
@@ -507,26 +501,24 @@ void lcl_GetPreferedExtension( String &rExt, /*const*/ Graphic &rGrf )
 {
     // dann ggfs. ueber die native-Info der Grafik den "besten"
     // Filter vorschlagen
+    const sal_Char* pExt = "png";
     switch( rGrf.GetLink().GetType() )
     {
-        case GFX_LINK_TYPE_NATIVE_GIF:      rExt = C2S("gif"); break;
-        case GFX_LINK_TYPE_NATIVE_TIF:      rExt = C2S("tif"); break;
-        case GFX_LINK_TYPE_NATIVE_WMF:      rExt = C2S("wmf"); break;
-        case GFX_LINK_TYPE_NATIVE_MET:      rExt = C2S("met"); break;
-        case GFX_LINK_TYPE_NATIVE_PCT:      rExt = C2S("pct"); break;
-        case GFX_LINK_TYPE_NATIVE_JPG:      rExt = C2S("jpg"); break;
-
-        // case GFX_LINK_TYPE_NATIVE_PNG:
-        default:                            rExt = C2S("png"); break;
+        case GFX_LINK_TYPE_NATIVE_GIF:      pExt = "gif"; break;
+        case GFX_LINK_TYPE_NATIVE_TIF:      pExt = "tif"; break;
+        case GFX_LINK_TYPE_NATIVE_WMF:      pExt = "wmf"; break;
+        case GFX_LINK_TYPE_NATIVE_MET:      pExt = "met"; break;
+        case GFX_LINK_TYPE_NATIVE_PCT:      pExt = "pct"; break;
+        case GFX_LINK_TYPE_NATIVE_JPG:      pExt = "jpg"; break;
     }
+    rExt.AssignAscii( pExt );
 }
 
 
 String SwReadOnlyPopup::SaveGraphic( USHORT nId )
 {
-    static String sGrfPath;
-    if(!sGrfPath.Len())
-        sGrfPath = SFX_INIMANAGER()->Get(SFX_KEY_GRAPHICS_PATH);
+    SvtPathOptions aPathOpt;
+    String sGrfPath( aPathOpt.GetGraphicPath() );
     SwWrtShell &rSh = rView.GetWrtShell();
     SfxFileDialog aExpDlg( NULL, WinBits(WB_SAVEAS|WB_3DLOOK) );
     aExpDlg.DisableSaveLastDirectory();
@@ -643,6 +635,9 @@ String SwReadOnlyPopup::SaveGraphic( USHORT nId )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:35  hr
+      initial import
+
       Revision 1.56  2000/09/18 16:05:24  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 65c2ae6d3520..5876cf0884c9 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envimg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-09-26 13:06:56 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:33:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,30 +65,45 @@
 
 #pragma hdrstop
 
-#include "hintids.hxx"
-
-#ifndef _SVX_ADRITEM_HXX //autogen
-#include <svx/adritem.hxx>
+#ifndef _HINTIDS_HXX
+#include <hintids.hxx>
 #endif
+
 #ifndef _STREAM_HXX //autogen
 #include <tools/stream.hxx>
 #endif
 #ifndef _TOOLS_RESID_HXX //autogen
 #include <tools/resid.hxx>
 #endif
+#ifndef _SFXAPP_HXX //autogen
+#include <sfx2/app.hxx>
+#endif
 #ifndef _SVX_PAPERINF_HXX //autogen
 #include <svx/paperinf.hxx>
 #endif
+#ifndef _SVX_ADRITEM_HXX //autogen
+#include <svx/adritem.hxx>
+#endif
 #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
 #include <com/sun/star/uno/Sequence.hxx>
 #endif
 
-#include "errhdl.hxx"
-#include "finder.hxx"
-#include "swtypes.hxx"
-#include "cmdid.h"
-#include "envimg.hxx"
-#include "envelp.hrc"
+#ifndef _ERRHDL_HXX
+#include <errhdl.hxx>
+#endif
+#ifndef _SWTYPES_HXX
+#include <swtypes.hxx>
+#endif
+#ifndef _ENVIMG_HXX
+#include <envimg.hxx>
+#endif
+
+#ifndef _CMDID_H
+#include <cmdid.h>
+#endif
+#ifndef _ENVELP_HRC
+#include <envelp.hrc>
+#endif
 
 #ifdef WIN
 #define NEXTLINE  UniString::CreateFromAscii("\r\n")
@@ -106,21 +121,20 @@ using namespace com::sun::star::uno;
 // --------------------------------------------------------------------------
 String MakeSender()
 {
-    ASSERT( pPathFinder, "PathFinder not found" );
-    SvxAddressItem aAdr( pPathFinder->GetAddress() );
+    SvxAddressItem aAdr( *SFX_APP()->GetIniManager() );
 
     String sRet;
     String sSenderToken(SW_RES(STR_SENDER_TOKENS));
-    USHORT nTokenCount = sSenderToken.GetTokenCount(';');
+    xub_StrLen nSttPos = 0, nTokenCount = sSenderToken.GetTokenCount(';');
     BOOL bLastLength = TRUE;
-    for(USHORT i = 0; i < nTokenCount; i++)
+    for( xub_StrLen i = 0; i < nTokenCount; i++ )
     {
-        String sToken = sSenderToken.GetToken(i, ';');
+        String sToken = sSenderToken.GetToken( 0, ';', nSttPos );
         if(sToken.EqualsAscii("COMPANY"))
         {
-            String sTmp = aAdr.GetToken( ADDRESS_COMPANY );
-            sRet += sTmp;
-            bLastLength = sTmp.Len() > 0;
+            xub_StrLen nOldLen = sRet.Len();
+            sRet += aAdr.GetToken( ADDRESS_COMPANY );
+            bLastLength = sRet.Len() != nOldLen;
         }
         else if(sToken.EqualsAscii("CR"))
         {
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 74b15649c3b2..d9176354a29d 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.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2000-09-26 11:55:45 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:33:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,9 @@
 #ifndef _SV_WAITOBJ_HXX //autogen
 #include <vcl/waitobj.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 #ifndef _SFXAPP_HXX //autogen
 #include <sfx2/app.hxx>
 #endif
@@ -166,9 +169,11 @@
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
 #include <unotools/processfactory.hxx>
 #endif
+
 using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace com::sun::star::uno;
+
 #define C2U(char) rtl::OUString::createFromAscii(char)
 #else
 
@@ -309,11 +314,11 @@ String lcl_GetLabelsIni()
 {
     String sRet( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
                     "labels.ini" )));
-    SfxIniManager* pIniManager = SFX_INIMANAGER();
-    if( !pIniManager->SearchFile( sRet, SFX_KEY_USERCONFIG_PATH ))
+    if( !SFX_INIMANAGER()->SearchFile( sRet, SFX_KEY_USERCONFIG_PATH ))
     {
         sRet.Insert( INET_PATH_TOKEN, 0 );
-        sRet.Insert( pIniManager->Get( SFX_KEY_USERCONFIG_PATH ), 0 );
+        SvtPathOptions aPathOpt;
+        sRet.Insert( aPathOpt.GetUserConfigPath(), 0 );
     }
     return sRet;
 }
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 549677723f4e..e18e6d470416 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mailmrge.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:33:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,43 +64,63 @@
 #endif
 
 #pragma hdrstop
-#ifndef _SDB_SDBHASH_HXX
-#include <sdb/sdbhash.hxx>
-#endif
-#ifndef _IODLG_HXX
-#include "sfx2/iodlg.hxx"
-#endif
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#ifndef _SFXAPP_HXX //autogen
-#include <sfx2/app.hxx>
-#endif
-#ifndef _MAILENUM_HXX //autogen
-#include <goodies/mailenum.hxx>
-#endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
-#endif
-#ifndef _SVX_MULTIFIL_HXX
-#include <svx/multifil.hxx>
-#endif
 #ifndef _URLOBJ_HXX
 #include <tools/urlobj.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+#ifndef _SDB_SDBHASH_HXX
+#include <sdb/sdbhash.hxx>
+#endif
+#ifndef _MAILENUM_HXX //autogen
+#include <goodies/mailenum.hxx>
+#endif
+#ifndef _IODLG_HXX
+#include <sfx2/iodlg.hxx>
+#endif
+#ifndef _SVX_MULTIFIL_HXX
+#include <svx/multifil.hxx>
+#endif
 
-#include "helpid.h"
-#include "view.hxx"
-#include "docsh.hxx"
-#include "wrtsh.hxx"
-#include "dbmgr.hxx"
-#include "dbui.hxx"
-#include "swmodule.hxx"
-#include "modcfg.hxx"
+#ifndef _HELPID_H
+#include <helpid.h>
+#endif
+#ifndef _VIEW_HXX
+#include <view.hxx>
+#endif
+#ifndef _DOCSH_HXX
+#include <docsh.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _DBMGR_HXX
+#include <dbmgr.hxx>
+#endif
+#ifndef _DBUI_HXX
+#include <dbui.hxx>
+#endif
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _MODCFG_HXX
+#include <modcfg.hxx>
+#endif
+
+#ifndef _ENVELP_HRC
+#include <envelp.hrc>
+#endif
+#ifndef _MAILMRGE_HRC
+#include <mailmrge.hrc>
+#endif
+#ifndef _MAILMRGE_HXX
+#include <mailmrge.hxx>
+#endif
 
-#include "envelp.hrc"
-#include "mailmrge.hrc"
-#include "mailmrge.hxx"
 
 #ifdef REPLACE_OFADBMGR
 #ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
@@ -249,9 +269,8 @@ SwMailMergeDlg::SwMailMergeDlg(Window *pParent, SwWrtShell *pShell,
     aPathED.SetText(pModOpt->GetMailingPath());
     if (!aPathED.GetText().Len())
     {
-        SfxIniManager* pIniManager = SFX_APP()->GetIniManager();
-        ASSERT(pIniManager, "Kein Inimanager angelegt !!");
-        aPathED.SetText(pIniManager->Get(SFX_KEY_WORK_PATH));
+        SvtPathOptions aPathOpt;
+        aPathED.SetText( aPathOpt.GetWorkPath() );
     }
     String sMailName = pModOpt->GetMailName();
 
@@ -499,11 +518,12 @@ void SwMailMergeDlg::ExecQryShell(BOOL bVisible)
 
 IMPL_LINK( SwMailMergeDlg, InsertPathHdl, PushButton *, pBtn )
 {
-    SfxIniManager* pIniManager = SFX_APP()->GetIniManager();
-    ASSERT(pIniManager, "Kein Inimanager angelegt !!");
-    String sPath(aPathED.GetText());
-    if (!sPath.Len())
-        sPath = pIniManager->Get(SFX_KEY_WORK_PATH);
+    String sPath( aPathED.GetText() );
+    if( !sPath.Len() )
+    {
+        SvtPathOptions aPathOpt;
+        sPath = aPathOpt.GetWorkPath();
+    }
     WinBits nBits = WB_3DLOOK|WB_STDMODAL|WB_OPEN|SFXWB_PATHDIALOG;
 
     SfxFileDialog* pFileDlg = new SfxFileDialog( this, nBits );
@@ -539,6 +559,9 @@ IMPL_LINK( SwMailMergeDlg, AttachFileHdl, PushButton *, pBtn )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:35  hr
+    initial import
+
     Revision 1.75  2000/09/18 16:05:27  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 5677a70c11da..c473ff3cf5b4 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldedt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:34:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,9 @@
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
+#ifndef _SFXAPP_HXX //autogen
+#include <sfx2/app.hxx>
+#endif
 #ifndef _SVX_ADRITEM_HXX //autogen
 #include <svx/adritem.hxx>
 #endif
@@ -90,9 +93,6 @@
 #ifndef _DOCUFLD_HXX
 #include <docufld.hxx>
 #endif
-#ifndef _FINDER_HXX
-#include <finder.hxx>
-#endif
 #ifndef _VIEW_HXX
 #include <view.hxx>
 #endif
@@ -396,8 +396,9 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, pButton )
                         SID_ATTR_ADDRESS, SID_ATTR_ADDRESS,
                         SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS,
                         0L );
-    SvxAddressItem aAddress( pPathFinder->GetAddress() );
-    aSet.Put(aAddress);
+    SvxAddressItem aAddress( *SFX_APP()->GetIniManager() );
+    aAddress.SetWhich(SID_ATTR_ADDRESS);
+    aSet.Put( aAddress );
     USHORT nEditPos = UNKNOWN_EDIT;
 
     switch(pCurFld->GetSubType())
@@ -424,13 +425,13 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, pButton )
     aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, nEditPos));
     SwAddrDlg aDlg( this, aSet );
     aDlg.Execute();
-    const SfxItemSet* pSfxItemSet = aDlg.GetOutputItemSet();
-    const SvxAddressItem* pAddrItem;
 
-    if( pSfxItemSet && SFX_ITEM_SET == pSfxItemSet->GetItemState(SID_ATTR_ADDRESS,
-            FALSE, (const SfxPoolItem**)&pAddrItem) )
+    const SfxItemSet* pSfxItemSet = aDlg.GetOutputItemSet();
+    const SfxPoolItem* pItem;
+    if( pSfxItemSet && SFX_ITEM_SET == pSfxItemSet->GetItemState(
+            SID_ATTR_ADDRESS, FALSE, &pItem ) )
     {
-        pPathFinder->SetAddress( (SvxAddressItem&)*pAddrItem );
+        ((SvxAddressItem*)pItem)->Store( *SFX_APP()->GetIniManager() );
         pSh->UpdateFlds( *pCurFld );
     }
 
@@ -440,6 +441,9 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, pButton )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:36  hr
+    initial import
+
     Revision 1.146  2000/09/18 16:05:28  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx
index 464e6a3bb51c..a5e747010949 100644
--- a/sw/source/ui/inc/tablemgr.hxx
+++ b/sw/source/ui/inc/tablemgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tablemgr.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:42 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:34:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,6 +98,8 @@ public:
 
     const SwFrmFmt *GetTableFmt() const { return pFmt; }
 
+    SwWrtShell* GetShell() const { return pSh; }
+
     void InsertChart( SchMemChart& rData, const SfxItemSet* pSet = 0 );
     void UpdateChart();
 };
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 57a637e10fcb..427dd49ce35f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cnttab.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-05 12:23:41 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:35:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,9 @@
 #ifndef SVTOOLS_URIHELPER_HXX
 #include <svtools/urihelper.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
@@ -89,7 +92,7 @@
 #include <sfx2/dispatch.hxx>
 #endif
 #ifndef _SFX_INIMGR_HXX
-#include <sfx2/inimgr.hxx>
+//#include <sfx2/inimgr.hxx>
 #endif
 #ifndef _IODLG_HXX
 #include <sfx2/iodlg.hxx>
@@ -302,7 +305,10 @@ String lcl_CreateAutoMarkFileDlg( Window* pParent, const String& rURL,
     if( rURL.Len() )
         pFileDlg->SetPath( rURL );
     else
-        pFileDlg->SetPath( SFX_INIMANAGER()->Get(SFX_KEY_USERCONFIG_PATH) );
+    {
+        SvtPathOptions aPathOpt;
+        pFileDlg->SetPath( aPathOpt.GetUserConfigPath() );
+    }
 
     if( RET_OK == pFileDlg->Execute())
         sRet = pFileDlg->GetPath();
@@ -693,11 +699,11 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
         if(!pExampleFrame && !bExampleCreated)
         {
             bExampleCreated = sal_True;
-            SfxIniManager* pIniMan = SFX_INIMANAGER();
             const sal_Unicode  cSearch = SFX_SEARCHPATH_DELIMITER;
             const String  sAccess = INET_PATH_TOKEN;
+            SvtPathOptions aPathOpt;
 
-            String sPath(pIniMan->Get(SFX_KEY_TEMPLATE_PATH));
+            String sPath( aPathOpt.GetTemplatePath() );
             sal_uInt16 nTokenCount = sPath.GetTokenCount(cSearch);
             sal_uInt16 nToken = 0;
             sal_Bool bExist = sal_False;
@@ -4778,6 +4784,9 @@ IMPL_LINK(SwAutoMarkDlg_Impl, OkHdl, OKButton*, pButton)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/05 12:23:41  jp
+    should change: remove image
+
     Revision 1.1.1.1  2000/09/18 17:14:43  hr
     initial import
 
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index f96274a0928e..94d688e3cbc7 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.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:35:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,6 +110,9 @@
 #ifndef SVTOOLS_URIHELPER_HXX
 #include <svtools/urihelper.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 #ifndef __RSC //autogen
 #include <tools/errinf.hxx>
 #endif
@@ -119,9 +122,6 @@
 #ifndef _TOOLS_DEBUG_HXX //autogen
 #include <tools/debug.hxx>
 #endif
-#ifndef _SFX_INIMGR_HXX
-#include <sfx2/inimgr.hxx>
-#endif
 
 #ifndef _UNOATXT_HXX
 #include <unoatxt.hxx>
@@ -812,7 +812,8 @@ sal_Bool lcl_FindSameEntry(const SvStrings& rDirArr, const String& rEntryURL)
 
 void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
 {
-    String aNewPath( SFX_INIMANAGER()->Get( SFX_KEY_GLOSSARY_PATH ) );
+    SvtPathOptions aPathOpt;
+    String aNewPath( aPathOpt.GetGlossaryPath() );
     sal_Bool bPathChanged = aPath != aNewPath;
     if (bFull || bPathChanged)
     {
@@ -910,6 +911,9 @@ String  SwGlossaries::GetExtension()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:44  hr
+    initial import
+
     Revision 1.115  2000/09/18 16:05:56  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 26c582d97a12..25f90d44ed7c 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.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:35:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,15 +90,12 @@
 #ifndef _SFXSTRITEM_HXX //autogen
 #include <svtools/stritem.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
 #endif
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
-#ifndef _SFX_INIMGR_HXX //autogen
-#include <sfx2/inimgr.hxx>
-#endif
 #ifndef _IODLG_HXX
 #include <sfx2/iodlg.hxx>
 #endif
@@ -724,7 +721,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
         {
             // call the FileOpenDialog do find WinWord - Files with templates
             SfxFileDialog* pDlg = new SfxFileDialog( this, WB_OPEN | WB_3DLOOK );
-            pDlg->SetPath( SFX_INIMANAGER()->Get( SFX_KEY_WORK_PATH ));
+            SvtPathOptions aPathOpt;
+            pDlg->SetPath( aPathOpt.GetWorkPath() );
             String sWW8( C2S(FILTER_WW8) );
 
             sal_uInt16 i = 0;
@@ -778,7 +776,8 @@ IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG )
     else
     {
         //check if at least one glossary path is write enabled
-        String sGlosPath( SFX_INIMANAGER()->Get( SFX_KEY_GLOSSARY_PATH ) );
+        SvtPathOptions aPathOpt;
+        String sGlosPath( aPathOpt.GetGlossaryPath() );
         USHORT nPaths = sGlosPath.GetTokenCount(';');
         BOOL bIsWritable = FALSE;
         for(USHORT nPath = 0; nPath < nPaths; nPath++)
@@ -1254,14 +1253,15 @@ String SwGlossaryDlg::GetCurrGrpName() const
 IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn )
 {
     SvxMultiPathDialog* pDlg = new SvxMultiPathDialog(pBtn);
-    String sGlosPath( SFX_INIMANAGER()->Get( SFX_KEY_GLOSSARY_PATH ) );
+    SvtPathOptions aPathOpt;
+    String sGlosPath( aPathOpt.GetGlossaryPath() );
     pDlg->SetPath(sGlosPath);
     if(RET_OK == pDlg->Execute())
     {
         String sTmp(pDlg->GetPath());
         if(sTmp != sGlosPath)
         {
-            SFX_INIMANAGER()->Set(sTmp, SFX_KEY_GLOSSARY_PATH);
+            aPathOpt.SetGlossaryPath( sTmp );
             ::GetGlossaries()->UpdateGlosPath( sal_True );
             Init();
         }
@@ -1344,6 +1344,9 @@ void SwGlossaryDlg::ShowAutoText(const String& rGroup, const String& rShortName)
 /*--------------------------------------------------------------------
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:44  hr
+      initial import
+
       Revision 1.154  2000/09/18 16:05:56  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 8c703cd12e64..6ec7604be17d 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmsh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:46 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:36:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,9 +84,6 @@
 #ifndef _SVX_SRCHITEM_HXX
 #include <svx/srchitem.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _IMAP_HXX //autogen
 #include <svtools/imap.hxx>
 #endif
@@ -428,7 +425,6 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             }
             else
             {
-                //SFX_APP()->GetOptions().SetMetric(::GetDfltMetric());
                 SfxItemSet aSet(GetPool(),  RES_FRMATR_BEGIN,       RES_FRMATR_END-1,
                                             SID_ATTR_BORDER_INNER,  SID_ATTR_BORDER_INNER,
                                             FN_GET_PRINT_AREA,      FN_GET_PRINT_AREA,
@@ -1030,6 +1026,9 @@ void  SwFrameShell::StateInsert(SfxItemSet &rSet)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:46  hr
+    initial import
+
     Revision 1.199  2000/09/18 16:06:04  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 0ec01c8df1c7..bd890507062d 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: grfsh.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-05 11:35:18 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:36:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,9 +100,6 @@
 #ifndef _SVX_PROTITEM_HXX //autogen
 #include <svx/protitem.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
@@ -919,6 +916,9 @@ IMPL_LINK( SwTextShell, InitGraphicFrame, Button *, pButton )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/05 11:35:18  jp
+    should change: remove image
+
     Revision 1.1.1.1  2000/09/18 17:14:46  hr
     initial import
 
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 66b2eb5d033f..39f1d2a4ae4c 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabsh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:36:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,9 +127,6 @@
 #ifndef _ZFORMAT_HXX //autogen
 #include <svtools/zformat.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
@@ -1412,6 +1409,9 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:47  hr
+    initial import
+
     Revision 1.246  2000/09/18 16:06:05  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 06e8e8cce811..5454aaec1b0a 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textfld.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:36:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,9 +65,46 @@
 
 #pragma hdrstop
 
-#include "hintids.hxx"  //_immer_ vor den solar-Items
-#include "uiparam.hxx"
+#ifndef _HINTIDS_HXX
+#include <hintids.hxx>  //_immer_ vor den solar-Items
+#endif
+#ifndef _UIPARAM_HXX
+#include <uiparam.hxx>
+#endif
 
+#ifndef _URLOBJ_HXX //autogen
+#include <tools/urlobj.hxx>
+#endif
+#ifndef _MSGBOX_HXX //autogen
+#include <vcl/msgbox.hxx>
+#endif
+#ifndef _LINKDLG_HXX //autogen
+#include <so3/linkdlg.hxx>
+#endif
+#ifndef _LINKDLG_HXX //autogen
+#include <so3/linkdlg.hxx>
+#endif
+#ifndef _SFXITEMPOOL_HXX //autogen
+#include <svtools/itempool.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_USEROPTIONS_HXX
+#include <svtools/useroptions.hxx>
+#endif
+#ifndef _SFX_WHITER_HXX //autogen
+#include <svtools/whiter.hxx>
+#endif
+#ifndef _SFXENUMITEM_HXX //autogen
+#include <svtools/eitem.hxx>
+#endif
+#ifndef _SFXMACITEM_HXX //autogen
+#include <svtools/macitem.hxx>
+#endif
+#ifndef _SFXVIEWFRM_HXX //autogen
+#include <sfx2/viewfrm.hxx>
+#endif
+#ifndef _SFXREQUEST_HXX //autogen
+#include <sfx2/request.hxx>
+#endif
 #ifndef _SVX_POSTATTR_HXX //autogen
 #include <svx/postattr.hxx>
 #endif
@@ -77,52 +114,15 @@
 #ifndef _SVXLINKMGR_HXX
 #include <svx/linkmgr.hxx>
 #endif
-#ifndef _LINKDLG_HXX //autogen
-#include <so3/linkdlg.hxx>
-#endif
 #ifndef _SVX_POSTDLG_HXX //autogen
 #include <svx/postdlg.hxx>
 #endif
-#ifndef _SFXITEMPOOL_HXX //autogen
-#include <svtools/itempool.hxx>
-#endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
-#endif
-#ifndef _OFF_APP_HXX //autogen
-#include <offmgr/app.hxx>
-#endif
-#ifndef _SFX_INIMGR_HXX //autogen
-#include <sfx2/inimgr.hxx>
-#endif
-#ifndef _SFX_WHITER_HXX //autogen
-#include <svtools/whiter.hxx>
-#endif
-#ifndef _MSGBOX_HXX //autogen
-#include <vcl/msgbox.hxx>
-#endif
-#ifndef _URLOBJ_HXX //autogen
-#include <tools/urlobj.hxx>
-#endif
-#ifndef _SFXENUMITEM_HXX //autogen
-#include <svtools/eitem.hxx>
-#endif
-#ifndef _SFXMACITEM_HXX //autogen
-#include <svtools/macitem.hxx>
-#endif
 #ifndef _SVX_ADRITEM_HXX //autogen
 #include <svx/adritem.hxx>
 #endif
-#ifndef _LINKDLG_HXX //autogen
-#include <so3/linkdlg.hxx>
+#ifndef _OFF_APP_HXX //autogen
+#include <offmgr/app.hxx>
 #endif
-#ifndef _SFXVIEWFRM_HXX //autogen
-#include <sfx2/viewfrm.hxx>
-#endif
-#ifndef _SFXREQUEST_HXX //autogen
-#include <sfx2/request.hxx>
-#endif
-
 
 #ifndef _FMTINFMT_HXX //autogen
 #include <fmtinfmt.hxx>
@@ -130,25 +130,58 @@
 #ifndef _FLDWRAP_HXX //autogen
 #include <fldwrap.hxx>
 #endif
-#include "redline.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "cmdid.h"
-#include "basesh.hxx"
-#include "wrtsh.hxx"
-#include "finder.hxx"
-#include "flddat.hxx"
-#include "javaedit.hxx"
-#include "numrule.hxx"
-#include "textsh.hxx"
-#include "docufld.hxx"
-#include "usrfld.hxx"
-#include "ddefld.hxx"
-#include "expfld.hxx"
-#include "fldmgr.hxx"
-#include "fldedt.hxx"
-//#include "addrdlg.hxx"
-#include "shells.hrc"
+#ifndef _REDLINE_HXX
+#include <redline.hxx>
+#endif
+#ifndef _VIEW_HXX
+#include <view.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _BASESH_HXX
+#include <basesh.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _FLDDAT_HXX
+#include <flddat.hxx>
+#endif
+#ifndef _JAVAEDIT_HXX
+#include <javaedit.hxx>
+#endif
+#ifndef _NUMRULE_HXX
+#include <numrule.hxx>
+#endif
+#ifndef _TEXTSH_HXX
+#include <textsh.hxx>
+#endif
+#ifndef _DOCUFLD_HXX
+#include <docufld.hxx>
+#endif
+#ifndef _USRFLD_HXX
+#include <usrfld.hxx>
+#endif
+#ifndef _DDEFLD_HXX
+#include <ddefld.hxx>
+#endif
+#ifndef _EXPFLD_HXX
+#include <expfld.hxx>
+#endif
+#ifndef _FLDMGR_HXX
+#include <fldmgr.hxx>
+#endif
+#ifndef _FLDEDT_HXX
+#include <fldedt.hxx>
+#endif
+
+#ifndef _CMDID_H
+#include <cmdid.h>
+#endif
+#ifndef _SHELLS_HRC
+#include <shells.hrc>
+#endif
 
 
 extern BOOL bNoInterrupt;       // in mainwn.cxx
@@ -327,9 +360,11 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                 }
                 else
                 {
-                    SvxAddressItem aAdr( pPathFinder->GetAddress() );
-                    aSet.Put(SvxPostItTextItem(aEmptyStr, SID_ATTR_POSTIT_TEXT));
-                    aSet.Put(SvxPostItAuthorItem(aAdr.GetShortName(), SID_ATTR_POSTIT_AUTHOR));
+                    SvtUserOptions aUserOpt;
+                    aSet.Put(SvxPostItTextItem( aEmptyStr,
+                                                    SID_ATTR_POSTIT_TEXT));
+                    aSet.Put(SvxPostItAuthorItem( aUserOpt.GetID(),
+                                                    SID_ATTR_POSTIT_AUTHOR));
                     aSet.Put(SvxPostItDateItem(
                             Application::GetAppInternational().
                             GetDate(Date()), SID_ATTR_POSTIT_DATE));
@@ -680,9 +715,10 @@ IMPL_LINK( SwTextShell, PostItNextHdl, Button *, pBtn )
     SvxPostItDialog *pDlg = (SvxPostItDialog*)pBtn;
 
     if( pDlg->IsOkEnabled() )
-        pPostItFldMgr->UpdateCurFld( 0,
-                                    SFX_INIMANAGER()->Get(SFX_KEY_USER_ID),
-                                    pDlg->GetNote() );
+    {
+        SvtUserOptions aUserOpt;
+        pPostItFldMgr->UpdateCurFld( 0, aUserOpt.GetID(), pDlg->GetNote() );
+    }
     pPostItFldMgr->GoNext();
     SwPostItField* pPostIt = (SwPostItField*)pPostItFldMgr->GetCurFld();
     pDlg->SetNote(pPostIt->GetPar2().ConvertLineEnd());
@@ -716,9 +752,10 @@ IMPL_LINK( SwTextShell, PostItPrevHdl, Button *, pBtn )
     SvxPostItDialog *pDlg = (SvxPostItDialog*)pBtn;
 
     if( pDlg->IsOkEnabled() )
-        pPostItFldMgr->UpdateCurFld( 0,
-                                    SFX_INIMANAGER()->Get(SFX_KEY_USER_ID),
-                                    pDlg->GetNote() );
+    {
+        SvtUserOptions aUserOpt;
+        pPostItFldMgr->UpdateCurFld( 0, aUserOpt.GetID(), pDlg->GetNote() );
+    }
     pPostItFldMgr->GoPrev();
     SwPostItField* pPostIt = (SwPostItField*)pPostItFldMgr->GetCurFld();
     pDlg->SetNote(pPostIt->GetPar2().ConvertLineEnd());
@@ -872,6 +909,9 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, Button *, pBtn )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:47  hr
+    initial import
+
     Revision 1.117  2000/09/18 16:06:05  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 167dd4a2ea4c..0679df041e20 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textsh1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:36:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,9 +84,6 @@
 #ifndef _SFX_WHITER_HXX //autogen
 #include <svtools/whiter.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
@@ -1022,6 +1019,9 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:47  hr
+    initial import
+
     Revision 1.171  2000/09/18 16:06:06  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index ba5cb6c0556f..a949fbeed15e 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: colwd.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:37:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,23 +68,41 @@
 #ifndef _SFXDISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
-#ifndef _OFF_APP_HXX //autogen
-#include <offmgr/app.hxx>
-#endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SVX_DLGUTIL_HXX //autogen
 #include <svx/dlgutil.hxx>
 #endif
 
+#ifndef _COLWD_HXX
+#include <colwd.hxx>
+#endif
+#ifndef _TABLEMGR_HXX
+#include <tablemgr.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _WDOCSH_HXX
+#include <wdocsh.hxx>
+#endif
+#ifndef _VIEW_HXX
+#include <view.hxx>
+#endif
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _MODCFG_HXX
+#include <modcfg.hxx>
+#endif
 
-#include "cmdid.h"
-#include "colwd.hxx"
-#include "tablemgr.hxx"
-
-#include "colwd.hrc"
-#include "table.hrc"
+#ifndef _CMDID_H
+#include <cmdid.h>
+#endif
+#ifndef _COLWD_HRC
+#include <colwd.hrc>
+#endif
+#ifndef _TABLE_HRC
+#include <table.hrc>
+#endif
 
 
 IMPL_LINK_INLINE_START( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG )
@@ -114,7 +132,14 @@ SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) :
     rFnc(rTableFnc)
 {
     FreeResource();
-    ::SetFieldUnit(aWidthEdit, OFF_APP()->GetOptions().GetMetric());
+
+    BOOL bIsWeb = rTableFnc.GetShell()
+                    ? 0 != PTR_CAST( SwWebDocShell,
+                            rTableFnc.GetShell()->GetView().GetDocShell() )
+                    : FALSE;
+    FieldUnit eFieldUnit = SW_MOD()->GetModuleConfig()->GetMetric( bIsWeb );
+    ::SetFieldUnit(aWidthEdit, eFieldUnit );
+
     aColEdit.SetValue( rFnc.GetCurColNum() +1 );
     aWidthEdit.SetMin(aWidthEdit.Normalize(MINLAY), FUNIT_TWIP);
     if(!aWidthEdit.GetMin())
@@ -139,6 +164,9 @@ void SwTableWidthDlg::Apply()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:47  hr
+    initial import
+
     Revision 1.40  2000/09/18 16:06:07  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index e447c11256ba..8a1b31b55966 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rowht.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:37:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,28 +74,48 @@
 #ifndef _SFXDISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
-#ifndef _OFF_APP_HXX //autogen
-#include <offmgr/app.hxx>
-#endif
 #ifndef _SVX_DLGUTIL_HXX //autogen
 #include <svx/dlgutil.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 
 
 #ifndef _FMTFSIZE_HXX //autogen
 #include <fmtfsize.hxx>
 #endif
-#include "cmdid.h"
-#include "swtypes.hxx"
-#include "rowht.hxx"
-#include "wrtsh.hxx"
-#include "frmatr.hxx"
+#ifndef _SWTYPES_HXX
+#include <swtypes.hxx>
+#endif
+#ifndef _ROWHT_HXX
+#include <rowht.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _FRMATR_HXX
+#include <frmatr.hxx>
+#endif
+#ifndef _WDOCSH_HXX
+#include <wdocsh.hxx>
+#endif
+#ifndef _VIEW_HXX
+#include <view.hxx>
+#endif
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _MODCFG_HXX
+#include <modcfg.hxx>
+#endif
 
-#include "rowht.hrc"
-#include "table.hrc"
+#ifndef _CMDID_H
+#include <cmdid.h>
+#endif
+#ifndef _ROWHT_HRC
+#include <rowht.hrc>
+#endif
+#ifndef _TABLE_HRC
+#include <table.hrc>
+#endif
 
 
 
@@ -130,7 +150,12 @@ SwTableHeightDlg::SwTableHeightDlg( Window *pParent, SwWrtShell &rS ) :
     rSh( rS )
 {
     FreeResource();
-    ::SetFieldUnit(aHeightEdit, OFF_APP()->GetOptions().GetMetric());
+
+    const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
+    FieldUnit eFieldUnit = pModOpt->GetMetric(0 != PTR_CAST( SwWebDocShell,
+                                rSh.GetView().GetDocShell() ));
+    ::SetFieldUnit( aHeightEdit, eFieldUnit );
+
     aHeightEdit.SetMin(MINLAY, FUNIT_TWIP);
     if(!aHeightEdit.GetMin())
         aHeightEdit.SetMin(1);
@@ -149,6 +174,9 @@ SwTableHeightDlg::SwTableHeightDlg( Window *pParent, SwWrtShell &rS ) :
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:48  hr
+    initial import
+
     Revision 1.38  2000/09/18 16:06:08  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 2c50afbe7de5..e1ea11cd269a 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: srcview.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:38:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,6 +103,9 @@
 #ifndef _SFXSTRITEM_HXX //autogen
 #include <svtools/stritem.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 #ifndef _UNDO_HXX //autogen
 #include <svtools/undo.hxx>
 #endif
@@ -118,6 +121,9 @@
 #ifndef _SFX_WHITER_HXX //autogen
 #include <svtools/whiter.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_SAVEOPT_HXX
+#include <svtools/saveopt.hxx>
+#endif
 #ifndef _IODLG_HXX //autogen
 #include <sfx2/iodlg.hxx>
 #endif
@@ -139,9 +145,6 @@
 #ifndef _SFXDOCFILE_HXX //autogen
 #include <sfx2/docfile.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SVX_FHGTITEM_HXX //autogen
 #include <svx/fhgtitem.hxx>
 #endif
@@ -498,7 +501,7 @@ void SwSrcView::SaveContent(const String& rTmpFile)
  --------------------------------------------------------------------*/
 
 
-void __EXPORT SwSrcView::Execute(SfxRequest& rReq)
+void SwSrcView::Execute(SfxRequest& rReq)
 {
     USHORT nSlot = rReq.GetSlot();
     const SfxItemSet* pArgs = rReq.GetArgs();
@@ -528,6 +531,7 @@ void __EXPORT SwSrcView::Execute(SfxRequest& rReq)
         break;
         case SID_SAVEASDOC:
         {
+            SvtPathOptions aPathOpt;
             Window* pParent = &GetViewFrame()->GetWindow();
             SfxFileDialog* pFileDlg = new SfxFileDialog(pParent, WB_SAVEAS|WB_3DLOOK);
             pFileDlg->DisableSaveLastDirectory();
@@ -535,7 +539,7 @@ void __EXPORT SwSrcView::Execute(SfxRequest& rReq)
             String sHtml(C2S("HTML"));
             pFileDlg->AddFilter( sHtml, C2S("*.html;*.htm") );
             pFileDlg->SetCurFilter( sHtml );
-            pFileDlg->SetPath( SFX_INIMANAGER()->Get( SFX_KEY_WORK_PATH ) );
+            pFileDlg->SetPath( aPathOpt.GetWorkPath() );
             if( RET_OK == pFileDlg->Execute())
             {
                 String aFileName = pFileDlg->GetPath();
@@ -669,7 +673,7 @@ void __EXPORT SwSrcView::Execute(SfxRequest& rReq)
  --------------------------------------------------------------------*/
 
 
-void __EXPORT SwSrcView::GetState(SfxItemSet& rSet)
+void SwSrcView::GetState(SfxItemSet& rSet)
 {
     SfxWhichIter aIter(rSet);
     USHORT nWhich = aIter.FirstWhich();
@@ -927,7 +931,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
 /*-----------------02.07.97 09:29-------------------
 
 --------------------------------------------------*/
-USHORT __EXPORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags )
+USHORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags )
 {
     SwDocShell* pDocSh = GetDocShell();
     if ( (SFX_PRINTER_JOBSETUP | SFX_PRINTER_PRINTER) & nDiffFlags )
@@ -1053,7 +1057,7 @@ ErrCode SwSrcView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg,
  --------------------------------------------------------------------*/
 
 
-SfxPrinter* __EXPORT SwSrcView::GetPrinter( BOOL bCreate )
+SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate )
 {
     return  GetDocShell()->GetDoc()->GetPrt( bCreate );
 }
@@ -1063,7 +1067,7 @@ SfxPrinter* __EXPORT SwSrcView::GetPrinter( BOOL bCreate )
  --------------------------------------------------------------------*/
 
 
-void __EXPORT SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     if ( rHint.ISA(SfxSimpleHint) &&
             (((SfxSimpleHint&) rHint).GetId() == SFX_HINT_MODECHANGED) ||
@@ -1112,13 +1116,12 @@ void SwSrcView::Load(SwDocShell* pDocShell)
     {
         TempFile aTempFile;
         aTempFile.EnableKillingFile();
-        String sFileURL = aTempFile.GetName();
+        String sFileURL( aTempFile.GetName() ),
+               sBaseURL( INetURLObject::GetBaseURL() );
         BOOL bIsRemote = pMedium->IsRemote();
-        SfxOptions& rOpt = SFX_APP()->GetOptions();
-        String sBaseURL = INetURLObject::GetBaseURL();
+        SvtSaveOptions aOpt;
 
-        if( rOpt.IsSaveRelINet() && bIsRemote ||
-                rOpt.IsSaveRelFSys() && !bIsRemote)
+        if( bIsRemote ? aOpt.IsSaveRelINet() : aOpt.IsSaveRelFSys() )
             INetURLObject::SetBaseURL( pMedium->GetName() );
         else
             INetURLObject::SetBaseURL( aEmptyStr );
@@ -1162,6 +1165,9 @@ void SwSrcView::Load(SwDocShell* pDocShell)
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:48  hr
+    initial import
+
     Revision 1.109  2000/09/18 16:06:11  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index d7b3bae2cb0a..899afeda221c 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: view.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-05 12:34:18 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:38:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,6 +84,9 @@
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_UNDOOPT_HXX
+#include <svtools/undoopt.hxx>
+#endif
 #ifndef _SFXDISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
@@ -93,9 +96,6 @@
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
-#ifndef _SFX_SAVEOPT_HXX //autogen
-#include <sfx2/saveopt.hxx>
-#endif
 #ifndef _SFXDOCFILE_HXX //autogen
 #include <sfx2/docfile.hxx>
 #endif
@@ -911,7 +911,10 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh )
         !((SvEmbeddedObject *)pDocSh)->GetVisArea().IsEmpty() )
         SetVisArea( ((SvEmbeddedObject *)pDocSh)->GetVisArea(),sal_False);
 
-    SwEditShell::SetUndoActionCount( SFX_APP()->GetOptions().GetUndoCount() );
+    {
+        SvtUndoOptions aOpt;
+        SwEditShell::SetUndoActionCount( aOpt.GetUndoCount() );
+    }
     pWrtShell->DoUndo( 0 != SwEditShell::GetUndoActionCount() );
 
     const FASTBOOL bBrowse = pWrtShell->GetDoc()->IsBrowseMode();
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index caf2a45622b0..6865307997d2 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewling.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:49 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:38:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,24 +131,55 @@
 #ifndef _SWWAIT_HXX
 #include <swwait.hxx>
 #endif
-#include "initui.hxx"               // fuer SpellPointer
-#include "finder.hxx"               // Pathes fuer Lingu
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "basesh.hxx"
-#include "docsh.hxx"                // CheckSpellChanges
-#include "viewopt.hxx"              // Viewoptions
-#include "swundo.hxx"               // fuer Undo-Ids
-#include "cmdid.h"
-#include "globals.hrc"
-#include "comcore.hrc"              // STR_MULT_INTERACT_SPELL_WARN
-#include "splwrp.hxx"               //    "
-#include "hyp.hxx"                  // Trennung
-#include "olmenu.hxx"               // PopupMenu fuer OnlineSpelling
-#include "pam.hxx"                  // Spelling: Multiselektion
-#include "edtwin.hxx"
+#ifndef _INITUI_HXX
+#include <initui.hxx>               // fuer SpellPointer
+#endif
+#ifndef _VIEW_HXX
+#include <view.hxx>
+#endif
+#ifndef _WRTSH_HXX
+#include <wrtsh.hxx>
+#endif
+#ifndef _BASESH_HXX
+#include <basesh.hxx>
+#endif
+#ifndef _DOCSH_HXX
+#include <docsh.hxx>                // CheckSpellChanges
+#endif
+#ifndef _VIEWOPT_HXX
+#include <viewopt.hxx>              // Viewoptions
+#endif
+#ifndef _SWUNDO_HXX
+#include <swundo.hxx>               // fuer Undo-Ids
+#endif
+#ifndef _CMDID_H
+#include <cmdid.h>
+#endif
+#ifndef _GLOBALS_HRC
+#include <globals.hrc>
+#endif
+#ifndef _COMCORE_HRC
+#include <comcore.hrc>              // STR_MULT_INTERACT_SPELL_WARN
+#endif
+#ifndef _SPLWRP_HXX
+#include <splwrp.hxx>               //    "
+#endif
+#ifndef _HYP_HXX
+#include <hyp.hxx>                  // Trennung
+#endif
+#ifndef _OLMENU_HXX
+#include <olmenu.hxx>               // PopupMenu fuer OnlineSpelling
+#endif
+#ifndef _PAM_HXX
+#include <pam.hxx>                  // Spelling: Multiselektion
+#endif
+#ifndef _EDTWIN_HXX
+#include <edtwin.hxx>
+#endif
 
-#include "view.hrc"
+#ifndef _VIEW_HRC
+#include <view.hrc>
+#endif
 
 using namespace ::com::sun::star;
 #define C2U(cChar) rtl::OUString::createFromAscii(cChar)
@@ -703,6 +734,9 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:49  hr
+    initial import
+
     Revision 1.135  2000/09/18 16:06:13  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index a18929fb7884..5bef44eebed7 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewprt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:49 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:38:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,9 +128,6 @@
 #ifndef _DOCSH_HXX
 #include <docsh.hxx>
 #endif
-#ifndef _FINDER_HXX
-#include <finder.hxx>
-#endif
 #ifndef _VIEWOPT_HXX
 #include <viewopt.hxx>
 #endif
@@ -633,6 +630,9 @@ void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb )
 /*--------------------------------------------------------------------
 
 $Log: not supported by cvs2svn $
+Revision 1.1.1.1  2000/09/18 17:14:49  hr
+initial import
+
 Revision 1.143  2000/09/18 16:06:14  willem.vandorp
 OpenOffice header added.
 
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index 3f9337b1306f..c5dcf46fbff1 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gloslst.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-09-27 12:27:59 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:39:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,6 +70,9 @@
 #define _SVSTDARR_STRINGS
 #include <svtools/svstdarr.hxx>
 
+#ifndef _SHL_HXX
+#include <tools/shl.hxx>
+#endif
 #ifndef _SV_DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
 #endif
@@ -85,11 +88,17 @@
 #ifndef _SV_LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
 #ifndef SVTOOLS_FSTATHELPER_HXX
 #include <svtools/fstathelper.hxx>
 #endif
-#ifndef _SFX_INIMGR_HXX
-#include <sfx2/inimgr.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+#ifndef _UCBHELPER_CONTENT_HXX
+#include <ucbhelper/content.hxx>
 #endif
 
 #ifndef _SWTYPES_HXX
@@ -140,13 +149,7 @@
 #endif
 #endif
 
-#ifndef _UCBHELPER_CONTENT_HXX
-#include <ucbhelper/content.hxx>
-#endif
 
-#ifndef _SHL_HXX
-#include <tools/shl.hxx>
-#endif
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -228,9 +231,10 @@ IMPL_LINK(SwGlossDecideDlg, SelectHdl, ListBox*, EMPTYARG)
 
 
 SwGlossaryList::SwGlossaryList() :
-    bFilled(FALSE),
-    sPath( SFX_INIMANAGER()->Get( SFX_KEY_GLOSSARY_PATH ) )
+    bFilled(FALSE)
 {
+    SvtPathOptions aPathOpt;
+    sPath = aPathOpt.GetGlossaryPath();
     SetTimeout(GLOS_TIMEOUT);
 }
 
@@ -390,7 +394,9 @@ void SwGlossaryList::Update()
 {
     if(!IsActive())
         Start();
-    String sTemp( SFX_INIMANAGER()->Get( SFX_KEY_GLOSSARY_PATH ) );
+
+    SvtPathOptions aPathOpt;
+    String sTemp( aPathOpt.GetGlossaryPath() );
     if(sTemp != sPath)
     {
         sPath = sTemp;
@@ -625,11 +631,14 @@ void    SwGlossaryList::ClearGroups()
 
     Source Code Control System - Header
 
-    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/ui/utlui/gloslst.cxx,v 1.2 2000-09-27 12:27:59 jp Exp $
+    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/ui/utlui/gloslst.cxx,v 1.3 2000-10-06 13:39:19 jp Exp $
 
     Source Code Control System - Update
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/09/27 12:27:59  jp
+    use the new FileStatHelper class
+
     Revision 1.1.1.1  2000/09/18 17:14:50  hr
     initial import
 
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 5357961dfc2b..28f0171998d7 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: initui.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:50 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:39:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,9 +71,6 @@
 #ifndef _VIEWSH_HXX
 #include <viewsh.hxx>
 #endif
-#ifndef _FINDER_HXX
-#include <finder.hxx>
-#endif
 #ifndef _INITUI_HXX
 #include <initui.hxx>
 #endif
@@ -114,7 +111,6 @@
 SwGlossaries*       pGlossaries = 0;
 
 // Liefert alle benoetigten Pfade. Wird durch UI initialisiert
-SwPathFinder*       pPathFinder = 0;
 SwGlossaryList*     pGlossaryList = 0;
 
 String* pOldGrfCat = 0;
@@ -139,7 +135,6 @@ void _FinitUI()
 
     SwEditWin::_FinitStaticData();
 
-    DELETEZ(pPathFinder);
     DELETEZ(pGlossaries);
 
     delete SwFieldType::pFldNames;
@@ -163,7 +158,6 @@ void _FinitUI()
 
 void _InitUI()
 {
-    pPathFinder = new SwPathFinder;
     // ShellResource gibt der CORE die Moeglichkeit mit Resourcen zu arbeiten
     ViewShell::SetShellRes( new ShellResource );
     pDBNameList = new SvStringsDtor( 5, 5 );
@@ -308,6 +302,9 @@ const String&   SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType)
 /*************************************************************************
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:50  hr
+    initial import
+
     Revision 1.112  2000/09/18 16:06:17  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/utlui/makefile.mk b/sw/source/ui/utlui/makefile.mk
index 2017055274e5..92cba16ca4b1 100644
--- a/sw/source/ui/utlui/makefile.mk
+++ b/sw/source/ui/utlui/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 17:14:50 $
+#   last change: $Author: jp $ $Date: 2000-10-06 13:39:19 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,8 +71,6 @@ PROJECTPCH=ui_pch
 PDBTARGET=ui_pch
 PROJECTPCHSOURCE=..\ui_1st\ui_pch
 
-# future: DEMO\finder.obj
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  $(PRJ)$/inc$/swpre.mk
@@ -89,7 +87,6 @@ CXXFILES = \
         bookctrl.cxx \
         condedit.cxx \
         content.cxx \
-        finder.cxx \
         gloslst.cxx \
         glbltree.cxx \
         initui.cxx \
@@ -119,7 +116,6 @@ SLOFILES =  \
         $(SLO)$/bookctrl.obj \
         $(SLO)$/condedit.obj \
         $(SLO)$/content.obj \
-        $(SLO)$/finder.obj \
         $(SLO)$/gloslst.obj \
         $(SLO)$/glbltree.obj \
         $(SLO)$/initui.obj \
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index cd5702f84b04..dffba845f495 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtsh1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:53 $
+ *  last change: $Author: jp $ $Date: 2000-10-06 13:41:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,19 +140,6 @@
 #include <sfx2/printer.hxx>
 #endif
 
-// MONIKER-SS
-#ifndef PRODUCT
-// fuer den neuen SvBaseLink!
-#ifndef _URLOBJ_HXX //autogen
-#include <tools/urlobj.hxx>
-#endif
-#ifndef _FINDER_HXX
-#include <finder.hxx>
-#endif
-#endif
-// MONIKER-SS
-
-
 #ifndef _FMTFTN_HXX //autogen
 #include <fmtftn.hxx>
 #endif
@@ -1588,6 +1575,9 @@ void SwWrtShell::NewCoreSelection()
 /*************************************************************************
 
    $Log: not supported by cvs2svn $
+   Revision 1.1.1.1  2000/09/18 17:14:53  hr
+   initial import
+
    Revision 1.342  2000/09/18 16:06:27  willem.vandorp
    OpenOffice header added.