MUST obsolete soffice.ini / SfxIniManager ...

47 files changed, 1699 insertions, 195 deletions

diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx
index f8ebb69422d0..7cee3c69e6a3 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfxhelp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sfxhelp.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:24 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,9 @@
 #ifndef _HELP_HXX //autogen
 #include <vcl/help.hxx>
 #endif
+#ifndef _SV_CONFIG_HXX
+#include <vcl/config.hxx>
+#endif
 #include <childwin.hxx>
 #include <dockwin.hxx>
 
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index e76119b9446d..7a212e9a60dd 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-26 16:01:05 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,6 +213,9 @@
 #include <svtools/saveopt.hxx>
 #include <svtools/undoopt.hxx>
 #include <svtools/helpopt.hxx>
+#include <svtools/menuoptions.hxx>
+#include <svtools/pathoptions.hxx>
+#include <svtools/workingsetoptions.hxx>
 
 // Static member
 SfxApplication* SfxApplication::pApp = NULL;
@@ -257,7 +260,9 @@ SfxApplication::SfxApplication()
     , pAppDispat( 0 )
     , bDispatcherLocked( sal_False )
     , pResMgr( 0 )
+#ifdef ENABLE_INIMANAGER//MUSTINI
     , pAppIniMgr( 0 )
+#endif
     , pCfgMgr( 0 )
     , pSlotPool( 0 )
     , pInterfaces( 0 )
@@ -287,10 +292,15 @@ SfxApplication::SfxApplication()
     pImp->pSimpleResManager = 0;
     pImp->nWarnLevel = 0;
     pImp->pAutoSaveTimer = 0;
+#ifdef ENABLE_INIMANAGER//MUSTINI
     pAppIniMgr = CreateIniManager();
     pAppData_Impl = new SfxAppData_Impl( this );
     pAppData_Impl->StartListening( *pAppIniMgr );
     pAppData_Impl->UpdateApplicationSettings( pAppIniMgr->IsDontHideDisabledEntries() );
+#else
+    pAppData_Impl = new SfxAppData_Impl( this );
+    pAppData_Impl->UpdateApplicationSettings( SvtMenuOptions().IsEntryHidingEnabled() );
+#endif
     pApp->PreInit();
 
     pAppData_Impl->pSaveOptions = new SvtSaveOptions;
@@ -324,7 +334,9 @@ SfxApplication::~SfxApplication()
     Broadcast( SfxSimpleHint(SFX_HINT_DYING) );
     delete pImp;
     delete pAppData_Impl;
+#ifdef ENABLE_INIMANAGER//MUSTINI
     SfxIniManager::Close();
+#endif
     utl::ConfigManager::RemoveConfigManager();
     pApp = 0;
 }
@@ -822,7 +834,11 @@ void SfxApplication::SetViewFrame( SfxViewFrame *pFrame )
         if ( !pSh )
         {
             // Wenn es ein Dokument gibt, wird die BaseURL im Activate gesetzt
+#if SUPD<613//MUSTINI
             INetURLObject aObject( GetIniManager()->Get( SFX_KEY_WORK_PATH ), INET_PROT_FILE );
+#else
+            INetURLObject aObject( SvtPathOptions().GetWorkPath(), INET_PROT_FILE );
+#endif
             aObject.setFinalSlash();
             INetURLObject::SetBaseURL( aObject.GetMainURL() );
         }
@@ -1212,10 +1228,10 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError )
     CntSystem::Flush();
 #endif
 
+#if SUPD<613//MUSTINI
     INetURLObject aSaveObj( pAppIniMgr->Get( SFX_KEY_BACKUP_PATH ), INET_PROT_FILE );
     if ( Application::IsInExecute() )
     {
-        // save all modified documents and close all documents
         SfxObjectShell *pIter, *pNext;
         sal_uInt16 n = 0;
         for(pIter = SfxObjectShell::GetFirst(); pIter; pIter = pNext)
@@ -1276,7 +1292,6 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError )
                         aEntry += DEFINE_CONST_UNICODE("title;"),
                         aEntry += aOldName;
                     }
-
                     pAppIniMgr->Set( aEntry, SFX_GROUP_WORKINGSET_IMPL, DEFINE_CONST_UNICODE("Recover"), n++ );
                 }
                 /*catch ( ::Exception & )
@@ -1284,7 +1299,6 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError )
                 }*/
             }
         }
-
         pAppIniMgr->Flush();
 
         if ( ( nError & EXC_MAJORTYPE ) != EXC_DISPLAY && ( nError & EXC_MAJORTYPE ) != EXC_REMOTE )
@@ -1295,7 +1309,100 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError )
     }
     else
         pAppIniMgr->Flush();
+#else//MUSTINI
+    INetURLObject aSaveObj( SvtPathOptions().GetBackupPath(), INET_PROT_FILE );
+    // save all modified documents and close all documents
+    // Do it only, if it's allowed! Ask configuration for right flag.
+    if(
+        ( Application::IsInExecute()                                    ) &&
+        ( pAppData_Impl->pSaveOptions->IsSaveWorkingSet() == sal_True   )
+    )
+    {
+        SfxObjectShell *pIter, *pNext;
+        sal_uInt16 n = 0;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString > seqWindowList;
+        for(pIter = SfxObjectShell::GetFirst(); pIter; pIter = pNext)
+        {
+            pNext = SfxObjectShell::GetNext(*pIter);
+            if( pIter->IsModified() && pIter->GetName().CompareToAscii("BasicIDE") != COMPARE_EQUAL && !pIter->IsLoading() )
+            {
+                //try
+                {
+                    // backup unsaved document
+                    SFX_ITEMSET_ARG( pIter->GetMedium()->GetItemSet(), pPassItem, SfxStringItem, SID_PASSWORD, sal_False );
+                    SfxRequest aReq(SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, pIter->GetPool());
+
+                    sal_Bool bHadName = pIter->HasName();
+                    INetURLObject aOldURL = pIter->GetMedium()->GetURLObject();
+                    String aOldName = pIter->GetTitle();
+
+                    const SfxFilter *pFilter = pIter->GetMedium()->GetFilter();
+                    const SfxFilter *pOrigFilter = pFilter;
+                    if ( !pFilter || ( pFilter->GetFilterFlags() & SFX_FILTER_PACKED ) || !( pFilter->GetFilterFlags() & SFX_FILTER_EXPORT ) )
+                        // packed files must be saved with default format, but remember original filter !
+                        pFilter = pIter->GetFactory().GetFilter(0);
 
+                    String aSaveName, aSavePath = aSaveObj.GetMainURL();
+                    String aFilterName;
+                    if ( pFilter )
+                    {
+                        aFilterName = pFilter->GetName();
+                        TempFile aTempFile( &aSavePath );
+                        aSaveName = aTempFile.GetName();
+                    }
+                    else
+                    {
+                        String aExt( DEFINE_CONST_UNICODE( ".sav" ) );
+                        TempFile aTempFile( DEFINE_CONST_UNICODE( "exc" ), &aExt, &aSavePath );
+                        aSaveName = aTempFile.GetName();
+                    }
+
+                    aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aSaveName ) );
+                    aReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilterName ) );
+                    if ( pPassItem )
+                        aReq.AppendItem( *pPassItem );
+
+                    pIter->ExecuteSlot(aReq);
+
+                    String aEntry( n );
+                    aEntry += aSaveName;
+                    aEntry += DEFINE_CONST_UNICODE(";");
+                    aEntry += pOrigFilter ? pOrigFilter->GetName() : aFilterName;
+                    aEntry += DEFINE_CONST_UNICODE(";");
+
+                    if ( bHadName && INET_PROT_FILE == aOldURL.GetProtocol() )
+                    {
+                        aEntry += DEFINE_CONST_UNICODE("url;"),
+                        aEntry += aOldURL.GetMainURL();
+                    }
+                    else
+                    {
+                        aEntry += DEFINE_CONST_UNICODE("title;"),
+                        aEntry += aOldName;
+                    }
+
+                    seqWindowList.realloc(n+1);
+                    seqWindowList[n] = aEntry;
+                    ++n;
+                }
+                /*catch ( ::Exception & )
+                {
+                }*/
+            }
+        }
+
+        SvtWorkingSetOptions().SetWindowList( seqWindowList );
+
+        if ( ( nError & EXC_MAJORTYPE ) != EXC_DISPLAY && ( nError & EXC_MAJORTYPE ) != EXC_REMOTE )
+        {
+            Window *pTopWindow = GetTopWindow(); // GCC needs temporary
+            WarningBox( pTopWindow, SfxResId(STR_RECOVER_PREPARED) ).Execute();
+        }
+    }
+#endif//MUSTINI
+
+#if SUPD<613//MUSTINI
+/*TODO: We need a new key to save informations for SenCrashMail feature.*/
     sal_Bool bSendMail = (sal_uInt16) pAppIniMgr->ReadKey( DEFINE_CONST_UNICODE("Common"), DEFINE_CONST_UNICODE("SendCrashMail") ).ToInt32();
     if ( !pAppData_Impl->bBean && bSendMail )
     {
@@ -1351,7 +1458,7 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError )
             pAppIniMgr->Flush();
         }
     }
-
+#endif//MUSTINI
     switch( nError & EXC_MAJORTYPE )
     {
         case EXC_USER:
@@ -1376,8 +1483,6 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError )
 
 ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
 {
-    DBG_ASSERT( pAppIniMgr, "call CreateIniManger() before!" )
-
     String aMgrName = String::CreateFromAscii( pPrefix );
     aMgrName += String::CreateFromInt32(SOLARUPD); // aktuelle Versionsnummer
     return ResMgr::CreateResMgr(U2S(aMgrName));
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 619c3856c785..8180d90d69ce 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appbas.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,9 +108,11 @@
 #ifndef _SB_SBSTAR_HXX //autogen
 #include <basic/sbstar.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
 #ifndef _SVSTOR_HXX //autogen
 #include <so3/svstor.hxx>
 #endif
@@ -137,6 +139,8 @@
 #endif
 
 #include <svtools/undoopt.hxx>
+#include <svtools/pathoptions.hxx>
+#include <svtools/useroptions.hxx>
 
 #pragma hdrstop
 
@@ -528,7 +532,11 @@ sal_uInt16 SfxApplication::SaveBasicManager() const
     // Ncht den vom BasicManager, falls inzwischen der Pfad geaendert wurde !?
     // So wird natuerlich auch das erste Dir genommen, wenn der BasicManager
     // vorher im zweiten gefunden wurde...
+/*MUSTINI-----------------------------------------------------------------------------
     String aBasicPath( GetIniManager()->Get( SFX_KEY_BASIC_PATH ) );
+*/
+    String aBasicPath( SvtPathOptions().GetBasicPath() );
+/*MUSTINI-----------------------------------------------------------------------------*/
     INetURLObject aAppBasicObj( aBasicPath.GetToken(0), INET_PROT_FILE );
     aAppBasicObj.insertName( Application::GetAppName() );
     aAppBasicObj.setExtension( DEFINE_CONST_UNICODE( "sbl" ) );
@@ -617,13 +625,22 @@ BasicManager* SfxApplication::GetBasicManager()
     if ( !pImp->pBasicMgr )
     {
         // Directory bestimmen
-        SfxIniManager* pIniMgr = GetIniManager();
+#if SUPD<613//MUSTINI
+         SfxIniManager* pIniMgr = GetIniManager();
         String aAppBasicDir( pIniMgr->Get( SFX_KEY_BASIC_PATH ) );
         if ( !aAppBasicDir.Len() )
         {
             aAppBasicDir = pIniMgr->GetProgramPath();
             pIniMgr->Set( aAppBasicDir, SFX_KEY_BASIC_PATH );
         }
+#else
+        SvtPathOptions aPathCFG;
+        String aAppBasicDir( aPathCFG.GetBasicPath() );
+        if ( !aAppBasicDir.Len() )
+        {
+            aPathCFG.SetBasicPath( aPathCFG.SubstituteVariable( String::CreateFromAscii("$(insturl)") ) );
+        }
+#endif
 
         // #58293# soffice.new nur im ::com::sun::star::sdbcx::User-Dir suchen => erstes Verzeichnis
         String aAppFirstBasicDir = aAppBasicDir.GetToken(0);
@@ -896,8 +913,9 @@ void SfxApplication::EventState_Impl
 //-------------------------------------------------------------------------
 void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 {
+#if SUPD<613//MUSTINI
     SfxIniManager *pIniMgr = GetIniManager();
-
+#endif
     const SfxItemSet *pArgs = rReq.GetArgs();
     sal_uInt16 nSID = rReq.GetSlot();
     switch ( nSID )
@@ -934,7 +952,11 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
         case SID_DEFAULTFILEPATH:
         {
             SFX_REQUEST_ARG(rReq, pPathItem, SfxStringItem, nSID, sal_False);
+#if SUPD<613//MUSTINI
             pIniMgr->Set(pPathItem->GetValue(), SFX_KEY_WORK_PATH );
+#else
+            SvtPathOptions().SetWorkPath( pPathItem->GetValue() );
+#endif
             break;
         }
 
@@ -1016,6 +1038,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
             break;
         }
 
+#if SUPD<613//MUSTINI
         case SID_OFFICE_PRIVATE_USE:
         case SID_OFFICE_COMMERCIAL_USE:
         {
@@ -1035,14 +1058,25 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
             }
             break;
         }
-
+#else
+        case SID_OFFICE_PRIVATE_USE:
+        case SID_OFFICE_COMMERCIAL_USE:
+        {
+            DBG_ASSERT( sal_False, "SfxApplication::PropExec_Impl()\nSID_OFFICE_PRIVATE_USE & SID_OFFICE_COMMERCIAL_USE are obsolete!\n" );
+            break;
+        }
+#endif
         case SID_OFFICE_CUSTOMERNUMBER:
         {
             SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, nSID, sal_False);
 
             if ( pStringItem )
+#if SUPD<613//MUSTINI
                 pIniMgr->Set( pStringItem->GetValue(),
                               SFX_KEY_CUSTOMERNUMBER );
+#else
+                SvtUserOptions().SetCustomerNumber( pStringItem->GetValue() );
+#endif
             break;
         }
     }
@@ -1052,8 +1086,9 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 void SfxApplication::PropState_Impl( SfxItemSet &rSet )
 {
     SfxViewFrame *pFrame = SfxViewFrame::Current();
+#if SUPD<613//MUSTINI
     SfxIniManager *pIniMgr = GetIniManager();
-
+#endif
     SfxWhichIter aIter(rSet);
     for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
     {
@@ -1134,7 +1169,11 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
                 break;
 
             case SID_DEFAULTFILEPATH:
+#if SUPD<613//MUSTINI
                 rSet.Put( SfxStringItem( SID_DEFAULTFILEPATH, pIniMgr->Get(SFX_KEY_WORK_PATH) ) );
+#else
+                rSet.Put( SfxStringItem( SID_DEFAULTFILEPATH, SvtPathOptions().GetWorkPath() ) );
+#endif
                 break;
 
             case SID_PROGFILENAME:
@@ -1142,7 +1181,11 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
                 break;
 
             case SID_PROGPATH:
+#if SUPD<613//MUSTINI
                 rSet.Put( SfxStringItem( SID_PROGPATH, pIniMgr->GetProgramPath() ) );
+#else
+                rSet.Put( SfxStringItem( SID_PROGPATH, SvtPathOptions().SubstituteVariable( String::CreateFromAscii("$(prog)") ) ) );
+#endif
                 break;
 
             case SID_INTERACTIVEMODE:
@@ -1262,6 +1305,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
             }
             break;
 
+#if SUPD<613//MUSTINI
             case SID_OFFICE_PRIVATE_USE:
             case SID_OFFICE_COMMERCIAL_USE:
             {
@@ -1275,11 +1319,23 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
                 rSet.Put( SfxStringItem( nSID, aRet ) );
                 break;
             }
+#else
+            case SID_OFFICE_PRIVATE_USE:
+            case SID_OFFICE_COMMERCIAL_USE:
+            {
+                DBG_ASSERT( sal_False, "SfxApplication::PropState_Impl()\nSID_OFFICE_PRIVATE_USE & SID_OFFICE_COMMERCIAL_USE are obsolete!\n" );
+                break;
+            }
+#endif
 
             case SID_OFFICE_CUSTOMERNUMBER:
             {
+#if SUPD<613//MUSTINI
                 String aCustomerNumber = pIniMgr->Get(SFX_KEY_CUSTOMERNUMBER);
                 rSet.Put( SfxStringItem( nSID, aCustomerNumber ) );
+#else
+                rSet.Put( SfxStringItem( nSID, SvtUserOptions().GetCustomerNumber() ) );
+#endif
                 break;
             }
         }
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 6d401097f11e..a90cabbc7ce4 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appcfg.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: pb $ $Date: 2000-11-03 05:08:36 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,9 +76,11 @@
 #ifndef _SFXITEMPOOL_HXX //autogen
 #include <svtools/itempool.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
 #ifndef _AEITEM_HXX //autogen
 #include <svtools/aeitem.hxx>
 #endif
@@ -100,10 +102,11 @@
 #ifndef _UNDO_HXX //autogen
 #include <svtools/undo.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIPROP_HXX
 #include <svtools/iniprop.hxx>
 #endif
-
+#endif
 #ifndef _INET_WRAPPER_HXX
 #include <inet/wrapper.hxx>
 #endif
@@ -138,6 +141,9 @@
 #include <svtools/saveopt.hxx>
 #include <svtools/helpopt.hxx>
 #include <svtools/undoopt.hxx>
+#include <svtools/securityoptions.hxx>
+#include <svtools/pathoptions.hxx>
+#include <svtools/inetoptions.hxx>
 
 #include "viewfrm.hxx"
 #include "sfxhelp.hxx"
@@ -194,6 +200,7 @@ const USHORT* SfxApplication::GetOptionsRanges() const
 }
 
 // -----------------------------------------------------------------------
