MUST: SfxOptions removed

13 files changed, 64 insertions, 74 deletions

diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index fe60a8421ac3..0b356a5dbf5c 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appbas.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pb $ $Date: 2000-09-26 11:03:29 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,6 +136,8 @@
 #include <svtools/ehdl.hxx>
 #endif
 
+#include <svtools/undoopt.hxx>
+
 #pragma hdrstop
 
 #include "appuno.hxx"
@@ -155,7 +157,6 @@
 #include "tplpitem.hxx"
 #include "minfitem.hxx"
 #include "app.hrc"
-#include "saveopt.hxx"
 #include "evntconf.hxx"
 #include "macrconf.hxx"
 #include "request.hxx"
@@ -945,7 +946,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
         case SID_ATTR_UNDO_COUNT:
         {
             SFX_REQUEST_ARG(rReq, pCountItem, SfxUInt16Item, nSID, sal_False);
-            GetOptions().SetUndoCount( pCountItem->GetValue() );
+            SvtUndoOptions().SetUndoCount( pCountItem->GetValue() );
             break;
         }
 
@@ -1149,7 +1150,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
                 break;
 
             case SID_ATTR_UNDO_COUNT:
-                rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, GetOptions().GetUndoCount() ) );
+                rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, SvtUndoOptions().GetUndoCount() ) );
                 break;
 
 #if 0
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 299cdc85cba3..8febf524b882 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appcfg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:33:15 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,6 +136,8 @@
 #include <tools/urlobj.hxx>
 #include <tools/wldcrd.hxx>
 #include <svtools/saveopt.hxx>
+#include <svtools/helpopt.hxx>
+#include <svtools/undoopt.hxx>
 
 #include "viewfrm.hxx"
 #include "sfxhelp.hxx"
@@ -143,7 +145,6 @@
 #include "dispatch.hxx"
 #include "objsh.hxx"
 #include "objshimp.hxx"
-#include "saveopt.hxx"
 #include "viewsh.hxx"
 #include "request.hxx"
 #include "evntconf.hxx"
@@ -249,6 +250,8 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 
     const USHORT *pRanges = rSet.GetRanges();
     SvtSaveOptions aSaveOptions;
+    SvtUndoOptions aUndoOptions;
+    SvtHelpOptions aHelpOptions;
     while ( *pRanges )
     {
         for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
@@ -330,34 +333,29 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 //                                pOptions->GetMetric() ) ) )
 //                        bRet = TRUE;
                     break;
-                case SID_DOCMANAGER :
-                    if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_DOCMANAGER ),
-                                 pOptions->GetDocumentManagerConfig() ) ) )
-                        bRet = TRUE;
-                    break;
                 case SID_HELPBALLOONS :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPBALLOONS ),
-                               pOptions->IsHelpBalloons() ) ) )
+                               aHelpOptions.IsExtendedHelp() ) ) )
                         bRet = TRUE;
                     break;
                 case SID_HELPTIPS :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPTIPS ),
-                               pOptions->IsHelpTips() ) ) )
+                               aHelpOptions.IsHelpTips() ) ) )
                         bRet = TRUE;
                     break;
                 case SID_ATTR_AUTOHELPAGENT :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_AUTOHELPAGENT ),
-                               pOptions->IsAutoHelpAgent() ) ) )
+                               aHelpOptions.IsHelpAgentAutoStartMode() ) ) )
                         bRet = TRUE;
                     break;
                 case SID_ATTR_WELCOMESCREEN :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_WELCOMESCREEN ),
-                               pOptions->IsWelcomeScreen() ) ) )
+                               aHelpOptions.IsWelcomeScreen() ) ) )
                         bRet = TRUE;
                     break;
                 case SID_ATTR_UNDO_COUNT :
                     if(rSet.Put( SfxUInt16Item ( rPool.GetWhich( SID_ATTR_UNDO_COUNT ),
-                                 pOptions->GetUndoCount() ) ) )
+                                 aUndoOptions.GetUndoCount() ) ) )
                         bRet = TRUE;
                     break;
                 case SID_INET_HOMEPAGE   :