+#if SUPD<613//MUSTINI
 
 String GetJavaIniEntry_Impl( SfxIniKey eKey, SfxIniManager* pIniMgr )
 {
@@ -238,12 +245,59 @@ BOOL SetJavaIniEntry_Impl( SfxIniKey eKey, const String& rValue, SfxIniManager*
     return TRUE;
 }
 
+#else
+
+// -----------------------------------------------------------------------
+
+String GetJavaIniEntry_Impl( const String& sKeyName )
+{
+    INetURLObject aObj;
+    aObj.SetSmartProtocol( INET_PROT_FILE );
+    aObj.SetSmartURL( Config::GetConfigName( SvtPathOptions().GetUserConfigPath(), DEFINE_CONST_UNICODE("java") ) );
+    String aIniEntry;
+    String aIniPath = aObj.getName();
+
+    Config aJavaCfg( aIniPath );
+    aJavaCfg.SetGroup( "Java" );
+    aIniEntry = (String)S2U(aJavaCfg.ReadKey( U2S(sKeyName) ));
+
+    return aIniEntry;
+}
+
+// -----------------------------------------------------------------------
+
+BOOL SetJavaIniEntry_Impl( const String& sKeyName, const String& sValue )
+{
+    SvtPathOptions aPathOptions;
+    String aIniFile = Config::GetConfigName( aPathOptions.GetUserConfigPath(), DEFINE_CONST_UNICODE("java") );
+    if ( !SfxContentHelper::Exists( aIniFile ) )
+    {
+        INetURLObject aObj( aIniFile, INET_PROT_FILE );
+        String aIniFileName = aObj.getName();
+        aObj.SetSmartURL( aPathOptions.GetConfigPath() );
+        aObj.insertName( aIniFileName );
+        String aShareFile = aObj.PathToFileName();
+
+        if ( !SfxContentHelper::Exists( aShareFile ) ||
+             !SfxContentHelper::CopyTo( aShareFile, aIniFile ) )
+            return FALSE;
+    }
+    Config aJavaCfg( aIniFile );
+    aJavaCfg.SetGroup( "Java" );
+    aJavaCfg.WriteKey( U2S(sKeyName), U2S(sValue) );
+    return TRUE;
+}
+
+#endif
+
 //--------------------------------------------------------------------
 
 BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 {
     BOOL bRet = FALSE;
+#if SUPD<613//MUSTINI
     SfxIniManager *pIni = GetIniManager();
+#endif
     SfxItemPool &rPool = GetPool();
     SfxToolBoxConfig *pTbxCfg = SfxToolBoxConfig::GetOrCreate();
     String aTRUEStr = 0x0031; // ^= '1'
@@ -252,6 +306,8 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
     SvtSaveOptions aSaveOptions;
     SvtUndoOptions aUndoOptions;
     SvtHelpOptions aHelpOptions;
+    SvtInetOptions aInetOptions;
+    SvtSecurityOptions  aSecurityOptions;
     while ( *pRanges )
     {
         for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
@@ -358,6 +414,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                                  aUndoOptions.GetUndoCount() ) ) )
                         bRet = TRUE;
                     break;
+#if SUPD<613//MUSTINI
                 case SID_INET_HOMEPAGE   :
                     if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_HOMEPAGE   ),
                                  pIni->Get(SFX_KEY_INET_HOME) ) ) )
@@ -393,9 +450,26 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                               pIni->Get(SFX_KEY_INET_CACHEABORTED).ToInt32() ) ) )
                         bRet = TRUE;
                     break;
+#else
+                case SID_INET_HOMEPAGE          :
+                case SID_INET_MEMCACHE          :
+                case SID_INET_DISKCACHE         :
+                case SID_INET_EXPIRATION        :
+                case SID_INET_CACHEJS           :
+                case SID_INET_CACHEEXPIRED      :
+                case SID_INET_CACHEABORTED      :
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT( sal_False, "SfxApplication::GetOptions()\nSome INET values not no longer supported!\n" );
+#endif
+                    break;
+#endif
                 case SID_INET_REVEAL_MAILADDR :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_INET_REVEAL_MAILADDR),
+#if SUPD<613//MUSTINI
                                (BOOL)(USHORT)pIni->Get(SFX_KEY_INET_REVEAL_MAILADDR).ToInt32() ) ) )
+#else
+                                aInetOptions.GetProtocolRevealMailAddress() ) ) )
+#endif
                         bRet = TRUE;
                     break;
                 case SID_SAVEREL_INET :
@@ -410,9 +484,14 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     break;
                 case SID_INET_SMTPSERVER :
                     if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_SMTPSERVER),
+#if SUPD<613//MUSTINI
                                  pIni->Get(SFX_KEY_INET_SMTPSERVER) ) ) )
+#else
+                                aInetOptions.GetSmtpServerName() )))
+#endif
                         bRet = TRUE;
                     break;
+#if SUPD<613//MUSTINI
                 case SID_INET_POPSERVER :
                     if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_POPSERVER),
                                  pIni->Get(SFX_KEY_INET_POPSERVER) ) ) )
@@ -448,11 +527,31 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                                  pIni->Get(SFX_KEY_INET_MAILUSERNAME) ) ) )
                         bRet = TRUE;
                     break;
+#else
+                case SID_INET_POPSERVER :
+                case SID_INET_NNTPSERVER :
+                case SID_INET_MAXNEWS :
+                case SID_INET_MAXHTTPCONS :
+                case SID_INET_MAXFTPCONS :
+                case SID_INET_SMTPGATEWAY :
+                case SID_INET_MAILUSERNAME :
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT( sal_False, "SfxApplication::GetOptions()\nSome INET values not longer supported!\n" );
+#endif
+                    break;
+#endif
                 case SID_ATTR_ALLOWFOLDERWEBVIEW :
+#if SUPD<613//MUSTINI
                     if(rSet.Put( SfxStringItem( rPool.GetWhich(SID_ATTR_ALLOWFOLDERWEBVIEW),
                                  pIni->Get(SFX_KEY_ALLOWFOLDERWEBVIEW) ) ) )
                         bRet = TRUE;
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT(sal_False,"SfxApplication::GetOptions()\nINI-Key \"Common\\AllowFolderWebView\" is obsolete ... SID_ATTR_ALLOWFOLDERWEBVIEW isn't supported any longer!\n");
+#endif
+#endif
                     break;
+#if SUPD<613//MUSTINI
                 case SID_INET_MAILPASSWORD :
                     if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_MAILPASSWORD),
                                  SfxStringDecode( pIni->Get(SFX_KEY_INET_MAILPASSWORD) ) ) ) )
@@ -467,15 +566,30 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                         bRet = TRUE;
                     break;
                 }
+#else
+                case SID_INET_MAILPASSWORD :
+                case SID_INET_MAILTEXTFORMAT :
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT( sal_False, "SfxApplication::GetOptions()\nConfig item for INET values not implemented yet!\n" );
+#endif
+                    break;
+#endif
                 case SID_BASIC_ENABLED :
                     if ( rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_BASIC_ENABLED ),
+#if SUPD<613//MUSTINI
                                 pIni->Get(SFX_KEY_BASIC_ENABLE).ToInt32()) ) )
+#else
+                                aSecurityOptions.GetBasicMode())))
+#endif
                         bRet = TRUE;
                     break;
-
                 case SID_INET_JAVA_ENABLE:
                 {
+#if SUPD<613//MUSTINI
                     String aIniEntry = GetJavaIniEntry_Impl( SFX_KEY_JAVA_ENABLE, pIni );
+#else
+                    String aIniEntry = GetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("Java") );
+#endif
                     if ( rSet.Put( SfxBoolItem(
                             rPool.GetWhich( SID_INET_JAVA_ENABLE ), ( aIniEntry == aTRUEStr ) ) ) )
                         bRet = TRUE;
@@ -484,7 +598,11 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 
                 case SID_INET_EXE_APPLETS :
                 {
+#if SUPD<613//MUSTINI
                     String aIniEntry = GetJavaIniEntry_Impl( SFX_KEY_INET_EXE_APPLETS, pIni );
+#else
+                    String aIniEntry = GetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("Applets") );
+#endif
                     if ( rSet.Put( SfxBoolItem(
                             rPool.GetWhich( SID_INET_EXE_APPLETS ), ( aIniEntry == aTRUEStr ) ) ) )
                         bRet = TRUE;
@@ -493,7 +611,11 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 case SID_INET_JAVA_ACCESSTYPE:
                 {
                     SjNetAccess eAccess = NET_HOST;
+#if SUPD<613//MUSTINI
                     String aNetAccess = GetJavaIniEntry_Impl( SFX_KEY_JAVA_NETACCESS, pIni );
+#else
+                    String aNetAccess = GetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("NetAccess") );
+#endif
                     if ( aNetAccess.Len() )
                     {
                         if ( aNetAccess.CompareIgnoreCaseToAscii( "UNRESTRICTED" ) == COMPARE_EQUAL )
@@ -508,7 +630,11 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 }
                 case SID_INET_JAVA_SECURITY:
                 {
+#if SUPD<613//MUSTINI
                     String aIniEntry = GetJavaIniEntry_Impl( SFX_KEY_JAVA_SECURITY, pIni );
+#else
+                    String aIniEntry = GetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("Security") );
+#endif
                     if ( rSet.Put( SfxBoolItem(
                             rPool.GetWhich( SID_INET_JAVA_SECURITY ), ( aIniEntry.CompareToAscii("0") != COMPARE_EQUAL ) ) ) )
                         bRet = TRUE;
@@ -516,12 +642,17 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 }
                 case SID_INET_JAVA_CLASSPATH :
                 {
+#if SUPD<613//MUSTINI
                     String aIniEntry = GetJavaIniEntry_Impl( SFX_KEY_JAVA_USERCLASSPATH, pIni );
+#else
+                    String aIniEntry = GetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("UserClassPath") );
+#endif
                     if ( rSet.Put( SfxStringItem( rPool.GetWhich( SID_INET_JAVA_CLASSPATH ), aIniEntry ) ) )
                         bRet = TRUE;
                     break;
                 }
 
+#if SUPD<613//MUSTINI
                 case SID_INET_EXE_PLUGIN  :
                     if ( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_INET_EXE_PLUGIN ),
                         ( pIni->Get( SFX_KEY_INET_EXE_PLUGIN ) == aTRUEStr ) ) ) )
@@ -537,16 +668,34 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                                   pIni->Get( SFX_KEY_INET_NONCACHED_SERVER ) ) ) )
                         bRet = TRUE;
                     break;
+#else
+                case SID_INET_EXE_PLUGIN  :
+                case SID_INET_USERAGENT :
+                case SID_INET_NONCACHED_SERVER :
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT( sal_False, "SfxApplication::GetOptions()\nSome INET values no longer supported!\n" );
+#endif
+                    break;
+#endif
                 case SID_INET_DNS_SERVER :
                     if ( rSet.Put( SfxStringItem( rPool.GetWhich(SID_INET_DNS_SERVER),
+#if SUPD<613//MUSTINI
                                      pIni->Get(SFX_KEY_INET_DNS ) ) ) )
+#else
+                                     aInetOptions.GetDnsIpAddress() ) ) )
+#endif
                         bRet = TRUE;
                     break;
                 case SID_INET_DNS_AUTO  :
                     if ( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_INET_DNS_AUTO ),
+#if SUPD<613//MUSTINI
                             !pIni->Get(SFX_KEY_INET_DNS).Len() ) ) )
+#else
+                                !aInetOptions.GetDnsIpAddress().getLength() ) ) )
+#endif
                         bRet = TRUE;
                     break;
+#if SUPD<613//MUSTINI
                 case SID_INET_CHANNELS_ONOFF  :
                     if ( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_INET_CHANNELS_ONOFF ),
                                 ( pIni->Get( SFX_KEY_INET_CHANNELS ) == aTRUEStr ) ) ) )
@@ -557,8 +706,17 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                                    pIni->Get(SFX_KEY_INET_COOKIES).ToInt32() ) ) )
                         bRet = TRUE;
                     break;
+#else
+                case SID_INET_CHANNELS_ONOFF  :
+                case SID_INET_COOKIESHANDLE :
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT( sal_False, "SfxApplication::GetOptions()\nSome INET values no longer supported!\n" );
+#endif
+                    break;
+#endif
                 case SID_SECURE_URL :
                 {
+#if SUPD<613//MUSTINI
                     List aList;
                     USHORT nCount = pIni->Get( SFX_KEY_SECURE_URL ).ToInt32();
                     USHORT n;
@@ -570,8 +728,29 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     for ( n = 0; n < nCount; ++n )
                         delete (String*)aList.GetObject(n);
                     aList.Clear();
+#else
+                    ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs();
+                    List aList;
+                    sal_uInt32 nCount = seqURLs.getLength();
+                    sal_uInt32 nURL;
+                    for( nURL=0; nURL<nCount; ++nURL )
+                    {
+                        aList.Insert( new String( seqURLs[nURL] ), LIST_APPEND );
+                    }
+                    if( rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL),
+                            &aList ) ) )
+                    {
+                        bRet = TRUE;
+                    }
+                    for( nURL=0; nURL<nCount; ++nURL )
+                    {
+                        delete (String*)aList.GetObject(nURL);
+                    }
+                    aList.Clear();
+#endif
                     break;
                 }
+#if SUPD<613//MUSTINI
                 case SID_ICONGRID :
                 {
                     String aIconGrid( pIni->Get(SFX_KEY_ICONGRID) );
@@ -589,8 +768,17 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                         bRet = TRUE;
                     break;
                 }
+#else
+                case SID_ICONGRID :
+                case SID_AUTO_ADJUSTICONS :
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT(sal_False, "SfxApplication::GetOptions()\nSoffice.ini key \"View\\IconGrid\" is obsolete! .. How I can support SID_ICONGRID & SID_AUTO_ADJUSTICONS any longer?\n");
+#endif
+                    break;
+#endif
                 case SID_RESTORE_EXPAND_STATE :
                 {
+#if SUPD<613//MUSTINI
                     String aRestoreExpand( pIni->Get( SFX_KEY_AUTOOPEN ));
                     BOOL bRestoreExpand = TRUE;
                     if( aRestoreExpand.Len() )
@@ -598,48 +786,88 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     if( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_RESTORE_EXPAND_STATE ),
                             bRestoreExpand )))
                         bRet = TRUE;
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT(sal_False, "SfxApplication::GetOptions()\nSoffice.ini key \"View\\AutoOpen\" is obsolete! .. How I can support SID_RESTORE_EXPAND_STATE any longer?\n");
+#endif
+#endif
                     break;
                 }
                 case SID_ENABLE_METAFILEPRINT :
+#if SUPD<613//MUSTINI
                     if( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ENABLE_METAFILEPRINT ),
                                (BOOL)(USHORT)pIni->Get(SFX_KEY_METAFILEPRINT ).ToInt32() ) ) )
                         bRet = TRUE;
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT(sal_False, "SfxApplication::GetOptions()\nSoffice.ini key \"Common\\MetafilePrint\" is obsolete! .. How I can support SID_ENABLE_METAFILEPRINT any longer?\n");
+#endif
+#endif
                     break;
                 case SID_INET_PROXY_TYPE :
                     if(rSet.Put( SfxUInt16Item ( rPool.GetWhich( SID_INET_PROXY_TYPE ),
+#if SUPD<613//MUSTINI
                                  pIni->Get(SFX_KEY_INET_PROXYTYPE).ToInt32() ) ) )
+#else
+                                aInetOptions.GetProxyType() )))
+#endif
                         bRet = TRUE;
                     break;
                 case SID_INET_FTP_PROXY_NAME :
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_FTP_PROXY_NAME ),
+#if SUPD<613//MUSTINI
                             pIni->Get(SFX_KEY_INET_FTPPROXYNAME) ) ) )
+#else
+                            aInetOptions.GetProxyFtpName() )))
+#endif
                         bRet = TRUE;
                     break;
                 case SID_INET_FTP_PROXY_PORT :
                     if ( rSet.Put( SfxInt32Item ( rPool.GetWhich(SID_INET_FTP_PROXY_PORT ),
+#if SUPD<613//MUSTINI
                             pIni->Get(SFX_KEY_INET_FTPPROXYPORT).ToInt32() ) ) )
+#else
+                            aInetOptions.GetProxyFtpPort() )))
+#endif
                         bRet = TRUE;
                     break;
                 case SID_INET_HTTP_PROXY_NAME :
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_HTTP_PROXY_NAME ),
+#if SUPD<613//MUSTINI
                             pIni->Get(SFX_KEY_INET_HTTPPROXYNAME) ) ) )
+#else
+                            aInetOptions.GetProxyHttpName() )))
+#endif
                         bRet = TRUE;
                     break;
                 case SID_INET_HTTP_PROXY_PORT :
                     if ( rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_HTTP_PROXY_PORT ),
+#if SUPD<613//MUSTINI
                             pIni->Get(SFX_KEY_INET_HTTPPROXYPORT).ToInt32() ) ) )
+#else
+                            aInetOptions.GetProxyHttpPort() )))
+#endif
                         bRet = TRUE;
                     break;
                 case SID_INET_SOCKS_PROXY_NAME :
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_SOCKS_PROXY_NAME ),
+#if SUPD<613//MUSTINI
                             pIni->Get(SFX_KEY_INET_SOCKSPROXYNAME) ) ) )
+#else
+                            aInetOptions.GetProxySocksName() )))
+#endif
                         bRet = TRUE;
                     break;
                 case SID_INET_SOCKS_PROXY_PORT :
                     if ( rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_SOCKS_PROXY_PORT ),
+#if SUPD<613//MUSTINI
                             pIni->Get(SFX_KEY_INET_SOCKSPROXYPORT).ToInt32() ) ) )
+#else
+                            aInetOptions.GetProxySocksPort() )))
+#endif
                         bRet = TRUE;
                     break;
+#if SUPD<613//MUSTINI
                 case SID_INET_SECURITY_PROXY_NAME :
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_SECURITY_PROXY_NAME ),
                             pIni->Get(SFX_KEY_INET_SECURITYPROXYNAME) ) ) )
@@ -650,9 +878,21 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                             pIni->Get(SFX_KEY_INET_SECURITYPROXYPORT).ToInt32() ) ) )
                         bRet = TRUE;
                     break;
+#else
+                case SID_INET_SECURITY_PROXY_NAME :
+                case SID_INET_SECURITY_PROXY_PORT :
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                    DBG_ASSERT( sal_False, "SfxApplication::GetOptions()\nSome INET values no longer supported!\n" );
+#endif
+                    break;
+#endif
                 case SID_INET_NOPROXY :
                     if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_NOPROXY),
+#if SUPD<613//MUSTINI
                                  pIni->Get(SFX_KEY_INET_NOPROXY) ) ) )
+#else
+                                aInetOptions.GetProxyNoProxy() )))
+#endif
                         bRet = TRUE;
                     break;
                 case SID_ATTR_PATHNAME :