@@ -752,6 +750,8 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 
     SfxToolBoxConfig *pTbxCfg = SfxToolBoxConfig::GetOrCreate();
     SvtSaveOptions aSaveOptions;
+    SvtUndoOptions aUndoOptions;
+    SvtHelpOptions aHelpOptions;
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), TRUE, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
@@ -853,32 +853,25 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 //        pOptions->SetMetric((FieldUnit)((const SfxUInt16Item*)pItem)->GetValue());
     }
 
-    // Docmanager
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_DOCMANAGER), TRUE, &pItem))
-    {
-        DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
-        pOptions->SetDocumentManagerConfig(((const SfxStringItem *)pItem)->GetValue());
-    }
-
     // HelpBalloons
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPBALLOONS), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        pOptions->SetHelpBalloons(((const SfxBoolItem *)pItem)->GetValue());
+        aHelpOptions.SetExtendedHelp(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // HelpTips
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPTIPS), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        pOptions->SetHelpTips(((const SfxBoolItem *)pItem)->GetValue());
+        aHelpOptions.SetHelpTips(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // AutoHelpAgent
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOHELPAGENT ), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        pOptions->SetAutoHelpAgent( ((const SfxBoolItem *)pItem)->GetValue() );
+        aHelpOptions.SetHelpAgentAutoStartMode( ((const SfxBoolItem *)pItem)->GetValue() );
     }
 
     // AutoHelpAgent-Reset
@@ -895,7 +888,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WELCOMESCREEN ), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        pOptions->SetWelcomeScreen( ((const SfxBoolItem *)pItem)->GetValue() );
+        aHelpOptions.SetWelcomeScreen( ((const SfxBoolItem *)pItem)->GetValue() );
     }
 
     // WelcomeScreen
@@ -933,7 +926,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
         USHORT nUndoCount = ((const SfxUInt16Item*)pItem)->GetValue();
-        pOptions->SetUndoCount( nUndoCount );
+        aUndoOptions.SetUndoCount( nUndoCount );
 
         // um alle Undo-Manager zu erwischen: "uber alle Frames iterieren
         for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst();
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index b4d8c02d6749..5b2b4d5bfa8e 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appinit.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:34:33 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -170,7 +170,9 @@
 #include "picklist.hxx"
 #include "plugobj.hxx"
 #include "progress.hxx"
+#if SUPD<608
 #include "saveopt.hxx"
+#endif
 #include "sfxhelp.hxx"
 #include "sfxresid.hxx"
 #include "sfxtypes.hxx"
@@ -719,7 +721,9 @@ FASTBOOL SfxApplication::Initialize_Impl()
     pAcceleratorMgr = new SfxAcceleratorManager;
 
     pImageMgr = new SfxImageManager;
+#if SUPD<608
     pOptions = new SfxOptions;
+#endif
     SfxNewHdl* pNewHdl = SfxNewHdl::GetOrCreate();
 
     // Die Strings muessen leider zur Laufzeit gehalten werden, da wir bei
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 5008f6c5d1ed..efe3605dc41c 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appmain.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:35:40 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,7 @@
 
 #include <svtools/itempool.hxx>
 #include <svtools/urihelper.hxx>
+#include <svtools/helpopt.hxx>
 
 #include "appimp.hxx"
 #include "sfxtypes.hxx"
@@ -106,7 +107,6 @@
 #include "mnumgr.hxx"
 #include "stbmgr.hxx"
 #include "imgmgr.hxx"
-#include "saveopt.hxx"
 #include "eacopier.hxx"
 #include "appuno.hxx"
 #include "objuno.hxx"