@@ -660,7 +900,164 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 {
                     SfxAllEnumItem aNames(rPool.GetWhich(SID_ATTR_PATHGROUP));
                     SfxAllEnumItem aValues(rPool.GetWhich(SID_ATTR_PATHNAME));
+#if SUPD<613//MUSTINI
                     pIni->Fill(SFX_GROUP_DIR, aNames, aValues);
+#else
+                    SvtPathOptions aPathCFG;
+                    sal_uInt32 nCount   = aNames.GetValueCount();
+                    sal_uInt32 nPosition= 0;
+                    for( nPosition=0; nPosition<nCount; ++nPosition )
+                    {
+                        String sPathType    = aNames.GetValueTextByPos(nPosition);
+                        String sValue;
+                        if( sPathType.CompareToAscii("Addin") )
+                        {
+                            sValue = aPathCFG.GetAddinPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("AutoCorrect") )
+                        {
+                            sValue = aPathCFG.GetAutoCorrectPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("AutoPilot") )
+                        {
+                            sValue = aPathCFG.GetAutoPilotPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Backup") )
+                        {
+                            sValue = aPathCFG.GetBackupPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Basic") )
+                        {
+                            sValue = aPathCFG.GetBasicPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Bitmap") )
+                        {
+                            sValue = aPathCFG.GetBitmapPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Config") )
+                        {
+                            sValue = aPathCFG.GetConfigPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Database") )
+                        {
+                            sValue = aPathCFG.GetDatabasePath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Dictionary") )
+                        {
+                            sValue = aPathCFG.GetDictionaryPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Favorites") )
+                        {
+                            sValue = aPathCFG.GetFavoritesPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Filter") )
+                        {
+                            sValue = aPathCFG.GetFilterPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Gallery") )
+                        {
+                            sValue = aPathCFG.GetGalleryPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("AutoText") )
+                        {
+                            sValue = aPathCFG.GetAutoTextPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Graphic") )
+                        {
+                            sValue = aPathCFG.GetGraphicPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Help") )
+                        {
+                            sValue = aPathCFG.GetHelpPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Linguistic") )
+                        {
+                            sValue = aPathCFG.GetLinguisticPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Module") )
+                        {
+                            sValue = aPathCFG.GetModulePath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("NewMenu") )
+                        {
+                            sValue = aPathCFG.GetNewMenuPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Palette") )
+                        {
+                            sValue = aPathCFG.GetPalettePath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Plugin") )
+                        {
+                            sValue = aPathCFG.GetPluginPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Storage") )
+                        {
+                            sValue = aPathCFG.GetStoragePath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("SubIni") )
+                        {
+                            sValue = aPathCFG.GetSubIniPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Temp") )
+                        {
+                            sValue = aPathCFG.GetTempPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Template") )
+                        {
+                            sValue = aPathCFG.GetTemplatePath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Trash") )
+                        {
+                            sValue = aPathCFG.GetTrashPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("UserConfig") )
+                        {
+                            sValue = aPathCFG.GetUserConfigPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("UserDictionary") )
+                        {
+                            sValue = aPathCFG.GetUserDictionaryPath();
+                        }
+                        else
+                        if( sPathType.CompareToAscii("Work") )
+                        {
+                            sValue = aPathCFG.GetWorkPath();
+                        }
+                        else
+                        {
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                            DBG_ASSERT(sal_False,"SfxApplication::GetOptions()\nUnsupported path name detected!\n");
+#endif
+                        }
+                        aValues.InsertValue(nPosition,sValue);
+                    }
+#endif
                     if ( rSet.Put(aNames) || rSet.Put(aValues) )
                         bRet = TRUE;
                     break;
@@ -680,9 +1077,9 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 }
 
 //--------------------------------------------------------------------
-
 BOOL SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pReferer ) const
 {
+#if SUPD<613//MUSTINI
     // unkritisches Protokoll?
     INetProtocol eProt = rURL.GetProtocol();
     if ( INET_PROT_MACRO != eProt && INET_PROT_SLOT != eProt )
@@ -735,14 +1132,18 @@ BOOL SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pRefe
 
     // gemaess Liste
     return bTrusted;
+#else
+    return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL(), *pReferer );
+#endif
 }
-
 //--------------------------------------------------------------------
 
 void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 {
+#if SUPD<613//MUSTINI
     SfxIniManager *pIni = GetIniManager();
     pIni->EnterLock();
+#endif
     const SfxPoolItem *pItem = 0;
     SfxItemPool &rPool = GetPool();
     BOOL bResetSession = FALSE;
@@ -752,6 +1153,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     SvtSaveOptions aSaveOptions;
     SvtUndoOptions aUndoOptions;
     SvtHelpOptions aHelpOptions;
+    SvtSecurityOptions aSecurityOptions;
+    SvtPathOptions aPathOptions;
+    SvtInetOptions aInetOptions;
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), TRUE, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
@@ -949,6 +1353,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
             }
         }
     }
+#if SUPD<613//MUSTINI
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_HOMEPAGE), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
@@ -995,11 +1400,31 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         INT32 nFlag = (USHORT)( (const SfxBoolItem*)pItem )->GetValue();
         pIni->Set( String::CreateFromInt32( nFlag ), SFX_KEY_INET_CACHEABORTED );
     }
+#else
+    if(
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_HOMEPAGE), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_MEMCACHE), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_DISKCACHE), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_EXPIRATION), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_CACHEJS), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_CACHEEXPIRED), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_CACHEABORTED), TRUE, &pItem))
+    )
+    {
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nSome INET keys no longer supported!\n");
+#endif
+    }
+#endif
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_REVEAL_MAILADDR), TRUE, &pItem))
     {
         DBG_ASSERT( pItem->ISA(SfxBoolItem), "BoolItem expected" );
+#if SUPD<613//MUSTINI
         INT32 nFlag = (USHORT)( (const SfxBoolItem*)pItem )->GetValue();
         pIni->Set( String::CreateFromInt32( nFlag ), SFX_KEY_INET_REVEAL_MAILADDR );
+#else
+        aInetOptions.SetProtocolRevealMailAddress( ((const SfxBoolItem*)pItem)->GetValue() );
+#endif
         bResetSession = TRUE;
     }
 
@@ -1007,10 +1432,14 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_SMTPSERVER), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
+#if SUPD<613//MUSTINI
         pIni->Set(((const SfxStringItem *)pItem)->GetValue(), SFX_KEY_INET_SMTPSERVER);
+#else
+        aInetOptions.SetSmtpServerName(((const SfxStringItem *)pItem)->GetValue());
+#endif
         bResetSession = TRUE;
     }
-
+#if SUPD<613//MUSTINI
     // POP-Server
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_POPSERVER), TRUE, &pItem))
     {
@@ -1083,13 +1512,35 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         INT32 nFlag = (USHORT)( (const SfxByteItem*)pItem )->GetValue();
         pIni->Set( String::CreateFromInt32( nFlag ), SFX_KEY_INET_MAILTEXTFORMAT );
     }
+#else
+    if(
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_POPSERVER), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_NNTPSERVER), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_MAXNEWS), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_MAXHTTPCONS), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_MAXFTPCONS), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_SMTPGATEWAY), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_MAILUSERNAME), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_MAILPASSWORD), TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_MAILTEXTFORMAT ), TRUE, &pItem ) )
+    )
+    {
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nSome INET keys no longer supported!\n");
+#endif
+    }
+#endif
 
     // Proxy-Type
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), TRUE, &pItem))
     {
         DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" );
+#if SUPD<613//MUSTINI
         String aValue = String::CreateFromInt32( ( (const SfxUInt16Item*)pItem )->GetValue() );
         pIni->Set( aValue, SFX_KEY_INET_PROXYTYPE );
+#else
+        aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue());
+#endif
         bResetSession = TRUE;
         bProxiesModified = TRUE;
     }
@@ -1098,7 +1549,11 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
+#if SUPD<613//MUSTINI
         pIni->Set(((const SfxStringItem *)pItem)->GetValue(), SFX_KEY_INET_NOPROXY);
+#else
+        aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue());
+#endif
         bResetSession = TRUE;
         bProxiesModified = TRUE;
     }
@@ -1107,8 +1562,12 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     if ( SFX_ITEM_SET == rSet.GetItemState(SID_BASIC_ENABLED, TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "SfxInt16Item expected");
+#if SUPD<613//MUSTINI
         String aValue = String::CreateFromInt32( ( (const SfxUInt16Item*)pItem )->GetValue() );
         pIni->Set( aValue, SFX_KEY_BASIC_ENABLE );
+#else
+        aSecurityOptions.SetBasicMode( (EBasicSecurityMode)( (const SfxUInt16Item*)pItem )->GetValue() );
+#endif
     }
 
     // Java Enable
@@ -1117,7 +1576,11 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         BOOL bJava = ( (const SfxBoolItem*)pItem )->GetValue();
         String aVal = bJava ? 0x0031 : 0x0030; // ^= '1' or '0'
+#if SUPD<613//MUSTINI
         BOOL bSet = SetJavaIniEntry_Impl( SFX_KEY_JAVA_ENABLE, aVal, pIni );
+#else
+        BOOL bSet = SetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("Java"), aVal );
+#endif
         bResetSession = TRUE;
     }
     // Applets Enable
@@ -1126,7 +1589,11 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         BOOL bApplets = ( (const SfxBoolItem*)pItem )->GetValue();
         String aVal = bApplets ? 0x0031 : 0x0030; // ^= '1' or '0'
+#if SUPD<613//MUSTINI
         BOOL bSet = SetJavaIniEntry_Impl( SFX_KEY_INET_EXE_APPLETS, aVal, pIni );
+#else
+        BOOL bSet = SetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("Applets"), aVal );
+#endif
         bResetSession = TRUE;
     }
 
@@ -1142,7 +1609,11 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
             aVal = DEFINE_CONST_UNICODE("UNRESTRICTED");
         else
             aVal = DEFINE_CONST_UNICODE("NONE");
+#if SUPD<613//MUSTINI
         BOOL bSet = SetJavaIniEntry_Impl( SFX_KEY_JAVA_NETACCESS, aVal, pIni );
+#else
+        BOOL bSet = SetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("NetAccess"), aVal );
+#endif
         bResetSession = TRUE;
     }
 
@@ -1152,7 +1623,11 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         BOOL bSecurity = ((const SfxBoolItem *)pItem)->GetValue();
         String aVal = bSecurity ? 0x0031 : 0x0030; // ^= '1' or '0'
+#if SUPD<613//MUSTINI
         BOOL bSet = SetJavaIniEntry_Impl( SFX_KEY_JAVA_SECURITY, aVal, pIni );
+#else
+        BOOL bSet = SetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("Security"), aVal );
+#endif
         bResetSession = TRUE;
     }
 
@@ -1161,7 +1636,11 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     {
         DBG_ASSERT( pItem->ISA(SfxStringItem), "SfxStringItem expected" );
         String aVal = ( (const SfxStringItem *)pItem )->GetValue();
+#if SUPD<613//MUSTINI
         BOOL bSet = SetJavaIniEntry_Impl( SFX_KEY_JAVA_USERCLASSPATH, aVal, pIni );
+#else
+        BOOL bSet = SetJavaIniEntry_Impl( DEFINE_CONST_UNICODE("UserClassPath"), aVal );
+#endif
         bResetSession = TRUE;
     }
 
@@ -1170,7 +1649,13 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         BOOL bExe = ( (const SfxBoolItem *)pItem )->GetValue();
+#if SUPD<613//MUSTINI
         pIni->Set( bExe ? 0x0031 : 0x0030 /* ^= '1' or '0' */, SFX_KEY_INET_EXE_PLUGIN );
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nSome INET keys no longer supported!\n");
+#endif
+#endif
         bResetSession = TRUE;
     }
 
@@ -1180,7 +1665,13 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         BOOL bIsAuto = ((const SfxBoolItem *)pItem)->GetValue();
         if( bIsAuto )
+        {
+#if SUPD<613//MUSTINI
             pIni->Set( String(), SFX_KEY_INET_DNS );
+#else
+            aInetOptions.SetDnsIpAddress( String() );
+#endif
+        }
         else
         {
             String aDNS;
@@ -1189,11 +1680,16 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
                 DBG_ASSERT(pItem->ISA(SfxStringItem), "SfxStringItem expected");
                 aDNS = ((const SfxStringItem *)pItem)->GetValue();
             }
+#if SUPD<613//MUSTINI
             pIni->Set( aDNS, SFX_KEY_INET_DNS );
+#else
+            aInetOptions.SetDnsIpAddress( aDNS );
+#endif
         }
         bResetSession = TRUE;
     }
 
+#if SUPD<613//MUSTINI
     // Noncahed Server
     if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NONCACHED_SERVER, TRUE, &pItem))
     {
@@ -1209,7 +1705,19 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         pIni->Set(((const SfxStringItem *)pItem)->GetValue(), SFX_KEY_INET_USERAGENT);
         bResetSession = TRUE;
     }
+#else
+    if(
+        ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NONCACHED_SERVER, TRUE, &pItem))   ||
+        ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_USERAGENT, TRUE, &pItem))
+    )
+    {
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nSome INET keys no longer supported!\n");
+#endif
+    }
+#endif
 
+#if SUPD<613//MUSTINI
     // Proxies
     for ( USHORT nOfs = 0;
           nOfs <= SID_INET_SECURITY_PROXY_PORT - SID_INET_HTTP_PROXY_NAME;
@@ -1219,7 +1727,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         {
             DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
             String aVal( ((const SfxStringItem *)pItem)->GetValue() );
-            pIni->Set( aVal, SFX_KEY_INET_HTTPPROXYNAME+nOfs );
+            pIni->Set( aVal, 175+nOfs );
             bResetSession = TRUE;
             bProxiesModified = TRUE;
         }
@@ -1227,12 +1735,57 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         {
             DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
             String aValue = String::CreateFromInt32( ( (const SfxInt32Item*)pItem )->GetValue() );
-            pIni->Set( aValue, SFX_KEY_INET_HTTPPROXYPORT + nOfs );
+            pIni->Set( aValue, 176 + nOfs );
             bResetSession = TRUE;
             bProxiesModified = TRUE;
         }
     }
+#else
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), TRUE, &pItem ) )
+    {
+        DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
+        aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() );
+        bResetSession = TRUE;
+        bProxiesModified = TRUE;
+    }
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), TRUE, &pItem ) )
+    {
+        DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
+        aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
+        bResetSession = TRUE;
+        bProxiesModified = TRUE;
+    }
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), TRUE, &pItem ) )
+    {
+        DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
+        aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() );
+        bResetSession = TRUE;
+        bProxiesModified = TRUE;
+    }
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), TRUE, &pItem ) )
+    {
+        DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
+        aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
+        bResetSession = TRUE;
+        bProxiesModified = TRUE;
+    }
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_SOCKS_PROXY_NAME ), TRUE, &pItem ) )
+    {
+        DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
+        aInetOptions.SetProxySocksName( ((const SfxStringItem *)pItem)->GetValue() );
+        bResetSession = TRUE;
+        bProxiesModified = TRUE;
+    }
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_SOCKS_PROXY_PORT ), TRUE, &pItem ) )
+    {
+        DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
+        aInetOptions.SetProxySocksPort( ( (const SfxInt32Item*)pItem )->GetValue() );
+        bResetSession = TRUE;
+        bProxiesModified = TRUE;
+    }
+#endif
 
+#if SUPD<613//MUSTINI
     // Channels
     if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_CHANNELS_ONOFF, TRUE, &pItem))
     {
@@ -1248,6 +1801,17 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         String aValue = String::CreateFromInt32( ( (const SfxUInt16Item*)pItem )->GetValue() );
         pIni->Set( aValue, SFX_KEY_INET_COOKIES );
     }
+#else
+    if(
+        ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_CHANNELS_ONOFF, TRUE, &pItem)) ||
+        ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_COOKIESHANDLE, TRUE, &pItem))
+    )
+    {
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nSome INET keys no longer supported!\n");
+#endif
+    }
+#endif
 
     // Secure-Referers
     if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, TRUE, &pItem))
@@ -1256,27 +1820,50 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 
         DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected");
         const List *pList = ((SfxStringListItem*)pItem)->GetList();
+#if SUPD<613//MUSTINI
         pIni->Set( String::CreateFromInt32( pList->Count() ), SFX_KEY_SECURE_URL );
         for ( USHORT n = 0; n < pList->Count(); ++n )
             pIni->Set( *(const String*)(pList->GetObject(n)), SFX_KEY_SECURE_URL, n );
+#else
+        sal_uInt32 nCount = pList->Count();
+        ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs(nCount);
+        for( sal_uInt32 nPosition=0;nPosition<nCount;++nPosition)
+        {
+            seqURLs[nPosition] = *(const String*)(pList->GetObject(nPosition));
+        }
+        aSecurityOptions.SetSecureURLs( seqURLs );
+#endif
     }
 
     // EnableMetafilePrint
     if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ENABLE_METAFILEPRINT ), TRUE, &pItem ) )
     {
+#if SUPD<613//MUSTINI
         DBG_ASSERT( pItem->ISA(SfxBoolItem), "BoolItem expected" );
         BOOL bPrint = (( const SfxBoolItem*)pItem )->GetValue();
         pIni->Set( bPrint ? 0x0031 : 0x0030 /* ^= '1' or '0' */, SFX_KEY_METAFILEPRINT );
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nsoffice.ini key \"MetafilPrint\" not supported any longer!\n");
+#endif
+#endif
     }
 
     // Web-View
     if( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_ALLOWFOLDERWEBVIEW), TRUE, &pItem))
     {
+#if SUPD<613//MUSTINI
         DBG_ASSERT(pItem->ISA(SfxStringItem), "SfxStringItem expected");
         pIni->Set(((const SfxStringItem*)pItem)->GetValue(), SFX_KEY_ALLOWFOLDERWEBVIEW);
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nsoffice.ini key \"AllowFolderWebView\" not supported any longer!\n");
+#endif
+#endif
     }
 
     // Explorer
+#if SUPD<613//MUSTINI
     String aIconGrid( pIni->Get(SFX_KEY_ICONGRID) );
     Size aGrid( aIconGrid.GetToken(0).ToInt32(), aIconGrid.GetToken(1).ToInt32() );
     UINT16 nMode = (UINT16)aIconGrid.GetToken(2).ToInt32();
@@ -1309,6 +1896,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         BOOL bRestoreExpand = ( (const SfxBoolItem*)pItem )->GetValue();
         pIni->Set( bRestoreExpand ? 0x0031 : 0x0030 /* ^= '1' or '0' */, SFX_KEY_AUTOOPEN );
     }
+#endif
 
     if ( bResetSession )
     {
@@ -1316,6 +1904,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         ::vos::ORef< ::inet::INetConfig > xINetConfig;
         if ( aWrapper.getINetConfig( xINetConfig ) )
         {
+#if SUPD<613//MUSTINI
             xINetConfig->setDomainNameServer( pIni->Get( SFX_KEY_INET_DNS ) );
             xINetConfig->setUserAgent( pIni->Get( SFX_KEY_INET_USERAGENT ) );
 
@@ -1346,6 +1935,34 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 
                 xINetConfig->setProxyConfig (aProxyCfg);
             }
+#else
+            xINetConfig->setDomainNameServer( aInetOptions.GetDnsIpAddress() );
+
+            if ( bProxiesModified )
+            {
+                ::inet::INetProxyConfig aProxyCfg (xINetConfig->getProxyConfig());
+                SvtInetOptions::ProxyType eProxy = (SvtInetOptions::ProxyType)aInetOptions.GetProxyType();
+
+                if (eProxy == SvtInetOptions::ProxyType::NONE)
+                    aProxyCfg.setNoProxyList(aInetOptions.GetProxyNoProxy());
+                else
+                    aProxyCfg.setNoProxyList(DEFINE_CONST_UNICODE("*:*"));
+
+                aProxyCfg.setHttpProxy (
+                    aInetOptions.GetProxyHttpName(),
+                    aInetOptions.GetProxyHttpPort());
+
+                aProxyCfg.setFtpProxy (
+                    aInetOptions.GetProxyFtpName(),
+                    aInetOptions.GetProxyFtpPort());
+
+                aProxyCfg.setSocksProxy (
+                    aInetOptions.GetProxySocksName(),
+                    aInetOptions.GetProxySocksPort());
+
+                xINetConfig->setProxyConfig (aProxyCfg);
+            }
+#endif
         }
     }
 
@@ -1366,8 +1983,10 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     }
 
     // geaenderte Daten speichern
+#if SUPD<613//MUSTINI
     pIni->LeaveLock();
     pIni->Flush();
+#endif
     SaveConfiguration();
 }
 
@@ -1375,6 +1994,8 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 
 void SfxApplication::SetOptions(const SfxItemSet &rSet)
 {
+    SvtPathOptions aPathOptions;
+
     // Daten werden in DocInfo und IniManager gespeichert
     SfxDocumentInfo *pDocInf = SfxObjectShell::Current()
                                 ? &SfxObjectShell::Current()->GetDocInfo()
@@ -1415,7 +2036,84 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_PATHNAME), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxAllEnumItem), "AllEnumItem expected");
+#if SUPD<613//MUSTINI
         GetAppIniManager()->Set(SFX_GROUP_DIR, *(const SfxAllEnumItem *)pItem);
+#else
+        const SfxAllEnumItem* pEnumItem = (const SfxAllEnumItem *)pItem;
+        sal_uInt32 nCount = pEnumItem->GetValueCount();
+        for( sal_uInt32 nPath=0; nPath<nCount; ++nPath )
+        {
+            String sValue = pEnumItem->GetValueTextByPos(nPath);
+            switch( nPath )
+            {
+            case 50 :   aPathOptions.SetSubIniPath( sValue );
+                        break;
+            case 51 :   aPathOptions.SetConfigPath( sValue );
+                        break;
+            case 52 :   aPathOptions.SetWorkPath( sValue );
+                        break;
+            case 53 :   break;  // GRAPHICSPATH
+            case 54 :   aPathOptions.SetBitmapPath( sValue );
+                        break;
+            case 55 :   aPathOptions.SetBasicPath( sValue );
+                        break;
+            case 56 :   aPathOptions.SetDatabasePath( sValue );
+                        break;
+            case 57 :   aPathOptions.SetPalettePath( sValue );
+                        break;
+            case 58 :   aPathOptions.SetBackupPath( sValue );
+                        break;
+            case 59 :   aPathOptions.SetModulePath( sValue );
+                        break;
+            case 60 :   aPathOptions.SetTemplatePath( sValue );
+                        break;
+            case 61 :   aPathOptions.SetAutoTextPath( sValue );
+                        break;
+            case 62 :   aPathOptions.SetDictionaryPath( sValue );
+                        break;
+            case 63 :   break;  // DESKTOPPATH
+            case 64 :   aPathOptions.SetHelpPath( sValue );
+                        break;
+            case 65 :   break;  // BOOKMARKPATH
+            case 66 :   aPathOptions.SetGalleryPath( sValue );
+                        break;
+            case 67 :   aPathOptions.SetNewMenuPath( sValue );
+                        break;
+            case 68 :   break;  // AGENTPATH
+            case 69 :   aPathOptions.SetAutoPilotPath( sValue );
+                        break;
+            case 70 :   break;  // EXPLORERPATH
+            case 71 :   aPathOptions.SetTrashPath( sValue );
+                        break;
+            case 72 :   aPathOptions.SetStoragePath( sValue );
+                        break;
+            case 73 :   break;     //SFX_KEY_STARTMENU_DIR
+            case 74 :   break;     //SFX_KEY_DOWNLOAD_DIR
+            case 75 :   break;     //SFX_KEY_AUTOSTART_DIR
+            case 76 :   break;     //SFX_KEY_QUICKSTART_DIR
+            case 77 :   break;     //SFX_KEY_GROUP_DIR
+            case 78 :   aPathOptions.SetPluginPath( sValue );
+                        break;
+            case 79 :   aPathOptions.SetFavoritesPath( sValue );
+                        break;
+            case 80 :   aPathOptions.SetFilterPath( sValue );
+                        break;
+            case 81 :   aPathOptions.SetAddinPath( sValue );
+                        break;
+            case 82 :   aPathOptions.SetUserConfigPath( sValue );
+                        break;
+            case 83 :   aPathOptions.SetUserDictionaryPath( sValue );
+                        break;
+            case 84 :   aPathOptions.SetLinguisticPath( sValue );
+                        break;
+            case 85 :   aPathOptions.SetAutoCorrectPath( sValue );
+                        break;
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+            default: DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nInvalid path number found for set directories!\n");
+#endif
+            }
+        }
+#endif
         aSendSet.ClearItem( rPool.GetWhich( SID_ATTR_PATHNAME ) );
     }
 
@@ -1627,6 +2325,7 @@ static void CorrectUpdateNumber_Impl(String& rName)
 
 void SfxApplicationClass::Property( ApplicationProperty& rProp )
 {
+#if SUPD<613//MUSTINI
     SfxApplication* pApp = SFX_APP();
     SfxIniManager* pIni = pApp->GetIniManager();
 
@@ -1637,7 +2336,7 @@ void SfxApplicationClass::Property( ApplicationProperty& rProp )
         pAppIniMgr->SetIniManager( pIni );
         return;
     }
-
+#endif
     TTProperties* pTTProperties = PTR_CAST( TTProperties, &rProp );
     if ( pTTProperties )
     {
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 45643b4d5e33..0c883e013c2b 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appdata.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:32:44 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,7 +110,9 @@
 #include "app.hrc"
 #include "sfxresid.hxx"
 #include "objshimp.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "ucbhelp.hxx"
 #include "appuno.hxx"
 
@@ -212,11 +214,13 @@ SfxDocumentTemplates* SfxAppData_Impl::GetDocumentTemplates()
 
 void SfxAppData_Impl::Notify( SfxBroadcaster &rBC, const SfxHint &rHint )
 {
+#if SUPD<613//MUSTINI
     const SfxIniManagerHint* pIniManHint = PTR_CAST(SfxIniManagerHint, &rHint);
     if ( pIniManHint && pIniManHint->GetIniKey() == SFX_KEY_DONTHIDE_DISABLEDENTRIES )
     {
         sal_Bool bDontHide = (sal_Bool)(sal_uInt16)pIniManHint->GetNewValue().ToInt32();
         UpdateApplicationSettings( bDontHide );
     }
+#endif
 }
 
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 5c8b4ebfc655..b62139654e3f 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appdde.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:26 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,6 +87,7 @@
 #include <so3/linkmgr.hxx>
 #endif
 #include <tools/urlobj.hxx>
+#include <svtools/pathoptions.hxx>
 #pragma hdrstop
 
 #include "app.hxx"
@@ -97,7 +98,9 @@
 #include "dispatch.hxx"
 #include "sfxtypes.hxx"
 #include "sfxsids.hrc"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "helper.hxx"
 
 //========================================================================
@@ -514,7 +517,11 @@ BOOL SfxApplication::InitializeDde()
         pAppData_Impl->pDdeService->AddFormat( FORMAT_RTF );
 
         // Config-Pfad als Topic wegen Mehrfachstart
+#if SUPD<613//MUSTINI
         INetURLObject aOfficeLockFile( GetIniManager()->Get( SFX_KEY_USERCONFIG_PATH ), INET_PROT_FILE );
+#else
+        INetURLObject aOfficeLockFile( SvtPathOptions().GetUserConfigPath(), INET_PROT_FILE );
+#endif
         aOfficeLockFile.insertName( DEFINE_CONST_UNICODE( "soffice.lck" ) );
         String aService( SfxDdeServiceName_Impl( aOfficeLockFile.PathToFileName() ) );
         aService.ToUpperAscii();
@@ -617,7 +624,11 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
 
     if( !bRet )
     {
+#if SUPD<613//MUSTINI
         INetURLObject aWorkPath( SFX_INIMANAGER()->Get( SFX_KEY_WORK_PATH ), INET_PROT_FILE );
+#else
+        INetURLObject aWorkPath( SvtPathOptions().GetWorkPath(), INET_PROT_FILE );
+#endif
         INetURLObject aFile;
         if ( aWorkPath.GetNewAbsURL( rNm, &aFile ) &&
              SfxContentHelper::IsDocument( aFile.GetMainURL() ) )
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index f1fb8920ce4b..11e0b2a7ff2d 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appinit.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mba $ $Date: 2000-11-06 18:05:33 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:23:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,6 +144,15 @@
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
+#include <svtools/historyoptions.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
+#include <svtools/moduleoptions.hxx>
+#endif
 
 #pragma hdrstop
 
@@ -657,10 +666,11 @@ FASTBOOL SfxApplication::Initialize_Impl()
     Help::EnableContextHelp();
     Help::EnableExtHelp();
     Help::EnableQuickHelp();
-
+#ifdef ENABLE_INIMANAGER//MUSTINI
     // falls der IniManager nicht schon durch CreateResManager erzeugt wurde
     if ( !pAppIniMgr )
         pAppIniMgr = CreateIniManager();
+#endif
 
     // StarObjects initialisieren
     if ( !SvFactory::Init() )
@@ -672,7 +682,11 @@ FASTBOOL SfxApplication::Initialize_Impl()
     pAppData_Impl->pSfxFrameObjectFactoryPtr = new SfxFrameObjectFactoryPtr;
     pAppData_Impl->pSfxFrameObjectFactoryPtr->pSfxFrameObjectFactory = SfxFrameObject::ClassFactory();
     SvBindStatusCallback::SetProgressCallback( STATIC_LINK( 0, SfxProgress, DefaultBindingProgress ) );
+#if SUPD<613//MUSTINI
     INetURLHistory::GetOrCreate()->SetLocation( GetIniManager()->Get( SFX_KEY_USERCONFIG_PATH ) );
+#else
+    INetURLHistory::GetOrCreate()->SetLocation( SvtPathOptions().GetUserConfigPath() );
+#endif
 
     // merken, falls Applikation normal gestartet wurde
     if ( pAppData_Impl->bDirectAliveCount )
@@ -696,9 +710,13 @@ FASTBOOL SfxApplication::Initialize_Impl()
 
     // diverse Pointer
     pImp->pAutoSaveTimer = new Timer;
+#if SUPD<613//MUSTINI
     String aPickSize = GetIniManager()->Get( SFX_KEY_PICKLIST );
     int nPickSize = !aPickSize.Len() ? 4 : (int) aPickSize.ToInt32();
     SfxPickList_Impl::GetOrCreate( Min(9, nPickSize) );
+#else
+    SfxPickList_Impl::GetOrCreate( SvtHistoryOptions().GetSize( ePICKLIST ) );
+#endif
 
     /////////////////////////////////////////////////////////////////
 
@@ -761,6 +779,7 @@ FASTBOOL SfxApplication::Initialize_Impl()
         SFX_FILTER_REDIRECT | SFX_FILTER_IMPORT | SFX_FILTER_ALIEN |
         SFX_FILTER_NOTINFILEDLG | SFX_FILTER_NOTINCHOOSER );
   */
+#if SUPD<613//MUSTINI
     if( _nFeatures & SFX_FEATURE_SCALC &&
         _nFeatures & SFX_FEATURE_SIMPRESS &&
         _nFeatures & SFX_FEATURE_SDRAW &&
@@ -768,6 +787,14 @@ FASTBOOL SfxApplication::Initialize_Impl()
         _nFeatures & SFX_FEATURE_SCHART &&
         _nFeatures & SFX_FEATURE_SMATH &&
         _nFeatures & SFX_FEATURE_SWRITER )
+#else
+    if( _nFeatures & FEATUREFLAG_CALC &&
+        _nFeatures & FEATUREFLAG_IMPRESS &&
+        _nFeatures & FEATUREFLAG_DRAW &&
+        _nFeatures & FEATUREFLAG_CHART &&
+        _nFeatures & FEATUREFLAG_MATH &&
+        _nFeatures & FEATUREFLAG_WRITER )
+#endif
     {
         // Office Filter registrieren
         SfxFilterContainer* pContainer =
@@ -845,7 +872,7 @@ IMPL_LINK( SfxApplication, SpecialService_Impl, void*, pVoid )
     ::com::sun::star::uno::Reference< ::com::sun::star::installation::XInstallationCheck >  xInst( xMgr->createInstance( DEFINE_CONST_UNICODE("com.sun.star.installation.FontCheck") ), ::com::sun::star::uno::UNO_QUERY );
     if ( xInst.is() )
         xInst->checkWithDialog( sal_False );
-
+#if SUPD<613//MUSTINI
     String aWizard = GetIniManager()->Get( DEFINE_CONST_UNICODE("Common"), 0, 0, DEFINE_CONST_UNICODE("RunWizard") );
     sal_Bool bRunWizard = (sal_Bool) (sal_uInt16) aWizard.ToInt32();
     if ( bRunWizard )
@@ -867,7 +894,19 @@ IMPL_LINK( SfxApplication, SpecialService_Impl, void*, pVoid )
         if( nRegKey == 0 )
             GetAppDispatcher_Impl()->Execute(SID_ONLINE_REGISTRATION_DLG, SFX_CALLMODE_ASYNCHRON);
     }
-
+#else
+    if ( !pAppData_Impl->bBean )
+    {
+        // StarOffice registration
+        INetURLObject aORegObj( SvtPathOptions().GetUserConfigPath(), INET_PROT_FILE );
+        aORegObj.insertName( DEFINE_CONST_UNICODE( "oreg.ini" ) );
+        Config aCfg( aORegObj.PathToFileName() );
+        aCfg.SetGroup( "reg" );
+        sal_uInt16 nRegKey = (sal_uInt16) aCfg.ReadKey( "registration", "0" ).ToInt32();
+        if( nRegKey == 0 )
+            GetAppDispatcher_Impl()->Execute(SID_ONLINE_REGISTRATION_DLG, SFX_CALLMODE_ASYNCHRON);
+    }
+#endif
     return 0;
 }
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index efe3605dc41c..b8c02d8d68ae 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appmain.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,9 +71,11 @@
 #ifndef _URLOBJ_HXX //autogen
 #include <tools/urlobj.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
 #ifndef _CSTITEM_HXX //autogen
 #include <svtools/cstitem.hxx>
 #endif
@@ -83,7 +85,9 @@
 #ifndef _EHDL_HXX
 #include <svtools/ehdl.hxx>
 #endif
-
+#ifndef INCLUDED_SVTOOLS_STARTOPTIONS_HXX
+#include <svtools/startoptions.hxx>
+#endif
 #include <svtools/itempool.hxx>
 #include <svtools/urihelper.hxx>
 #include <svtools/helpopt.hxx>
@@ -112,7 +116,9 @@
 #include "objuno.hxx"
 #include "app.hrc"
 #include "docfile.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 
 #ifdef WNT
 #include <tools/svwin.h>
@@ -363,6 +369,7 @@ void SfxApplication::StartUpScreen( const char* pLabelPrefix )
              pAppData_Impl->nAppEvent != DISPATCH_PRINT && pAppData_Impl->nAppEvent != DISPATCH_SERVER )
         {
             // und es nicht ausgeschaltet ist
+#if SUPD<613//MUSTINI
             String aIntroIni = pAppIniMgr->Get(SFX_KEY_SHOW_INTRO);
             ULONG nDisplayTime = ULONG(aIntroIni.ToInt32());
 
@@ -384,6 +391,18 @@ void SfxApplication::StartUpScreen( const char* pLabelPrefix )
                 pImp->pIntro = new IntroWindow_Impl(
                     Bitmap( ResId( nResId, pAppData_Impl->pLabelResMgr ) ) );
             }
+#else
+            sal_Bool bIntro = SvtStartOptions().IsIntroEnabled();
+            if( bIntro == sal_True )
+            {
+                USHORT nResId = RID_DEFAULTINTRO;
+                if ( Application::IsRemoteServer() )
+                    nResId = RID_DEFAULTINTRO_PORTAL;
+                // die ggf. im System eingestellte Zeit wird hier nicht ber"ucksichtigt
+                pImp->pIntro = new IntroWindow_Impl(
+                    Bitmap( ResId( nResId, pAppData_Impl->pLabelResMgr ) ) );
+            }
+#endif
         }
     }
     else
@@ -475,7 +494,9 @@ IMPL_LINK( SfxApplication, LateInitTimerHdl_Impl, void*, pvoid)
     {
         // LateInit ist fertig
         DELETEZ (pAppData_Impl->pInitLinkList);
+#if SUPD<613//MUSTINI
         pAppIniMgr->ResetLock();
+#endif
     }
     return 0;
 }
@@ -550,6 +571,7 @@ SfxFilterMatcher& SfxApplication::GetFilterMatcher()
 
 BOOL SfxApplication::IsStandalone() const
 {
+#if SUPD<613//MUSTINI
     // Wenn ohne UI gestartet, nat"urlich niemals integrierter Desktop
     if ( pAppData_Impl->bBean )
         return TRUE;
@@ -572,4 +594,7 @@ BOOL SfxApplication::IsStandalone() const
         return TRUE;
 #endif
     }
+#else//MUSTINI
+    return FALSE;
+#endif
 }
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index d5544fada627..d48adb6ac745 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appmisc.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mba $ $Date: 2000-11-03 12:02:31 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,6 +89,12 @@
 #ifndef _FILTER_HXX //autogen
 #include <svtools/filter.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX
+#include <svtools/internaloptions.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 
 #ifndef _COM_SUN_STAR_REGISTRY_INVALIDREGISTRYEXCEPTION_HPP_
 #include <com/sun/star/registry/InvalidRegistryException.hpp>
@@ -307,9 +313,11 @@ void SfxApplication::OpenClients()
     if ( !( pAppData_Impl->nAppEvent & DISPATCH_SERVER ) )
     {
         // Crash-Recovery
+#if SUPD<613//MUSTINI
         SfxIniManager *pIni = GetIniManager();
         sal_Bool bSendMail = (sal_uInt16) pIni->ReadKey( DEFINE_CONST_UNICODE("Common"), DEFINE_CONST_UNICODE("SendCrashMail") ).ToInt32();
         String aFileName = pIni->ReadKey( pIni->GetGroupName( SFX_GROUP_WORKINGSET_IMPL ), DEFINE_CONST_UNICODE("Info") );
+
         if ( bSendMail && aFileName.Len() )
         {
             SvFileStream aStr( aFileName, STREAM_STD_READ );
@@ -336,11 +344,25 @@ void SfxApplication::OpenClients()
                 SfxContentHelper::Kill( aFileName );
             }
         }