@@ -498,7 +498,7 @@ IMPL_LINK( SfxApplication, StartWelcomeScreenHdl_Impl, void*, EMPTYARG )
     delete pTimer;
     pTimer = NULL;
 
-    if ( GetOptions().IsWelcomeScreen() )
+    if ( SvtHelpOptions().IsWelcomeScreen() )
     {
 /*
         ULONG nId = 0;
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index e11ae745fb6a..8b7dbf8f5d83 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appmisc.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: willem.vandorp $ $Date: 2000-09-29 14:06:01 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,7 +133,6 @@
 #include "intro.hxx"
 #include "about.hxx"
 #include "fcontnr.hxx"
-#include "saveopt.hxx"
 #include "sfxlocal.hrc"
 #include "sfx.hrc"
 #include "app.hrc"
@@ -685,7 +684,7 @@ void SfxApplication::StoreConfig()
 
 {
     // Workingset schreiben?
-//    if ( pOptions->IsSaveWorkingSet() )
+//    if ( SvtOptions().IsSaveWorkingSet() )
 //        SfxTaskManager::SaveWorkingSet();
 //(mba/task): Implementierung fehlt
 
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 4ab250c9f41a..dc510b420b81 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appquit.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:38:27 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,7 +106,6 @@
 #include "imgmgr.hxx"
 #include "templdlg.hxx"
 #include "tbxconf.hxx"
-#include "saveopt.hxx"
 #include "msgpool.hxx"
 #include "frameobj.hxx"
 #include "docfile.hxx"
@@ -313,7 +312,6 @@ void SfxApplication::Deinitialize()
 
     DELETEZ(pInterfaces);
     DELETEZ(pImageMgr);
-    DELETEZ(pOptions);
 
     // free administration managers
     DELETEZ(pImp->pAutoSaveTimer);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index af54d7b59808..300eb1ae4770 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appserv.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-09-26 11:03:29 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,7 +161,6 @@
 #include "minfitem.hxx"
 #include "event.hxx"
 #include "cfgmgr.hxx"
-#include "saveopt.hxx"
 #include "accmgr.hxx"
 #include "mnumgr.hxx"
 #include "intfrm.hxx"
@@ -830,7 +829,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 Help::EnableBalloonHelp();
             else
                 Help::DisableBalloonHelp();
-            GetOptions().SetHelpBalloons(bOn);
+            SvtHelpOptions().SetHelpBalloons(bOn);
             bDone = TRUE;
 
             // ggf. recorden
@@ -853,7 +852,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 Help::EnableQuickHelp();
             else
                 Help::DisableQuickHelp();
-            GetOptions().SetHelpTips(bOn);
+            SvtHelpOptions().SetHelpTips(bOn);
             Invalidate(SID_HELPTIPS);
             bDone = TRUE;
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 1881bd47a7cd..6a6078356299 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sfxhelp.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:39:26 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:34:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,8 +109,6 @@
 #include <automation/automation.hxx>
 #pragma hdrstop
 
-#include <saveopt.hxx>  // Welcome-Screen Optionen
-
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
@@ -120,6 +118,7 @@
 #endif
 
 #include <tools/urlobj.hxx>
+#include <svtools/helpopt.hxx>
 
 #include <helpid.hrc>
 #include <app.hxx>
@@ -1272,7 +1271,7 @@ IMPL_LINK( SfxHelpTipsWindow, CloseButtonHdl, Button*, EMPTYARG )
 
 IMPL_LINK( SfxHelpTipsWindow, CheckBoxHdl, CheckBox*, EMPTYARG )
 {
-    SFX_APP()->GetOptions().SetWelcomeScreen( !maCheckBox.IsChecked() );
+    SvtHelpOptions().SetWelcomeScreen( !maCheckBox.IsChecked() );
     return 0;
 }
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 57c5c7f6e630..9577b470a811 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dispatch.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:29 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:35:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,6 +89,7 @@
 
 #define _SVSTDARR_ULONGS
 #include <svtools/svstdarr.hxx>
+#include <svtools/helpopt.hxx>
 
 #pragma hdrstop
 
@@ -113,7 +114,6 @@
 #include "mnumgr.hxx"
 #include "childwin.hxx"
 #include "docfac.hxx"
-#include "saveopt.hxx"
 #include "ipenv.hxx"
 #include "msgpool.hxx"
 #include "module.hxx"
@@ -361,7 +361,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
                 // Bei neuen/komplizierten Funktionen den HelpAgent feuern...
                 Help* pHelp = Application::GetHelp();
                 if ( pHelp )
-                    ((SfxHelp_Impl*)pHelp)->SlotExecutedOrFocusChanged( rReq.GetSlot(), sal_True, pSfxApp->GetOptions().IsAutoHelpAgent() );
+                    ((SfxHelp_Impl*)pHelp)->SlotExecutedOrFocusChanged( rReq.GetSlot(), sal_True, SvtHelpOptions().IsHelpAgentAutoStartMode() );
 
                 SfxExecFunc pFunc = rSlot.GetExecFnc();
                 rShell.CallExec( pFunc, rReq );
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index f03edd48cc6d..f54eb4891bbd 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: request.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:29 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:35:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,6 @@
 #include "sfxtypes.hxx"
 #include "msg.hxx"
 #include "objsh.hxx"
-#include "saveopt.hxx"
 #include "viewfrm.hxx"
 #include "viewsh.hxx"
 #include "app.hxx"
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index b73b804f5a45..a3d45f0983b9 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shell.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:29 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:35:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,8 @@
 #include <svtools/sbx.hxx>
 #endif
 
+#include <svtools/undoopt.hxx>
+
 #pragma hdrstop
 
 #include "shell.hxx"
@@ -93,7 +95,6 @@
 #include "sfxtypes.hxx"
 #include "request.hxx"
 #include "mnumgr.hxx"
-#include "saveopt.hxx"
 #include "statcach.hxx"
 
 //====================================================================
@@ -546,7 +547,7 @@ void SfxShell::SetUndoManager( SfxUndoManager *pNewUndoMgr )
 {
     pUndoMgr = pNewUndoMgr;
     if ( pUndoMgr )
-        pUndoMgr->SetMaxUndoActionCount( SFX_APP()->GetOptions().GetUndoCount() );
+        pUndoMgr->SetMaxUndoActionCount( SvtUndoOptions().GetUndoCount() );
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index d10bd2df0c84..017f34b0d7b2 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mgetempl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:43:15 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:36:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,6 @@
 #include "sfxtypes.hxx"
 #include "sfxresid.hxx"
 #include "module.hxx"
-#include "saveopt.hxx"
 
 #include "sfx.hrc"
 #include "dialog.hrc"
@@ -370,13 +369,12 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
 {
     SfxApplication* pSfxApp = SFX_APP();
     SfxMapUnit eUnit = SFX_MAPUNIT_CM;
-    FieldUnit eFieldUnit = pSfxApp->GetOptions().GetMetric();
+//    FieldUnit eFieldUnit = pSfxApp->GetOptions().GetMetric();
+    FieldUnit eFieldUnit( FUNIT_CM );
     SfxModule* pModule = pSfxApp->GetActiveModule();
-
     if ( pModule )
     {
         const SfxPoolItem* pItem = pModule->GetItem( SID_ATTR_METRIC );
-
         if ( pItem )
             eFieldUnit = (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue();
     }
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index 0c589eedfc62..4ec8e3b2faab 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docinf.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-09-28 11:44:37 $
+ *  last change: $Author: mba $ $Date: 2000-10-04 17:37:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,7 +74,6 @@
 #include "app.hxx"
 #include "docinf.hxx"
 #include "docfile.hxx"
-#include "saveopt.hxx"
 #include "inimgr.hxx"
 #include "sfxtypes.hxx"