+#else
+        sal_Bool bSendMail = SvtInternalOptions().CrashMailEnabled();
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(!(bSendMail==sal_True),"SfxApplication::OpenClients()\nSendCrashMail not full supported yet!\n");
+#endif
+#endif
+
 
         sal_Bool bCancel = sal_False;
         for ( sal_uInt16 n = 0; sal_True; ++n )
         {
+#if SUPD<613//MUSTINI
             String aEntry( pIni->Get( SFX_GROUP_WORKINGSET_IMPL, DEFINE_CONST_UNICODE("Recover"), n ) );
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+            DBG_ASSERT(sal_False, "SfxApplication::OpenClients()\nsoffice.ini key \"WorkingSet\\Recover\" no longer supported ...\n");
+#endif
+            String aEntry;
+#endif
             if ( !aEntry.GetTokenCount() )
                 break;
 
@@ -389,14 +411,18 @@ void SfxApplication::OpenClients()
 
                 case RET_NO: // skip this file
                     // remove ini-entry
+#if SUPD<613//MUSTINI
                     pIni->Delete( SFX_GROUP_WORKINGSET_IMPL, DEFINE_CONST_UNICODE("Recover"), n );
+#endif
                     if ( nRet == RET_NO )
                         SfxContentHelper::Kill( aTempFileName );
                     break;
 
                 case RET_CANCEL: // cancel recovering
                     // remove ini-entry
+#if SUPD<613//MUSTINI
                     pIni->Delete( SFX_GROUP_WORKINGSET_IMPL, DEFINE_CONST_UNICODE("Recover"), n );
+#endif
                     SfxContentHelper::Kill( aTempFileName );
                     bCancel = sal_True; // and all following
                     break;
@@ -437,7 +463,14 @@ void SfxApplication::OpenClients()
         SfxAllItemSet aSet( GetPool() );
 
         // Dateiname
+#if SUPD<613//MUSTINI
         String aName = SFX_INIMANAGER()->ReadKey( DEFINE_CONST_UNICODE("Common"), DEFINE_CONST_UNICODE("StartDocument") );
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+        DBG_ASSERT(sal_False, "SfxApplication::OpenClients()\nsoffice.ini key \"Common\\StartDocument\" no longer supported ...\n");
+#endif
+        String aName;
+#endif
         if ( !aName.Len() )
             aName = String( DEFINE_CONST_UNICODE("private:factory/swriter" ) );
         SfxStringItem aNameItem( SID_FILE_NAME, aName );
@@ -700,7 +733,7 @@ void SfxApplication::StoreConfig()
 #ifdef WNT
 extern String GetUserID();
 #endif
-
+#ifdef ENABLE_INIMANAGER//MUSTINI
 SfxIniManager* SfxApplication::CreateIniManager()
 {
     SfxIniManager *pIniMgr = NULL;
@@ -782,7 +815,7 @@ SfxIniManager* SfxApplication::GetIniManager() const
 {
     return pViewFrame ? pViewFrame->GetIniManager() : pAppIniMgr;
 }
-
+#endif//MUSTINI!
 //------------------------------------------------------------------------
 
 SfxProgress* SfxApplication::GetProgress() const
@@ -915,19 +948,28 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
     if ( !pList )
     {
         // Gibt es eine Slotdatei ?
+#if SUPD<613//MUSTINI
         INetURLObject aObj( GetIniManager()->Get( SFX_KEY_CONFIG_DIR ), INET_PROT_FILE );
+#else
+        INetURLObject aObj( SvtPathOptions().GetConfigPath(), INET_PROT_FILE );
+#endif
         aObj.insertName( DEFINE_CONST_UNICODE( "slots.cfg" ) );
         SvFileStream aStrm( aObj.GetMainURL(), STREAM_STD_READ );
 
         // Speziell f"ur AK: wenn in der INI "Slots=AK" steht, slots.cfg
         // ignorieren und weitermachen
+#if SUPD<613//MUSTINI
         String aSlotEntry = GetIniManager()->Get( SFX_KEY_SLOTLIST );
         if ( aSlotEntry.CompareIgnoreCaseToAscii( "AK" ) == COMPARE_EQUAL )
             return NULL;
-
         sal_uInt16 nSlotEntry = (sal_uInt16) aSlotEntry.ToInt32();
         if ( nSlotEntry )
         {
+#else
+        if( SvtInternalOptions().SlotCFGEnabled() == sal_True )
+        {
+#endif
+
             // Gibt es einen "Slotlist"-Eintrag ??
             if ( aStrm.GetError() )
             {
@@ -998,6 +1040,7 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
 
 Config* SfxApplication::GetFilterIni()
 {
+#if SUPD<613//MUSTINI
     if( !pAppData_Impl->pFilterIni )
     {
         String aIniFile( DEFINE_CONST_UNICODE( FILTER_INI ) );
@@ -1009,6 +1052,14 @@ Config* SfxApplication::GetFilterIni()
             pAppData_Impl->pFilterIni = new Config();
     }
     return pAppData_Impl->pFilterIni;
+#else
+    if( !pAppData_Impl->pFilterIni )
+    {
+        String aIniFile( SvtPathOptions().GetModulePath() + DEFINE_CONST_UNICODE("/") + DEFINE_CONST_UNICODE( FILTER_INI ) );
+        pAppData_Impl->pFilterIni = new Config( aIniFile );
+    }
+    return pAppData_Impl->pFilterIni;
+#endif
 }
 
 
@@ -1090,6 +1141,7 @@ ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon( SfxBindings& rBind
 
 PopupMenu* SfxAppData_Impl::GetPopupMenu( sal_uInt16 nSID, sal_Bool bBig, sal_Bool bNew )
 {
+#if SUPD<613//MUSTINI
     String aPath;
     SfxBmkMenu** ppMenu;
     sal_uInt16 nKey;
@@ -1119,6 +1171,37 @@ PopupMenu* SfxAppData_Impl::GetPopupMenu( sal_uInt16 nSID, sal_Bool bBig, sal_Bo
         (*ppMenu)->Initialize();
     }
     return ppMenu ? *ppMenu : NULL;
+#else
+    String aPath;
+    SfxBmkMenu** ppMenu;
+    String sKey;
+    switch( nSID )
+    {
+        case SID_NEWDOCDIRECT:
+            ppMenu = &pNewMenu;
+            sKey = SvtPathOptions().GetNewMenuPath();
+            break;
+        case SID_AUTOPILOTMENU:
+            ppMenu = &pAutoPilotMenu;
+            sKey = SvtPathOptions().GetAutoPilotPath();
+            break;
+        default:
+            ppMenu = 0;
+            DBG_ERROR( "Menu ID unknown!" );
+            break;
+    }
+
+    if( ppMenu && ( !*ppMenu || bNew ) )
+    {
+        INetURLObject aObj( sKey, INET_PROT_FILE );
+        String aURL = aObj.GetMainURL();
+        if ( *ppMenu )
+            delete *ppMenu;
+        *ppMenu = new SfxBmkMenu( aURL, aURL );
+        (*ppMenu)->Initialize();
+    }
+    return ppMenu ? *ppMenu : NULL;
+#endif
 }
 
 SfxMenuBarManager* SfxApplication::GetMenuBarManager() const
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index d62fc6f1b8e4..fb3c81fdbecc 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appopen.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -125,6 +125,10 @@
 #include <svtools/urihelper.hxx>
 #include <comphelper/processfactory.hxx>
 
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+
 #pragma hdrstop
 
 #include "app.hxx"
@@ -789,6 +793,7 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
             BOOL bBookmark=TRUE;
             if( aURLObj.GetProtocol() == INET_PROT_FILE )
             {
+#if SUPD<613//MUSTINI
                 SfxIniManager* pMgr = GetIniManager();
                 SfxIniKey aKey[] =
                 {
@@ -818,6 +823,24 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
                     }
                     ++nIndex;
                 }
+#else
+                SvtPathOptions aPathCFG;
+                USHORT nPathLevel = aURLObj.getSegmentCount();
+                INetURLObject aNewPathObj = INetURLObject( aPathCFG.GetNewMenuPath(), INET_PROT_FILE );
+                USHORT nNewLevel = aNewPathObj.getSegmentCount();
+                int nOffset = nPathLevel;
+                nOffset -= nNewLevel;
+                if ( nOffset >= 0 )
+                {
+                    INetURLObject aTempObj = aURLObj;
+                    for ( ; nOffset > 0; nOffset-- )
+                        aTempObj.removeSegment();
+                    if ( aTempObj == aNewPathObj )
+                    {
+                        bBookmark = FALSE;
+                    }
+                }
+#endif
             }
 
             if ( !bBookmark && pPath )
@@ -1036,6 +1059,7 @@ SfxFrame* SfxApplication::GetTargetFrame_Impl( const SfxItemSet* pSet, BOOL& rbO
         aURLObj.SetSmartURL( pRefererItem->GetValue() );
         if ( aURLObj.GetProtocol() == INET_PROT_FILE && ( !pFrame || pFrame->IsTop() ) )
         {
+#if SUPD<613//MUSTINI
             SfxIniManager* pIniMgr = GetIniManager();
             INetURLObject aStartMenuObj( pIniMgr->Get( SFX_KEY_STARTMENU_DIR ), INET_PROT_FILE );
             INetURLObject aQuickStartObj( pIniMgr->Get( SFX_KEY_QUICKSTART_DIR ), INET_PROT_FILE );
@@ -1044,6 +1068,13 @@ SfxFrame* SfxApplication::GetTargetFrame_Impl( const SfxItemSet* pSet, BOOL& rbO
                 aTargetName = String::CreateFromAscii( "_blank" );
                 pTargetItem = NULL;
             }
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+            DBG_ASSERT(sal_False, "SfxApplication::GetTargetFrame_Impl()\nStartMenu-Dir & QuickStart-Dir no longer supported!\n");
+#endif
+            aTargetName = String::CreateFromAscii( "_blank" );
+            pTargetItem = NULL;
+#endif
         }
     }
 
@@ -1148,7 +1179,11 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         String aPath;
         if ( nSID == SID_OPENTEMPLATE )
         {
+#if SUPD<613//MUSTINI
             aPath = GetIniManager()->Get( SFX_KEY_TEMPLATE_PATH );
+#else
+            aPath = SvtPathOptions().GetTemplatePath();
+#endif
             aPath = aPath.GetToken(0,';');
         }
 
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index dc510b420b81..b184bc699948 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appquit.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-04 17:34:23 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -248,7 +248,9 @@ void SfxApplication::Deinitialize()
         return;
 
     // Falls man nochmal beim Runterfahren in ein Reschedule l"auft
+#if SUPD<613//MUSTINI
     pAppData_Impl->EndListening( *pAppIniMgr );
+#endif
     pAppData_Impl->EndListening( *this );
     if ( pAppData_Impl->pCancelMgr )
         pAppData_Impl->EndListening( *pAppData_Impl->pCancelMgr );
@@ -341,7 +343,9 @@ void SfxApplication::Deinitialize()
     DELETEX(pAppData_Impl->pInitLinkList);
 #endif
 
+#if SUPD<613//MUSTINI
     pAppIniMgr->LeaveLock();
+#endif
     DELETEZ(pCfgMgr);
 
 #ifndef PRODUCT
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index e0af19dcec5a..98668949364d 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appreg.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:10:27 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,9 +62,13 @@
 #ifndef _SV_CONFIG_HXX
 #include <vcl/config.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
+
+#include <app.hxx>
 
 #pragma hdrstop
 
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 715422c960e5..bfdefb4858b5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appserv.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,6 +115,8 @@
 #include <svtools/ehdl.hxx>
 #endif
 
+#include <svtools/pathoptions.hxx>
+
 #pragma hdrstop
 
 #include "appimp.hxx"
@@ -138,7 +140,9 @@
 #include "new.hxx"
 #include "docinf.hxx"
 #include "templdlg.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxtypes.hxx"
 #include "sfxbasic.hxx"
 #include "tabdlg.hxx"
@@ -197,6 +201,7 @@ BOOL SfxApplication::InitOfficeAppType_Impl( USHORT nAppId, ApplicationType& rTy
         return FALSE;
     // App in Config suchen
     String aAppName = String( SfxResId( nAppId ) );
+#if SUPD<613//MUSTINI
     SfxIniManager* pIni = SFX_INIMANAGER();
     DBG_ASSERT( pIni, "Kein IniManager?!" );
     String aFullName;
@@ -206,6 +211,9 @@ BOOL SfxApplication::InitOfficeAppType_Impl( USHORT nAppId, ApplicationType& rTy
         if ( !aFullName.Len() )
             pIni = pIni->GetSubManager();
     }
+#else
+    String aFullName;
+#endif
 
     if ( !aFullName.Len() )
     {
@@ -381,8 +389,11 @@ void SfxApplication::BasicLibExec_Impl( SfxRequest &rReq, BasicManager *pMgr )
                             INetURLObject aOld( aFileName, INET_PROT_FILE );
                             aDest = aOld.GetName();
                         }
-
+#if SUPD<613//MUSTINI
                         INetURLObject aNew( SFX_INIMANAGER()->Get( SFX_KEY_BASIC_PATH ).GetToken( 0, ';' ), INET_PROT_FILE );
+#else
+                        INetURLObject aNew( SvtPathOptions().GetBasicPath().GetToken( 0, ';' ), INET_PROT_FILE );
+#endif
                         aNew.SetExtension( aExt );
                         pMgr->SetLibStorageName( nLib, aNew.GetFull() );
                         SaveBasicManager();
@@ -627,7 +638,11 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                         if ( aObj.HasError() )
                         {
                             // Wenn relativ, ConfigDir verwenden
+#if SUPD<613//MUSTINI
                             aObj.SetSmartURL( SFX_INIMANAGER()->Get( SFX_KEY_USERCONFIG_PATH) );
+#else
+                            aObj.SetSmartURL( SvtPathOptions().GetUserConfigPath() );
+#endif
                             aObj.insertName( pStringItem->GetValue() );
                             aCfgName = aObj.PathToFileName();
                         }
@@ -690,7 +705,11 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                         if ( aObj.HasError() )
                         {
                             // Wenn relativ, ConfigDir verwenden
+#if SUPD<613//MUSTINI
                             aObj.SetSmartURL( SFX_INIMANAGER()->Get( SFX_KEY_USERCONFIG_PATH) );
+#else
+                            aObj.SetSmartURL( SvtPathOptions().GetUserConfigPath() );
+#endif
                             aObj.insertName( pStringItem->GetValue() );
                             aCfgName = aObj.PathToFileName();
                         }
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index cd2244e91fc6..1ef4e48bded2 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appuno.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:23:17 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -178,7 +178,9 @@ using namespace ::rtl;
 #include "sfxuno.hxx"
 #include "appdata.hxx"
 #include "app.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxsids.hrc"
 #include "msg.hxx"
 #include "msgpool.hxx"
@@ -310,8 +312,14 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 String aPar = *((::rtl::OUString*)rProp.Value.getValue());
                 Size aSize;
                 Point aPos;
+#if SUPD<613//MUSTINI
                 if ( SfxIniManager::GetPosSize( aPar, aPos, aSize ) )
                     rSet.Put( SfxRectangleItem( SID_VIEW_POS_SIZE, Rectangle( aPos, aSize ) ) );
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                DBG_ASSERT( sal_False, "TransformParameters()\nProperty \"PosSize\" isn't supported yet!\n" );
+#endif
+#endif
             }
 
             // CharacterSet-Property?
@@ -486,7 +494,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
         {
             pValue[nItems].Name = sPosSize;
             Rectangle aRect = pRectItem->GetValue();
+#if SUPD<613//MUSTINI
             pValue[nItems++].Value <<= (  ::rtl::OUString(SfxIniManager::GetString( aRect.TopLeft(), aRect.GetSize() ) ) );
+#else
+#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+            DBG_ASSERT(sal_False, "TransformItems()\nSfxIniManager::GetString used to set property \"PosSize\" ...!\n");
+#endif
+#endif
         }
 
         SFX_ITEMSET_ARG( &rSet, pRefItem, SfxRefItem, SID_POSTLOCKBYTES, sal_False );
@@ -718,11 +732,13 @@ void SfxComponentFactory::Init_Impl()
     {
         Reference< XFrameLoader >  xLoader;
 #ifdef WNT
+#if SUPD<613//MUSTINI module iexplorer no longer supported!
         SfxIniManager* pIni = SfxIniManager::Get();
         if( !Application::IsRemoteServer() && pIni->IsInternetExplorerAvailable() )
             xLoader = Reference< XFrameLoader >( createInstance( DEFINE_CONST_UNICODE("private:iexplorer") ), ::com::sun::star::uno::UNO_QUERY );
         if ( !xLoader.is() )
 #endif
+#endif
             xLoader = Reference< XFrameLoader >( createInstance( DEFINE_CONST_UNICODE(".component:Text") ), ::com::sun::star::uno::UNO_QUERY );
         return xLoader;
     }
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 99ae007dae5b..0f6c669e7d15 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: childwin.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:27 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,9 +59,11 @@
  *
  ************************************************************************/
 
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
 #ifndef _TOOLBOX_HXX //autogen
 #include <vcl/toolbox.hxx>
 #endif
@@ -223,7 +225,8 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
 {
 //    if ( SFX_APP()->Get_Impl()->bBean )
 //        return;
-
+#if SUPD<613//MUSTINI
+/* TODO: Which key we can use to save this information in our configuration? */
     SfxIniManager *pIniMgr = SFX_INIMANAGER();
     char cToken = pIniMgr->GetToken();;
     String aWinData('V');
@@ -240,6 +243,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
         aWinData += rInfo.aExtraString;
     }
     pIniMgr->Set( aWinData, SFX_KEY_WINDOW, GetType() );
+#endif
     pImp->pFact->aInfo = rInfo;
 }
 
@@ -282,8 +286,12 @@ sal_uInt16 SfxChildWindow::GetPosition()
 void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWinInfo& rInfo )
 {
     // Konfiguration aus Ini-Manager laden
+#if SUPD<613//MUSTINI
     SfxIniManager *pAppIniMgr = SFX_APP()->GetAppIniManager();
     String aWinData( pAppIniMgr->Get( SFX_KEY_WINDOW, nId ) );
+#else
+    String aWinData;
+#endif
 
     if ( /*!SFX_APP()->Get_Impl()->bBean && */ aWinData.Len() )
     {
@@ -296,11 +304,16 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
         aWinData.Erase(0,1);
 
         // Version lesen
+#if SUPD<613//MUSTINI
         char cToken = pAppIniMgr->GetToken();
+#else
+        char cToken = ',';
+#endif
         sal_uInt16 nPos = aWinData.Search( cToken );
         sal_uInt16 nVersion = (sal_uInt16) aWinData.Copy( 0, nPos+1 ).ToInt32();
         aWinData.Erase(0,nPos+1);
 
+#if SUPD<613//MUSTINI
         // Gr"o\se und Position laden
         Point aPos;
         Size  aSize;
@@ -311,13 +324,17 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
             rInfo.aPos = aPos;
             rInfo.aSize = aSize;
         }
+#endif
         aWinData.Erase(0,aWinData.Search(cToken));
 
         // Sichtbarkeit laden: ist als ein char codiert
         rInfo.bVisible = (aWinData.Copy(1,1) == 0x0056); // 'V' = 56h
         aWinData.Erase(1,1);
-
+#if SUPD<613//MUSTINI
         nPos = aWinData.Search( pAppIniMgr->GetToken(), 2 );
+#else
+        nPos = aWinData.Search( cToken, 2 );
+#endif
         if (nPos != STRING_NOTFOUND)
         {
             // es gibt noch Extra-Information
@@ -561,6 +578,7 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
         // Dockt nicht in einem Splitwindow
         return sal_True;
     aStr.Erase(0, nPos+1);
+#if SUPD<613//MUSTINI
     SfxIniManager *pAppIniMgr = SFX_APP()->GetAppIniManager();
     Point aPos;
     Size aSize;
@@ -574,7 +592,7 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
             *pPos = (sal_uInt16) aPos.Y();
         return sal_True;
     }
-
+#endif
     return sal_False;
 }
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6a6078356299..6fe475be22f2 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sfxhelp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-04 17:34:23 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,9 +71,11 @@
 #ifndef _SFXITEMSET_HXX //autogen
 #include <svtools/itemset.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
@@ -107,6 +109,7 @@
 #endif
 
 #include <automation/automation.hxx>
+#include <svtools/pathoptions.hxx>
 #pragma hdrstop
 
 #ifndef _SFXENUMITEM_HXX //autogen
@@ -953,10 +956,14 @@ void SfxHelp_Impl::AssertValidHelpDocInfo()
 
 String SfxHelp_Impl::GetHelpPath()
 {
+#if SUPD<613//MUSTINI
     SfxIniManager* pIni = SFX_INIMANAGER()->Find( SFX_KEY_HELP_DIR );
     if ( !pIni )
         pIni = SFX_INIMANAGER();
     String aHelpDir = pIni->Get( SFX_KEY_HELP_DIR );
+#else
+    String aHelpDir = SvtPathOptions().GetHelpPath();
+#endif
 
     if ( aHelpDir.Len() )
     {
@@ -1083,11 +1090,25 @@ void SfxHelp_Impl::ResetPIStarterList()
 
 String SfxHelp_Impl::GetConfigDir( BOOL bGetSharedConfig )
 {
+#if SUPD<613//MUSTINI
     ULONG nKey = bGetSharedConfig ? SFX_KEY_CONFIG_DIR : SFX_KEY_USERCONFIG_PATH;
     SfxIniManager* pIni = SFX_INIMANAGER()->Find( nKey );
     if ( !pIni )
         pIni = SFX_INIMANAGER();
     return pIni->Get( nKey );
+#else
+    String sConfigDir;
+    SvtPathOptions aPathCFG;
+    if( bGetSharedConfig == sal_True )
+    {
+        sConfigDir = aPathCFG.GetConfigPath();
+    }
+    else
+    {
+        sConfigDir = aPathCFG.GetUserConfigPath();
+    }
+    return sConfigDir;
+#endif
 }
 
 String SfxHelp_Impl::GetHelpAgentConfig()
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 7c0a863804fa..65cfe50b3069 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fltfnc.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-24 11:41:38 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,8 +94,10 @@
 #ifndef _INTN_HXX //autogen
 #include <tools/intn.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
@@ -221,6 +223,7 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <rtl/ustring.hxx>
 #include <vos/process.hxx>
+#include <svtools/pathoptions.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
@@ -243,7 +246,9 @@ using namespace ::vos;
 #include <unotools/charclass.hxx>
 #endif
 
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "app.hxx"
 #include "fltdlg.hxx"
 #include "sfxhelp.hxx"
@@ -660,6 +665,7 @@ void SfxFilterContainer::RealLoad_Impl()
         }
     }
     Config* pConfig = SFX_APP()->GetFilterIni();
+#if SUPD<613//MUSTINI
     SfxIniManager *pMgr = SFX_INIMANAGER();
     SfxIniManager *pSubMgr = pMgr->GetSubManager();
     if( pSubMgr )
@@ -675,6 +681,18 @@ void SfxFilterContainer::RealLoad_Impl()
     {
         aName = pArg->bInstallIni ? String(S2U(pConfig->GetKeyName( n ))) : pMgr->GetKeyName( aString, n );
         aLine = pArg->bInstallIni ? String(S2U(pConfig->ReadKey( n ))) : pMgr->ReadKey( aString, aName );
+#else
+    if( pArg->bInstallIni )
+        pConfig->SetGroup( U2S(aString) );
+
+    sal_uInt16 nCount = pArg->bInstallIni ? pConfig->GetKeyCount() : 0;
+    String aOver( DEFINE_CONST_UNICODE(SFX_STR_OVERRIDE) );
+    String aName, aLine, aUIType, aMimeType, aClipFormat, aMacType, aTypeName, aWild, aFlags, aDefaultTemplate, aUserData;
+    for( sal_uInt16 n = 0; n < nCount; n++ )
+    {
+        aName = pArg->bInstallIni ? String(S2U(pConfig->GetKeyName( n ))) : String();
+        aLine = pArg->bInstallIni ? String(S2U(pConfig->ReadKey( n ))) : String();
+#endif
         sal_uInt16 nTokCount = aLine.GetTokenCount( ',' );
         if( nTokCount < 8 )
         {
@@ -930,6 +948,7 @@ void SfxFilterContainer::SaveFilters( const String& rGroup, SfxFilterFlags nMask
 {
     String aString( rGroup);
     aString+=DEFINE_CONST_UNICODE("-Filters");
+#if SUPD<613//MUSTINI
     SfxIniManager *pMgr = SFX_INIMANAGER();
     SfxIniManager *pSubMgr = pMgr->GetSubManager();
     if( pSubMgr )
@@ -977,6 +996,52 @@ void SfxFilterContainer::SaveFilters( const String& rGroup, SfxFilterFlags nMask
         aKey += String::CreateFromInt32( n++ );
         pMgr->WriteKey( aString, aKey, aLine );
     }
+#else
+    Config* pMgr = SFX_APP()->GetFilterIni();
+    pMgr->DeleteGroup( U2S(aString) );
+
+    SfxFilterMatcher aMatcher( ( SfxFilterContainer* ) this );
+    SfxFilterMatcherIter aIter( &aMatcher, nMask );
+    sal_uInt16 n = 1;
+    String aLine, aKey;
+    for( const SfxFilter* pFilter = aIter.First(); pFilter; pFilter = aIter.Next() )
+    {
+        if ( pFilter->GetURLPattern().Len() )
+            // Filter mit URLPattern k"onnen wir nicht einlesen, also auch nicht speichern!
+            continue;
+
+        aLine = pFilter->GetUIName();
+        aLine += ',';
+        aLine += pFilter->GetMimeType();
+        aLine+=',';
+        sal_uInt32 nFormat = pFilter->GetFormat();
+        if( nFormat )
+            aLine += Exchange::GetFormatName( pFilter->GetFormat() );
+        aLine += ',';
+        aLine += pFilter->GetMacType();
+        aLine+=',';
+        aLine += pFilter->GetRealTypeName();
+        aLine+=',';
+        aLine += pFilter->GetWildcard()();
+        aLine+=',';
+        aLine += String::CreateFromInt32( pFilter->GetDocIconId() );
+        aLine+=',';
+        aLine += pFilter->GetUserData();
+        aLine+=',';
+        if( pFilter->GetVersion() != SOFFICE_FILEFORMAT_NOW )
+            aLine += String::CreateFromInt32( pFilter->GetVersion() );
+        aLine += ',';
+        aLine += FlagsToName_Impl( pFilter->GetFilterFlags() );
+        aLine += ',';
+        aLine += pFilter->GetDefaultTemplate();
+        aKey = pFilter->GetFilterName();
+        if ( !aKey.Len() )
+            aKey = DEFINE_CONST_UNICODE( SFX_STR_OVERRIDE );
+        aKey += String::CreateFromInt32( n++ );
+        pMgr->SetGroup( U2S(aString) );
+        pMgr->WriteKey( U2S(aKey), U2S(aLine) );
+    }
+#endif
 }
 
 //-------------------------------------------------------------------------
@@ -1132,7 +1197,11 @@ sal_Bool SfxIsHelpEntryURL( const String &rURL, const String &rExtMask )
     if ( aURL.GetProtocol() == INET_PROT_FILE && aURL.GetMainURL().Len() > 8 )
     {
         String aExt = aURL.getExtension().ToLowerAscii();
+#if SUPD<613//MUSTINI
         INetURLObject aHelpDir( SFX_INIMANAGER()->Get( SFX_KEY_HELP_DIR ), INET_PROT_FILE );
+#else
+        INetURLObject aHelpDir( SvtPathOptions().GetHelpPath(), INET_PROT_FILE );
+#endif
         if ( WildCard( aHelpDir.GetMainURL() ).Matches( rURL ) && WildCard( rExtMask ).Matches( aExt ) )
             return sal_True;
     }
@@ -1521,7 +1590,11 @@ sal_uInt32 SfxExecutableFilterContainer::Execute(
             }
             else
             {
+#if SUPD<613//MUSTINI
                 INetURLObject aHelpDir( SFX_INIMANAGER()->Get(SFX_KEY_HELP_DIR ), INET_PROT_FILE );
+#else
+                INetURLObject aHelpDir( SvtPathOptions().GetHelpPath(), INET_PROT_FILE );
+#endif
                 aHelpDir.setFinalSlash();
                 String aNewURL = DEFINE_CONST_UNICODE(".component:Help/Content.Contents;\001");
                 aNewURL += aObj.getBase();
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 8ce52764ec2a..e0a4dd3c5e5c 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmhtml.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:28 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,10 @@
 #include <tools/list.hxx>
 #include <tools/table.hxx>
 
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifndef _HTMLTOKN_H
 #include <svtools/htmltokn.h>
@@ -87,8 +89,9 @@
 #include "request.hxx"
 #include "fcontnr.hxx"
 #include "sfxtypes.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
-
+#endif
 #define SFX_HTMLFRMSIZE_REL 0x0001
 #define SFX_HTMLFRMSIZE_PERCENT 0x0002
 
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 81cf877f106a..32254771bf3b 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helper.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kso $ $Date: 2000-10-31 10:09:32 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -230,7 +230,7 @@ sal_Bool SfxContentHelper::IsFolder( const String& rContent )
     }
     catch( ::com::sun::star::ucb::CommandAbortedException& )
     {
-        DBG_ERRORFILE( "CommandAbortedException" );
+        //DBG_ERRORFILE( "CommandAbortedException" );
     }
     catch( ::com::sun::star::ucb::IllegalIdentifierException& )
     {
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 46ab6382de14..11262aa57db2 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sfxhtml.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:28 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,8 +93,10 @@
 #ifndef _GOODIES_IMAPRECT_HXX
 #include <svtools/imaprect.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifndef _SVSTDARR_ULONGS_DECL
 #define _SVSTDARR_ULONGS
@@ -116,8 +118,9 @@
 #endif
 
 #include "sfxhtml.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
-
+#endif
 sal_Char __FAR_DATA sHTML_MIME_text[] = "text/";
 sal_Char __FAR_DATA sHTML_MIME_application[] = "application/";
 sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-";
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 65c5c819936b..ec2263d129b2 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: about.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-30 11:56:58 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,9 @@
 #include "sfxresid.hxx"
 #include "sfxdefs.hxx"
 #include "app.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 
 #include "dialog.hrc"
 
@@ -150,7 +152,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
     bNormal ( TRUE )
 
 {
+#if SUPD<613//MUSTINI
     SfxIniManager* pIniMgr = SFX_INIMANAGER();
+#endif
 
     // Transparenter Font
     Font aFont = GetFont();
diff --git a/sfx2/source/dialog/acccfg.cxx b/sfx2/source/dialog/acccfg.cxx
index d0e276cb66e4..d6cf783872c4 100644
--- a/sfx2/source/dialog/acccfg.cxx
+++ b/sfx2/source/dialog/acccfg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: acccfg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:30 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,10 @@
 #ifndef _SV_FILEDLG_HXX //autogen
 #include <svtools/filedlg.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #endif
 #pragma hdrstop
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 55c719b28882..77f63f1f89c3 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basedlgs.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:29 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,8 +72,10 @@
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 
 #pragma hdrstop
@@ -82,7 +84,9 @@
 #include "viewfrm.hxx"
 #include "tabdlg.hxx"
 #include "app.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "bindings.hxx"
 #include "dispatch.hxx"
 #include "sfxhelp.hxx"
@@ -111,6 +115,7 @@ void SetDialogData_Impl(SfxViewFrame *pFrame, Window *pDlg,
                         sal_uInt16 nId, const String &rExtraData = aEmptyString)
 {
     // Konfiguration in Ini-Manager abspeichern
+#if SUPD<613//MUSTINI
     SfxIniManager *pIniMgr =
         pFrame ? pFrame->GetIniManager() : SFX_APP()->GetAppIniManager();
     String aDlgData( pIniMgr->GetString( pDlg->GetPosPixel(), Size() ) );
@@ -120,6 +125,7 @@ void SetDialogData_Impl(SfxViewFrame *pFrame, Window *pDlg,
         aDlgData += rExtraData;
     }
     pIniMgr->Set( aDlgData, SFX_KEY_DIALOG, nId );
+#endif
 }
 
 // -----------------------------------------------------------------------
@@ -135,6 +141,7 @@ String GetDialogData_Impl( SfxViewFrame *pFrame, Window *pDlg, sal_uInt16 nId)
 {
     String aRetString;
     // Konfiguration vorhanden?
+#if SUPD<613//MUSTINI
     SfxIniManager *pIniMgr =
         pFrame ? pFrame->GetIniManager() : SFX_APP()->GetAppIniManager();
     String aDlgData( pIniMgr->Get( SFX_KEY_DIALOG, nId ) );
@@ -156,6 +163,7 @@ String GetDialogData_Impl( SfxViewFrame *pFrame, Window *pDlg, sal_uInt16 nId)
             }
         }
     }
+#endif
     return aRetString;
 }
 
@@ -748,12 +756,16 @@ IMPL_LINK( SfxSingleTabDialog, OKHdl_Impl, Button *, pButton )
     if ( bModified )
     {
         // auch noch schnell User-Daten im IniManager abspeichern
+#if SUPD<613//MUSTINI
         SfxIniManager* pIniMgr = SFX_APP()->GetAppIniManager();
+#endif
         pPage->FillUserData();
         String sData( pPage->GetUserData() );
 
+#if SUPD<613//MUSTINI
         if ( sData.Len() )
             pIniMgr->Set( sData, SFX_KEY_PAGE, GetUniqId() );
+#endif
         EndDialog( RET_OK );
     }
     else
@@ -943,8 +955,12 @@ void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
     if ( pPage )
     {
         // erstmal die User-Daten besorgen, dann erst Reset()
+#if SUPD<613//MUSTINI
         SfxIniManager* pIniMgr = SFX_APP()->GetAppIniManager();
         pPage->SetUserData( pIniMgr->Get( SFX_KEY_PAGE, GetUniqId() ) );
+#else
+        pPage->SetUserData( String() );
+#endif
         pPage->Reset( *pOptions );
         pPage->Show();
 
diff --git a/sfx2/source/dialog/cfg.cxx b/sfx2/source/dialog/cfg.cxx
index 78ec55f120a2..ac0ca53275d7 100644
--- a/sfx2/source/dialog/cfg.cxx
+++ b/sfx2/source/dialog/cfg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-11 15:36:18 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,13 +77,16 @@
 #ifndef _BASMGR_HXX //autogen
 #include <basic/basmgr.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifndef _SV_WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
 #include <tools/urlobj.hxx>
+#include <svtools/pathoptions.hxx>
 #pragma hdrstop
 
 #include "cfg.hxx"
@@ -114,7 +117,9 @@
 #include "tbxopdlg.hxx"
 #include "minfitem.hxx"
 #include "iodlg.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "viewfrm.hxx"
 #include "workwin.hxx"
 
@@ -1342,7 +1347,11 @@ String SfxConfigDialog::FileDialog_Impl( Window *pParent, WinBits nBits, const S
     aFileDlg.AddFilter( String(SfxResId(STR_FILTERNAME_CFG)),DEFINE_CONST_UNICODE("*.cfg") );
 #endif
     aFileDlg.AddFilter( String(SfxResId(STR_FILTERNAME_ALL) ), DEFINE_CONST_UNICODE(FILEDIALOG_FILTER_ALL) );
+#if SUPD<613//MUSTINI
     INetURLObject aFilePath( SFX_INIMANAGER()->Get( SFX_KEY_USERCONFIG_PATH ), INET_PROT_FILE );
+#else
+    INetURLObject aFilePath( SvtPathOptions().GetUserConfigPath(), INET_PROT_FILE );
+#endif
     aFilePath.setFinalSlash();
     String aCfgName = aFilePath.PathToFileName();
 #ifndef MAC
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 85d4e372b88c..3a6e8523aa40 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dinfdlg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:30 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,12 @@
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
 
 #include <svtools/urihelper.hxx>
+#include <svtools/useroptions.hxx>
 
 #pragma hdrstop
 
@@ -80,7 +84,9 @@
 #include "viewfrm.hxx"
 #include "request.hxx"
 #include "expfile.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "exptypes.hxx"
 #include "helper.hxx"
 
@@ -348,7 +354,11 @@ IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG )
 {
     SfxStamp aCreated;
     if ( bEnableUseUserData && aUseUserDataCB.IsChecked() )
+#if SUPD<613//MUSTINI
         aCreated.SetName( SFX_INIMANAGER()->GetUserFullName() );
+#else
+        aCreated.SetName( SvtUserOptions().GetFullName() );
+#endif
     aCreateValFt.SetText( ConvertDateTime_Impl( aCreated ) );
     XubString aEmpty;
     aChangeValFt.SetText( aEmpty );
@@ -428,7 +438,11 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
             SfxDocumentInfo aInfo( pInfoItem->GetDocInfo() );
             SfxStamp aCreated;
             if ( bEnableUseUserData && aUseUserDataCB.IsChecked() )
+#if SUPD<613//MUSTINI
                 aCreated.SetName( SFX_INIMANAGER()->GetUserFullName() );
+#else
+                aCreated.SetName( SvtUserOptions().GetFullName() );
+#endif
             aInfo.SetCreated( aCreated );
             SfxStamp aInvalid( TIMESTAMP_INVALID_DATETIME );
             aInfo.SetChanged( aInvalid );
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 585d1eb71c26..a5a96121e353 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dockwin.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:30 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,10 @@
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifdef VCL
 #ifndef _SV_DECOVIEW_HXX
@@ -724,12 +726,14 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
                 if ( nPos != STRING_NOTFOUND )
                 {
                     aStr.Erase(0, nPos+1);
+#if SUPD<613//MUSTINI
                     SfxIniManager *pAppIniMgr = SFX_APP()->GetAppIniManager();
                     if ( pAppIniMgr->GetPosSize( aStr, aPos, pImp->aSplitSize ) )
                     {
                         pImp->nLine = pImp->nDockLine = (USHORT) aPos.X();
                         pImp->nPos  = pImp->nDockPos  = (USHORT) aPos.Y();
                     }
+#endif
                 }
             }
         }
@@ -887,9 +891,11 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
     if ( pImp->bSplitable )
     {
         rInfo.aExtraString += ',';
+#if SUPD<613//MUSTINI
         SfxIniManager *pIniMgr = SFX_INIMANAGER();
         Point aPos(pImp->nLine, pImp->nPos);
         rInfo.aExtraString += pIniMgr->GetString( aPos, pImp->aSplitSize );
+#endif
     }
 
     rInfo.aExtraString += ')';
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 7069973c3ddd..2747d65eb1c5 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: splitwin.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:31 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,10 @@
 #ifndef _SYSTEM_HXX //autogen
 #include <vcl/system.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #pragma hdrstop
 
@@ -76,7 +78,9 @@
 #include "workwin.hxx"
 #include "dockwin.hxx"
 #include "app.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "dialog.hrc"
 #include "sfxresid.hxx"
 #include "mnumgr.hxx"
@@ -287,44 +291,52 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     if ( bWithButtons )
     {
         // Konfiguration einlesen
-        SfxIniManager *pAppIniMgr = SFX_APP()->GetAppIniManager();
-        if ( pAppIniMgr )
-        {
-            String aWinData( pAppIniMgr->Get( SFX_KEY_SPLITWINDOW, (USHORT) eTbxAlign ) );
-            if ( aWinData.Len() && aWinData.GetChar( (USHORT) 0 ) == 'V' )
+#if SUPD<613//MUSTINI
+    #ifndef ENABLE_DIALOGCFG//MUSTINI
+            SfxIniManager *pAppIniMgr = SFX_APP()->GetAppIniManager();
+            if ( pAppIniMgr )
             {
-                pEmptyWin->nState = aWinData.GetToken( 1, ',' ).ToInt32();
-                if ( pEmptyWin->nState & 2 )
-                    pEmptyWin->bFadeIn = TRUE;
-                bPinned = !( pEmptyWin->nState & 1 );
-
-                USHORT i=2;
-                USHORT nCount = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
-                for ( USHORT n=0; n<nCount; n++ )
+                String aWinData( pAppIniMgr->Get( SFX_KEY_SPLITWINDOW, (USHORT) eTbxAlign ) );
+                if ( aWinData.Len() && aWinData.GetChar( (USHORT) 0 ) == 'V' )
                 {
-                    SfxDock_Impl *pDock = new SfxDock_Impl;
-                    pDock->pWin = 0;
-                    pDock->bNewLine = FALSE;
-                    pDock->bHide = TRUE;
-                    pDock->nType = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
-                    if ( !pDock->nType )
+                    pEmptyWin->nState = aWinData.GetToken( 1, ',' ).ToInt32();
+                    if ( pEmptyWin->nState & 2 )
+                        pEmptyWin->bFadeIn = TRUE;
+                    bPinned = !( pEmptyWin->nState & 1 );
+
+                    USHORT i=2;
+                    USHORT nCount = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
+                    for ( USHORT n=0; n<nCount; n++ )
                     {
-                        // K"onnte NewLine bedeuten
+                        SfxDock_Impl *pDock = new SfxDock_Impl;
+                        pDock->pWin = 0;
+                        pDock->bNewLine = FALSE;
+                        pDock->bHide = TRUE;
                         pDock->nType = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
                         if ( !pDock->nType )
                         {
-                            // Lesefehler
-                            delete pDock;
-                            break;
+                            // K"onnte NewLine bedeuten
+                            pDock->nType = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
+                            if ( !pDock->nType )
+                            {
+                                // Lesefehler
+                                delete pDock;
+                                break;
+                            }
+                            else
+                                pDock->bNewLine = TRUE;
                         }
-                        else
-                            pDock->bNewLine = TRUE;
-                    }
 
-                    pDockArr->Insert(pDock,n);
+                        pDockArr->Insert(pDock,n);
+                    }
                 }
             }
-        }
+    #else
+        #ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
+                DBG_ASSERT(sal_False, "SfxSplitWindow::SfxSplitWindow()\nThere exist no config item for splitwindow!\n");
+        #endif
+    #endif
+#endif
     }
     else
     {
@@ -371,9 +383,10 @@ SfxSplitWindow::~SfxSplitWindow()
             aWinData += ',';
             aWinData += String::CreateFromInt32( pDock->nType);
         }
-
+#if SUPD<613//MUSTINI
         SfxIniManager *pIniMgr = SFX_INIMANAGER();
         pIniMgr->Set( aWinData, SFX_KEY_SPLITWINDOW, GetAlign() );
+#endif
     }
 
     if ( pEmptyWin )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 69afbf8c2afe..e2ddabb9ae9b 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabdlg.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-23 11:07:01 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,10 @@
 #ifndef _SV_CLIP_HXX //autogen
 #include <vcl/clip.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #pragma hdrstop
 
@@ -84,7 +86,9 @@
 #include "tabdlg.hxx"
 #include "viewfrm.hxx"
 #include "app.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxresid.hxx"
 #include "sfxhelp.hxx"
 
@@ -426,6 +430,7 @@ SfxTabDialog::SfxTabDialog
 SfxTabDialog::~SfxTabDialog()
 {
     // Konfiguration in Ini-Manager abspeichern
+#if SUPD<613//MUSTINI
     SfxIniManager* pIniMgr = SFX_APP()->GetAppIniManager();
     String aDlgData( pIniMgr->GetString( GetPosPixel(), Size() ) );
     aDlgData += pIniMgr->GetToken();
@@ -463,6 +468,38 @@ SfxTabDialog::~SfxTabDialog()
     SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
     if ( pHelpPI )
         pHelpPI->ResetTopic();
+#else
+    String aDlgData(',');
+    aDlgData += String::CreateFromInt32( aTabCtrl.GetCurPageId() );
+    const USHORT nCount = pImpl->pData->Count();
+
+    for ( USHORT i = 0; i < nCount; ++i )
+    {
+        Data_Impl* pDataObject = pImpl->pData->GetObject(i);
+
+        if ( pDataObject->pTabPage )
+        {
+            pDataObject->pTabPage->FillUserData();
+            String aPageData(pDataObject->pTabPage->GetUserData());
+
+            if ( pDataObject->bOnDemand )
+                delete (SfxItemSet*)&pDataObject->pTabPage->GetItemSet();
+            delete pDataObject->pTabPage;
+        }
+        delete pDataObject;
+    }
+    delete pImpl->pApplyButton;
+    delete pImpl->pData;
+    delete pImpl;
+    delete pUserBtn;
+    delete pOutSet;
+    delete pExampleSet;
+    delete pRanges;
+
+    SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
+    if ( pHelpPI )
+        pHelpPI->ResetTopic();
+#endif
 }
 
 // -----------------------------------------------------------------------
@@ -631,6 +668,7 @@ void SfxTabDialog::Start_Impl()
     USHORT nActPage = aTabCtrl.GetPageId( 0 );
 
     // Konfiguration vorhanden?
+#if SUPD<613//MUSTINI
     SfxApplication *pSfxApp = SFX_APP();
     SfxIniManager* pIniMgr =
         pFrame ? pFrame->GetIniManager() : pSfxApp->GetAppIniManager();
@@ -646,7 +684,6 @@ void SfxTabDialog::Start_Impl()
 
         // initiale TabPage aus Programm/Hilfe/Konfig
         nActPage = (USHORT)aDlgData.GetToken( 1, pIniMgr->GetToken() ).ToInt32();
-
         if ( USHRT_MAX != nAppPageId )
             nActPage = nAppPageId;
         else
@@ -663,6 +700,11 @@ void SfxTabDialog::Start_Impl()
     else if ( USHRT_MAX != nAppPageId &&
               TAB_PAGE_NOTFOUND != aTabCtrl.GetPagePos( nAppPageId ) )
         nActPage = nAppPageId;
+#else
+    if ( USHRT_MAX != nAppPageId &&
+              TAB_PAGE_NOTFOUND != aTabCtrl.GetPagePos( nAppPageId ) )
+        nActPage = nAppPageId;
+#endif
 
     aTabCtrl.SetCurPageId( nActPage );
     ActivatePageHdl( &aTabCtrl );
@@ -770,9 +812,11 @@ void SfxTabDialog::RemoveTabPage( USHORT nId )
             String aPageData(pDataObject->pTabPage->GetUserData());
             if ( aPageData.Len() )
             {
+#if SUPD<613//MUSTINI
                 SfxIniManager* pIniMgr =
                     pFrame ? pFrame->GetIniManager() : SFX_APP()->GetAppIniManager();
                 pIniMgr->Set( aPageData, SFX_KEY_PAGE, pDataObject->nId);
+#endif
             }
 
             if ( pDataObject->bOnDemand )
@@ -1203,6 +1247,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     DBG_ASSERT( pImpl->pData->Count(), "keine Pages angemeldet" );
     const USHORT nId = pTabCtrl->GetCurPageId();
     SfxApplication *pSfxApp = SFX_APP();
+#if SUPD<613//MUSTINI
     SfxIniManager* pIniMgr =
             pFrame ? pFrame->GetIniManager() : pSfxApp->GetAppIniManager();
     if ( BOOL( pIniMgr->Get( SFX_GROUP_USER, DEFINE_CONST_UNICODE("HelpAuthor") ).ToInt32() ) )
@@ -1215,6 +1260,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
         Clipboard::Clear();
         Clipboard::CopyString( aText );
     }
+#endif
 
     // Tab Page schon da?
     SfxTabPage* pTabPage = (SfxTabPage *)pTabCtrl->GetTabPage( nId );
@@ -1242,9 +1288,9 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
         DBG_ASSERT( NULL == pDataObject->pTabPage, "TabPage mehrfach erzeugt" );
         pDataObject->pTabPage = pTabPage;
         pDataObject->pTabPage->SetTabDialog( this );
-
+#if SUPD<613//MUSTINI
         pTabPage->SetUserData(pIniMgr->Get( SFX_KEY_PAGE, pDataObject->nId ));
-
+#endif
         Size aSiz = pTabPage->GetSizePixel();
         Size aCtrlSiz = pTabCtrl->GetOutputSizePixel();
         // Gr"o/se am TabControl nur dann setzen, wenn < als TabPage
@@ -1291,11 +1337,12 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
 {
     USHORT nId = pTabCtrl->GetCurPageId();
     SfxApplication *pSfxApp = SFX_APP();
+#if SUPD<613//MUSTINI
     SfxIniManager* pIniMgr =
             pFrame ? pFrame->GetIniManager() : pSfxApp->GetAppIniManager();
     if ( BOOL( pIniMgr->Get( SFX_GROUP_USER, DEFINE_CONST_UNICODE("HelpAuthor") ).ToInt32() ) )
         GetpApp()->HideStatusText();
-
+#endif
     SfxTabPage *pPage = (SfxTabPage*)pTabCtrl->GetTabPage( nId );
     DBG_ASSERT( pPage, "keine aktive Page" );
 #ifdef DBG_UTIL
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 54a8f5fb6904..634b9d32cf35 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: versdlg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:31 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,7 @@
 #include <svtools/intitem.hxx>
 #include <svtools/stritem.hxx>
 #include <svtools/itemset.hxx>
+#include <svtools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "versdlg.hrc"
@@ -73,7 +74,9 @@
 #include "objsh.hxx"
 #include "sfxsids.hrc"
 #include "dispatch.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "request.hxx"
 
 // **************************************************************************
@@ -243,7 +246,11 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     else if ( pButton == &aSaveButton )
     {
         SfxVersionInfo aInfo;
+#if SUPD<613//MUSTINI
         aInfo.aCreateStamp = SfxStamp( SFX_INIMANAGER()->GetUserFullName() );
+#else
+        aInfo.aCreateStamp = SfxStamp( SvtUserOptions().GetFullName() );
+#endif
         SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, aInfo, TRUE );
         short nRet = pDlg->Execute();
         if ( nRet == RET_OK )
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index ec46b408ffab..42b1ea0ede85 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfac.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:23:21 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,7 +88,9 @@
 #include "module.hxx"
 #include "mnumgr.hxx"
 #include "accmgr.hxx"
+#if SUPD<613//MUSTINI
 #include <inimgr.hxx>
+#endif
 #include <sfxresid.hxx>
 #include <sfxuno.hxx>
 #include "doc.hrc"
@@ -561,6 +563,7 @@ void SfxObjectFactory::SetStandardTemplate( const String& rFactoryURL, const Str
     if ( pFactory )
     {
         ((SfxObjectFactory*)pFactory)->pImpl->aStandardTemplate = rTemplate;
+#if SUPD<613//MUSTINI
         SfxIniManager* pIni = SFX_INIMANAGER();
         if ( !rTemplate.Len() )
             pIni->DeleteKey( DEFINE_CONST_UNICODE( "StandardTemplates"),
@@ -568,6 +571,7 @@ void SfxObjectFactory::SetStandardTemplate( const String& rFactoryURL, const Str
         else
             pIni->WriteKey( DEFINE_CONST_UNICODE( "StandardTemplates"),
                             String::CreateFromAscii( pFactory->pShortName ), rTemplate );
+#endif
     }
 }
 
@@ -576,9 +580,11 @@ const String& SfxObjectFactory::GetStandardTemplate() const
     if (!pImpl->bTemplateInitialized )
     {
         pImpl->bTemplateInitialized = sal_True;
+#if SUPD<613//MUSTINI
         SfxIniManager *pIni = SFX_INIMANAGER();
         pImpl->aStandardTemplate = pIni->SubstPathVars( pIni->ReadKey( DEFINE_CONST_UNICODE( "StandardTemplates"),
                                                                 String::CreateFromAscii( pShortName ) ) );
+#endif
     }
 
     return pImpl->aStandardTemplate;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index d3a2f70cce88..e6527ab7dd07 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfile.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: mba $ $Date: 2000-11-03 12:05:20 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,7 +161,7 @@ using namespace ::com::sun::star::ucb;
 #include <so3/transbnd.hxx> // SvKeyValueIterator
 #include <tools/urlobj.hxx>
 #include <unotools/ucblockbytes.hxx>
-#include <unotools/localfilehelper.hxx>
+#include <svtools/pathoptions.hxx>
 #include <ucbhelper/contentbroker.hxx>
 
 #include "ucbhelp.hxx"
@@ -177,7 +177,9 @@ using namespace ::com::sun::star::ucb;
 #include "doc.hrc"          // MSG_WARNING_BACKUP, MSG_OPEN_READONLY
 #include "openflag.hxx"     // SFX_STREAM_READONLY etc.
 #include "sfxresid.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"       // Backup Path
+#endif
 
 #define MAX_REDIRECT 5
 
@@ -1301,7 +1303,11 @@ void SfxMedium::DoBackup_Impl()
     INetURLObject   aSource = GetURLObject();
     String          aParentURL;
     String          aName;
+#if SUPD<613//MUSTINI
     String          aBakDir = SFX_INIMANAGER()->Get(SFX_KEY_BACKUP_PATH);
+#else
+    String          aBakDir = SvtPathOptions().GetBackupPath();
+#endif
     BOOL            bTryTransfer = FALSE;
     sal_Bool        bSuccess = sal_False;
     Reference < XContent > xContent;
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index 094f40f0b183..be8fa402cf94 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docinf.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-09 10:41:30 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,7 +74,9 @@
 #include "app.hxx"
 #include "docinf.hxx"
 #include "docfile.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxtypes.hxx"
 
 //========================================================================
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d64c1852f87e..0bd3515027db 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: doctempl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-17 13:39:45 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,10 @@
 #ifndef _COM_SUN_STAR_UNO_ANY_H_
 #include <com/sun/star/uno/Any.h>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifndef _SYSTEM_HXX //autogen
 #include <vcl/system.hxx>
@@ -87,15 +89,17 @@
 #endif
 #include <tools/fsys.hxx>
 #include <tools/string.hxx>
+#include <svtools/pathoptions.hxx>
 
 #include "doctempl.hxx"
 #include "docfac.hxx"
 #include "docfile.hxx"
 #include "objsh.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxtypes.hxx"
 #include "app.hxx"
-#include "inimgr.hxx"
 #include "sfxresid.hxx"
 #include "docfilt.hxx"
 #include "fltfnc.hxx"
@@ -2216,7 +2220,11 @@ SfxDocumentTemplates::SfxDocumentTemplates()
     Konstruktor
 */
 
+#if SUPD<613//MUSTINI
 :   aDirs(SFX_INIMANAGER()->Get(SFX_KEY_TEMPLATE_PATH)),
+#else
+:   aDirs(SvtPathOptions().GetTemplatePath()),
+#endif
     pDirs(0)
 {
 }
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 462ee1a9cd3a..ec2cd9b42cc3 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docvor.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:32 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,6 +90,7 @@
 #include <svtools/ehdl.hxx>
 #endif
 #include <tools/urlobj.hxx>
+#include <svtools/pathoptions.hxx>
 #pragma hdrstop
 
 #include "helpid.hrc"
@@ -101,7 +102,9 @@
 #include "sfxtypes.hxx"
 #include "app.hxx"
 #include "dispatch.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxresid.hxx"
 #include "iodlg.hxx"
 #include "doc.hrc"
@@ -202,8 +205,12 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
     aLeftLb.SetHelpId( HID_CTL_ORGANIZER_LEFT );
     aRightLb.SetHelpId( HID_CTL_ORGANIZER_RIGHT );
 
+#if SUPD<613//MUSTINI
     SfxIniManager* pIniMgr = SFX_INIMANAGER();
     String aWorkPath = pIniMgr->Get( SFX_KEY_WORK_PATH );
+#else
+    String aWorkPath = SvtPathOptions().GetWorkPath();
+#endif
     if ( aWorkPath.Len() )
     {
         INetURLObject aObj( aWorkPath, INET_PROT_FILE );
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index c51c47f6b73f..2993e909d582 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objcont.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-30 13:45:53 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,6 +93,7 @@
 #include <math.h>
 
 #include <svtools/saveopt.hxx>
+#include <svtools/useroptions.hxx>
 
 #include "sfxresid.hxx"
 #include "stbmgr.hxx"
@@ -100,7 +101,9 @@
 #include "fltfnc.hxx"
 #include "docfac.hxx"
 #include "cfgmgr.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "viewsh.hxx"
 #include "objsh.hxx"
 #include "objshimp.hxx"
@@ -185,7 +188,11 @@ FASTBOOL SfxObjectShell::SaveWindows_Impl( SvStorage &rStor ) const
             SfxTopFrame* pTop = (SfxTopFrame*) pFrame->GetFrame();
             Window* pWin = pTop->GetTopWindow_Impl();
 
+#if SUPD<613//MUSTINI
             char cToken = SfxIniManager::GetToken();
+#else
+            char cToken = ',';
+#endif
             const BOOL bActWin = pActFrame == pFrame;
             String aUserData;
             pFrame->GetViewShell()->WriteUserData(aUserData);
@@ -201,7 +208,9 @@ FASTBOOL SfxObjectShell::SaveWindows_Impl( SvStorage &rStor ) const
                 aWinData += SFX_WINSIZE_MIN;
             else
 */
+#if SUPD<613//MUSTINI
             aWinData += SfxIniManager::GetString( pWin->GetPosPixel(), pWin->GetSizePixel() );
+#endif
             aWinData += cToken;
             aWinData += aUserData;
 
@@ -261,7 +270,11 @@ SfxViewFrame* SfxObjectShell::LoadWindows_Impl( SfxTopFrame *pPreferedFrame )
     // alle gespeicherten Fenster "offnen
     SfxViewFrame *pActiveFrame = 0;
     String aWinData;
+#if SUPD<613//MUSTINI
     char cToken = SfxIniManager::GetToken();
+#else
+    char cToken =',';
+#endif
     SfxItemSet *pSet = GetMedium()->GetItemSet();
 
     pImp->bLoadingWindows = TRUE;
@@ -286,9 +299,9 @@ SfxViewFrame* SfxObjectShell::LoadWindows_Impl( SfxTopFrame *pPreferedFrame )
                 aUserData = aWinData.GetToken( 2, cToken );
                 bActive = aWinData.GetToken( 3, cToken ).ToInt32();
 
-                if ( aPosSize.EqualsAscii( SFX_WINSIZE_MAX ) )
+                if ( aPosSize.EqualsAscii( "min" ) )
                     bMaximized = TRUE;
-                else if ( aPosSize.EqualsAscii( SFX_WINSIZE_MIN ) )
+                else if ( aPosSize.EqualsAscii( "min" ) )
                 {
                     bMaximized = TRUE;
                     bActive = FALSE;
@@ -306,8 +319,10 @@ SfxViewFrame* SfxObjectShell::LoadWindows_Impl( SfxTopFrame *pPreferedFrame )
 
             Point aPt;
             Size aSz;
+#if SUPD<613//MUSTINI
             if ( !bMaximized )
                 SfxIniManager::GetPosSize( aPosSize, aPt, aSz );
+#endif
 
             // nur aktives soll geladen werden, es ist aber nicht das aktive?
             if ( !bLoadDocWins && !bActive )
@@ -403,7 +418,11 @@ void SfxObjectShell::UpdateDocInfoForSave()
     if ( IsModified() )
     {
         // Keine Unterschiede mehr zwischen Save, SaveAs
+#if SUPD<613//MUSTII
         String aUserName = SFX_INIMANAGER()->GetUserFullName();
+#else
+        String aUserName = SvtUserOptions().GetFullName();
+#endif
         if ( !rDocInfo.IsUseUserData() )
             aUserName.Erase();
 
@@ -1506,8 +1525,12 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
                 // template was found
                 // check if template filename differs from the specified one
                 // if comparing filenames is enabled ask user, otherwise accept the different file name
+#if SUPD<613//MUSTINI
                 if( aTemplFileName.Len() && aTemplFileName != aFoundName &&
                         (USHORT)SFX_INIMANAGER()->Get( SFX_KEY_SEARCHTEMPLATE ).ToInt32() )
+#else
+                if( aTemplFileName.Len() && aTemplFileName != aFoundName )
+#endif
                 {
                     // template with given template name was found but with a different filename
                     SfxMedium aSfxMedium( aFoundName, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 20a3289e348a..debe0ed68562 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objmisc.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-26 16:06:18 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,8 +71,10 @@
 #ifndef _SVSTOR_HXX //autogen
 #include <so3/svstor.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifndef _SV_DRAG_HXX //autogen
 #include <vcl/drag.hxx>
@@ -119,6 +121,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/ucb/XContent.hpp>
+#include <svtools/securityoptions.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
@@ -166,7 +169,9 @@ using namespace ::com::sun::star::ucb;
 #include "module.hxx"
 #include "macrconf.hxx"
 #include "docfac.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "ucbhelp.hxx"
 #include "helper.hxx"
 
@@ -1405,7 +1410,11 @@ sal_Bool SfxObjectShell::IsSecure()
     }
 
     INetURLObject aURL( "macro:" );
+#if SUPD<613//MUSTINI
     if ( SFX_APP()->IsSecureURL( aURL, &aReferer ) )
+#else
+    if ( SvtSecurityOptions().IsSecureURL( aURL.GetMainURL(), aReferer ) )
+#endif
     {
         if ( GetMedium()->GetContent().is() )
         {
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 23438e324eda..759d1b3abe41 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objserv.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-17 14:03:54 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,14 +63,18 @@
 #ifndef _URLOBJ_HXX //autogen
 #include <tools/urlobj.hxx>
 #endif
-#ifndef _SFX_INIMGR_HXX //autogen
-#include <inimgr.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFX_INIMGR_HXX //autogen
+    #include <inimgr.hxx>
+    #endif
 #endif
 #ifndef _SFX_WHITER_HXX //autogen
 #include <svtools/whiter.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
+#if SUPD<613//MUSTINI
+    #ifndef _SFXINIMGR_HXX //autogen
+    #include <svtools/iniman.hxx>
+    #endif
 #endif
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
@@ -90,6 +94,8 @@
 #endif
 
 #include <svtools/sbx.hxx>
+#include <svtools/pathoptions.hxx>
+#include <svtools/useroptions.hxx>
 
 #pragma hdrstop
 
@@ -319,7 +325,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, FALSE);
                 if ( pWarnItem && pWarnItem->GetValue() )
                 {
+#if SUPD<613//MUSTINI
                     INetURLObject aObj( SFX_INIMANAGER()->Get(SFX_KEY_WORK_PATH), INET_PROT_FILE );
+#else
+                    INetURLObject aObj( SvtPathOptions().GetWorkPath(), INET_PROT_FILE );
+#endif
                     aObj.insertName( GetTitle(), false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
                     const SfxFilter* pFilter = GetFactory().GetFilter(0);
                     String aExtension( pFilter->GetDefaultExtension().Copy(2) );
@@ -750,7 +760,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 SfxDocumentInfo *pInfo = new SfxDocumentInfo;
                 pInfo->CopyUserData(GetDocInfo());
                 pInfo->SetTitle( aTemplateName );
+#if SUPD<613//MUSTINI
                 pInfo->SetChanged( SfxStamp(SFX_INIMANAGER()->GetUserFullName()));
+#else
+                pInfo->SetChanged( SfxStamp(SvtUserOptions().GetFullName()));
+#endif
                 SvStorageRef aRef = aMedium.GetStorage();
                 if ( aRef.Is() )
                 {
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 17e16baa2749..2b31383ae08a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objstor.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:23:21 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,11 +115,15 @@
 #endif
 
 #include <svtools/saveopt.hxx>
+#include <svtools/useroptions.hxx>
+#include <svtools/pathoptions.hxx>
 #include <tools/urlobj.hxx>
 
 #include "objsh.hxx"
 #include "childwin.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxdir.hxx"
 #include "request.hxx"
 #include "sfxresid.hxx"
@@ -745,7 +749,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl
             if ( pAuthorItem )
                 aAuthor = pAuthorItem->GetValue();
             else
+#if SUPD<613//MUSTINI
                 aAuthor = SFX_INIMANAGER()->GetUserFullName();
+#else
+                aAuthor = SvtUserOptions().GetFullName();
+#endif
 
             aInfo.aCreateStamp.SetName( aAuthor );
 
@@ -1453,7 +1461,11 @@ sal_Bool SfxObjectShell::SaveAs_Impl(sal_Bool bUrl, SfxRequest *pRequest)
                         String aPath( aLastName );
 
                         bool bWasAbsolute = FALSE;
+#if SUPD<613//MUSTINI
                         INetURLObject aObj( SFX_INIMANAGER()->Get( SFX_KEY_WORK_PATH ) );
+#else
+                        INetURLObject aObj( SvtPathOptions().GetWorkPath() );
+#endif
                         aObj.smartRel2Abs( aPath, bWasAbsolute );
 
                         aObj.SetExtension( pFilt->GetDefaultExtension().Copy(2) );
@@ -1476,7 +1488,11 @@ sal_Bool SfxObjectShell::SaveAs_Impl(sal_Bool bUrl, SfxRequest *pRequest)
             }
             else
             {
+#if SUPD<613//MUSTINI
                 pDlg->SetSmartPath( SFX_INIMANAGER()->Get(SFX_KEY_WORK_PATH) );
+#else
+                pDlg->SetSmartPath( SvtPathOptions().GetWorkPath() );
+#endif
             }
 
             if ( pDlg->Execute() == RET_CANCEL )
@@ -2010,8 +2026,12 @@ void SfxObjectShell::AddXMLAsZipToTheStorage( SvStorage& rRoot )
             // 1. check if the option is set and unequal 0 or is not set
             String sStr( String::CreateFromAscii( "Add_XML_to_Storage_" ));
             sStr.AppendAscii( pArr->pModuleNm );
+#if SUPD<613//MUSTINI
             String sCfgEntry( SFX_APP()->GetIniManager()->Get(
                                         SFX_GROUP_WORKINGSET_IMPL, sStr ));
+#else
+            String sCfgEntry;
+#endif
             if( sCfgEntry.Len() && 0 != sCfgEntry.ToInt32() )
             {
                 // the flag is set
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index a0f5738ddb24..8e83c16e0816 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objxtor.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-20 17:12:47 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,10 +87,11 @@
 #ifndef _SBXCLASS_HXX //autogen
 #include <svtools/sbx.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
-
+#endif
 #include "objsh.hxx"
 
 #ifndef _BASIC_SBUNO_HXX
@@ -105,6 +106,7 @@
 #endif
 
 #include <svtools/urihelper.hxx>
+#include <svtools/pathoptions.hxx>
 
 #include "picklist.hxx"
 #include "docfac.hxx"
@@ -607,8 +609,12 @@ void SfxObjectShell::InitBasicManager_Impl
 
         // load BASIC-manager
         SfxErrorContext aErrContext( ERRCTX_SFX_LOADBASIC, GetTitle() );
+#if SUPD<613//MUSTINI
         SfxIniManager *pIniMgr = SFX_APP()->GetIniManager();
         String aAppBasicDir( pIniMgr->Get(SFX_KEY_BASIC_PATH) );
+#else
+        String aAppBasicDir = SvtPathOptions().GetBasicPath();
+#endif
         pImp->pBasicMgr = new SfxBasicManager( *pStor, pAppBasic, &aAppBasicDir );
         if ( pImp->pBasicMgr->HasErrors() )
         {
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 5f6141d697cd..253c73dfc552 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: workwin.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:35 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,7 @@
 #include "shell.hxx"
 #include "minarray.hxx"
 #include "ctrlitem.hxx"
+#include "stbmgr.hxx"
 
 class SfxToolBoxManager;
 class SfxInPlaceEnv_Impl;
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 34794d03cac2..6762fe0543b9 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mnumgr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:35 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,7 @@
 
 #define _SVSTDARR_USHORTS
 #include <svtools/svstdarr.hxx>
+#include <svtools/menuoptions.hxx>
 
 #include "virtmenu.hxx"
 #include "msg.hxx"
@@ -91,8 +92,9 @@
 #include "msgpool.hxx"
 
 // SFX_INIMANAGER()
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
-
+#endif
 #include "sfx.hrc"
 #include "menu.hrc"
 
@@ -108,8 +110,15 @@ DECL_PTRSTACK(SfxMenuCfgItemArrStack, SfxMenuCfgItemArr*, 4, 4 );
 void TryToHideDisabledEntries_Impl( Menu* pMenu )
 {
     DBG_ASSERT( pMenu, "invalid menu" );
+#if SUPD<613//MUSTINI
     if ( !SFX_INIMANAGER()->IsDontHideDisabledEntries() )
         pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
+#else
+    if( SvtMenuOptions().IsEntryHidingEnabled() == sal_False )
+    {
+        pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
+    }
+#endif
 }
 
 //-------------------------------------------------------------------------
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 3aee8aa62bcc..2684b188e8d7 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: virtmenu.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-30 11:58:19 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,6 +61,7 @@
 
 #include <sot/factory.hxx>
 #include <vcl/system.hxx>
+#include <svtools/menuoptions.hxx>
 #pragma hdrstop
 
 #include "virtmenu.hxx"
@@ -560,8 +561,12 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 
     if ( pMenu )
     {
+#if SUPD<613//MUSTINI
         sal_Bool bDontHide = (sal_Bool)(sal_uInt16)
             SFX_INIMANAGER()->Get( SFX_KEY_DONTHIDE_DISABLEDENTRIES ).ToInt32();
+#else
+        sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
+#endif
         sal_uInt16 nFlag = pMenu->GetMenuFlags();
         if ( bDontHide )
             nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 0bab406ceaeb..dfc34701195b 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sfxbasecontroller.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-30 14:30:14 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -515,8 +515,11 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(   const   UNOU
                 SfxChildWindow* pChildWin = pFrame->GetChildWindow( SID_PARTWIN );
                 REFERENCE < XFRAME > xFrame( pChildWin->GetFrame() );
                 if ( xFrame.is() )
+                {
                     xFrame->setName( sTargetFrameName );
 
+                }
+
                 REFERENCE < XDISPATCHPROVIDER > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY );
                 if ( xProv.is() )
                     return xProv->queryDispatch( aURL, sTargetFrameName, ::com::sun::star::frame::FrameSearchFlag::SELF );
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index 30cb26c86903..2330e8409258 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: topfrm.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:23:23 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -408,7 +408,11 @@ MenuBar* SfxTopFrame::GetMenuBar_Impl() const
 String SfxTopFrame::GetWindowData()
 {
     String aActWinData;
+#if SUPD<613//MUSTINI
     char cToken = SfxIniManager::GetToken();
+#else
+    char cToken = ',';
+#endif
 
     SfxViewFrame *pActFrame = SfxViewFrame::Current();
     SfxViewFrame *pFrame = GetCurrentViewFrame();
@@ -425,8 +429,9 @@ String SfxTopFrame::GetWindowData()
 
     aWinData += '1';                    // former attribute "isfloating"
     aWinData += cToken;
-
+#if SUPD<613//MUSTINI
     aWinData += SfxIniManager::GetString( pImp->pWindow->GetPosPixel(), pImp->pWindow->GetSizePixel() );
+#endif
 
     // aktives kennzeichnen
     aWinData += cToken;
@@ -989,8 +994,10 @@ void SfxTopViewFrame::GetState_Impl( SfxItemSet &rSet )
 void SfxTopViewFrame::INetExecute_Impl( SfxRequest &rRequest )
 {
     sal_uInt16 nSlotId = rRequest.GetSlot();
+#if SUPD<613//MUSTINI
     SfxApplication* pApp = SFX_APP();
     SfxIniManager*  pIniMgr  = pApp->GetIniManager();
+#endif
 
     switch( nSlotId )
     {
@@ -1009,7 +1016,11 @@ void SfxTopViewFrame::INetExecute_Impl( SfxRequest &rRequest )
         case SID_BROWSE_HOME:
         {
             // Anzeige Homepage
+#if SUPD<613//MUSTINI
             String aHome = pIniMgr->Get( SFX_KEY_INET_HOME );
+#else
+            String aHome;
+#endif
             if( aHome.Len() )
             {
                 SfxStringItem aUrl( SID_FILE_NAME,
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5f61864e1ce9..5052727f7ee1 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewfrm.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-23 12:04:49 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,6 +64,11 @@
 #ifndef _IPENV_HXX //autogen
 #include <so3/ipenv.hxx>
 #endif
+#ifdef ENABLE_INIMANAGER//MUSTINI
+    #ifndef _SFXINIMGR_HXX
+    #include <svtools/iniman.hxx>
+    #endif
+#endif
 #ifndef _SPLITWIN_HXX //autogen
 #include <vcl/splitwin.hxx>
 #endif
@@ -489,8 +494,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                         pMed->Close();
                         pMed->GetItemSet()->ClearItem( SID_DOC_READONLY );
                         pMed->SetOpenMode( nOpenMode, pMed->IsDirect() );
-                        if ( nOpenMode == SFX_STREAM_READONLY )
-                            pMed->CheckOpenMode_Impl(sal_False,sal_True);
+//AS                        if ( nOpenMode == SFX_STREAM_READONLY )
+//AS                            pMed->CheckOpenMode_Impl(sal_False,sal_True);
                         pMed->ReOpen();
                         if ( !pMed->GetErrorCode() )
                             bOK = sal_True;
@@ -2023,6 +2028,7 @@ void SfxViewFrame::HideStatusText()
 
 
 //--------------------------------------------------------------------
+#ifdef ENABLE_INIMANAGER//MUSTINI
 SfxIniManager* SfxViewFrame::GetIniManager() const
 {
 /*  SfxIniManager *pIniMgr = GetObjectShell()
@@ -2032,6 +2038,7 @@ SfxIniManager* SfxViewFrame::GetIniManager() const
         return SFX_APP()->GetAppIniManager();
 //  return pIniMgr;
 }
+#endif
 
 //--------------------------------------------------------------------
 void SfxViewFrame::DoAdjustPosSizePixel //! teilen in Inner.../Outer...
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 6e401cb7542b..8cd1857ec63c 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewprn.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:37 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,9 +81,11 @@
 #include <svtools/prnsetup.hxx>
 #endif
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
 #ifndef _SFXFLAGITEM_HXX //autogen
 #include <svtools/flagitem.hxx>
 #endif
@@ -96,6 +98,10 @@
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
+#ifndef _SFXAPP_HXX
+#include <sfx2/app.hxx>
+#endif
+#include <svtools/useroptions.hxx>
 #pragma hdrstop
 
 #include "viewsh.hxx"
@@ -105,7 +111,9 @@
 #include "sfxresid.hxx"
 #include "request.hxx"
 #include "objsh.hxx"
+#if SUPD<613//MUSTINI
 #include "inimgr.hxx"
+#endif
 #include "sfxtypes.hxx"
 #include "docinf.hxx"
 #include "event.hxx"
@@ -654,8 +662,12 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
         // unter Windows mu\s das so, weil sonst kein Querdruck funkt,
         // unter OS/2 sollte man das nutzen - Apps kommen aber nicht klar
         // WP: 07.12.95: SV macht das jetzt richtig
+#if SUPD<613//MUSTINI
         SfxIniManager *pIniMgr = SFX_INIMANAGER();
         String aPages( pIniMgr->Get(SFX_KEY_PAGEQUEUESIZE) );
+#else
+        String aPages;
+#endif
         pPrinter->SetPageQueueSize( aPages.Len() ? (int) aPages.ToInt32() : 1 );
 
 #ifdef OS2
@@ -672,7 +684,11 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
         SfxStamp aOldStamp = pInfo->GetPrinted();
         // Abfrage, ob die Benutzerdaten
         // f"ur die Eigenschaften verwendet werden sollen
+#if SUPD<613//MUSTINI
         String aUserName = pIniMgr->GetUserFullName();
+#else
+        String aUserName = SvtUserOptions().GetFullName();
+#endif
 
         if ( !pInfo->IsUseUserData() )
             aUserName.Erase();
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 2531c35ab488..8e9f226e703d 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewsh.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2000-10-31 18:26:18 $
+ *  last change: $Author: as $ $Date: 2000-11-08 14:25:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,11 @@
 #ifndef _SFX_WHITER_HXX //autogen
 #include <svtools/whiter.hxx>
 #endif
+#if SUPD<613//MUSTINI
 #ifndef _SFXINIMGR_HXX //autogen
 #include <svtools/iniman.hxx>
 #endif
+#endif
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
@@ -94,6 +96,7 @@
 #endif
 
 #include <tools/urlobj.hxx>
+#include <svtools/pathoptions.hxx>
 
 #pragma hdrstop
 
@@ -543,7 +546,11 @@ void SfxViewShell::Activate( BOOL bMDI )
             INetURLObject::SetBaseURL( pSh->GetBaseURL() );
         else
         {
+#if SUPD<613//MUSTINI
             INetURLObject aObject( SFX_INIMANAGER()->Get( SFX_KEY_WORK_PATH ), INET_PROT_FILE );
+#else
+            INetURLObject aObject( SvtPathOptions().GetWorkPath(), INET_PROT_FILE );
+#endif
             aObject.setFinalSlash();
             INetURLObject::SetBaseURL( aObject.GetMainURL() );
         }
@@ -1385,14 +1392,19 @@ void SfxViewShell::CheckIPClient_Impl( SvInPlaceClient *pIPClient,
 {
     if ( GetObjectShell()->IsInClose() )
         return;
-
+#if SUPD<613//MUSTINI
     SfxIniManager* pIniMgr = SFX_INIMANAGER();
     BOOL bApplets = pIniMgr->IsAppletsEnabled();
+#else
+    BOOL bApplets = sal_False;
+#endif
     BOOL bActive = pIPClient->IsInPlaceActive();
     BOOL bPlugIn = FALSE;
+#if SUPD<613//MUSTINI
 #ifdef SOLAR_PLUGIN
     bPlugIn = Application::IsRemoteServer() ? FALSE : (USHORT)pIniMgr->Get( SFX_KEY_INET_EXE_PLUGIN ).ToInt32();
 #endif
+#endif
 
     SvAppletObjectRef aAppRef = pIPClient->GetIPObj();
     SvPlugInObjectRef aPlugRef = pIPClient->GetIPObj();