chg: now uses the new config items

3 files changed, 65 insertions, 72 deletions

diff --git a/svx/source/dialog/hldocntp.cxx b/svx/source/dialog/hldocntp.cxx
index 7d52cf667194..b88706d151d7 100644
--- a/svx/source/dialog/hldocntp.cxx
+++ b/svx/source/dialog/hldocntp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hldocntp.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:08 $
+ *  last change: $Author: pb $ $Date: 2000-09-26 09:29:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,7 @@
  *
  ************************************************************************/
 
+#include "hldocntp.hxx"
 
 #ifndef _SFXVIEWFRM_HXX
 #include <sfx2/viewfrm.hxx>
@@ -66,56 +67,46 @@
 #ifndef _SFX_OBJFAC_HXX
 #include <sfx2/docfac.hxx>
 #endif
-
 #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
 #include <com/sun/star/uno/Reference.h>
 #endif
-
 #ifndef _UCBHELPER_CONTENTBROKER_HXX
 #include <ucbhelper/contentbroker.hxx>
 #endif
-
 #ifndef _UCBHELPER_CONTENT_HXX
 #include <ucbhelper/content.hxx>
 #endif
-
 #ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #endif
-
 #ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
 #include <com/sun/star/uno/Sequence.h>
 #endif
-
 #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
 #endif
-
 #ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #endif
-
 #ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP_
 #include <com/sun/star/uno/Exception.hpp>
 #endif
-
 #ifndef _SV_CONFIG_HXX
 #include <vcl/config.hxx>
 #endif
-
 #ifndef _SV_SYSTEM_HXX
 #include <vcl/system.hxx>
 #endif
-
 #ifndef _SV_IMAGE_HXX
 #include <vcl/image.hxx>
 #endif
-
 #ifndef _URLOBJ_HXX
 #include <tools/urlobj.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
 
-#include "hldocntp.hxx"
 #include "hyperdlg.hrc"
 
 using namespace ::rtl;
@@ -205,7 +196,8 @@ void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, Str
 
     // read URL
     rURL = aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_URL_TAG) ), RTL_TEXTENCODING_ASCII_US );
-    rURL = SFX_INIMANAGER()->SubstPathVars( rURL );
+    SvtPathOptions aPathOpt;
+    rURL = aPathOpt.SubstituteVariable( rURL );
 
     // read target
     if ( pShowAsFolder )
@@ -219,7 +211,7 @@ void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, Str
     rIconId = aStrIconId.ToInt32();
 
     // read title
-    String aLangStr = SfxIniManager::Get()->SubstPathVars( String::CreateFromAscii( "$(vlang)" ) );
+    String aLangStr = aPathOpt.SubstituteVariable( DEFINE_CONST_UNICODE("$(vlang)") );
     ByteString aLang( aLangStr, RTL_TEXTENCODING_UTF8 );
     ByteString aGroup = INTERNETSHORTCUT_ID_TAG;
     ( ( aGroup += '-' ) += aLang ) += ".W";
@@ -230,10 +222,8 @@ void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, Str
 void SvxHyperlinkNewDocTp::FillDocumentList ()
 {
     EnterWait();
-
-    SfxIniManager* pIni = SFX_APP()->GetIniManager();
-    String aStrDirName( pIni->Get( SFX_KEY_NEW_DIR ) );
-
+    SvtPathOptions aPathOpt;
+    String aStrDirName( aPathOpt.GetNewMenuPath() );
     INetURLObject aFolderObj( aStrDirName, INET_PROT_FILE );
     try
     {
@@ -278,7 +268,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList ()
                         sal_Char const sTilde[] = "~";
                         aTitle.Erase ( aTitle.SearchAscii( sTilde ), 1 );
 
-                        aURL = pIni->SubstPathVars( aURL );
+                        aURL = aPathOpt.SubstituteVariable( aURL );
 
                         if( !bShowAsFolder )
                         {
@@ -349,7 +339,7 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( String& aStrURL, String& aStrName
     if( aURL.getFSysPath( INetURLObject::FSYS_DETECT ).Len() - aURL.getName().Len() <= 1 ||
         aURL.getFSysPath( INetURLObject::FSYS_DETECT ).Search( '.' ) == 0 )
     {
-        INetURLObject aTmpURL( SFX_APP()->GetIniManager()->Get( SFX_KEY_WORK_PATH ), INET_PROT_FILE );
+        INetURLObject aTmpURL( SvtPathOptions().GetWorkPath(), INET_PROT_FILE );
         if( !aTmpURL.hasFinalSlash() )
             aTmpURL.setFinalSlash();
         aTmpURL.Append( aURL.getName() );
@@ -505,7 +495,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
     if( aURL.getFSysPath( INetURLObject::FSYS_DETECT ).Len() - aURL.getName().Len() <= 1 ||
         aURL.getFSysPath( INetURLObject::FSYS_DETECT ).Search( '.' ) == 0 )
     {
-        INetURLObject aTmpURL( SFX_APP()->GetIniManager()->Get( SFX_KEY_WORK_PATH ), INET_PROT_FILE );
+        INetURLObject aTmpURL( SvtPathOptions().GetWorkPath(), INET_PROT_FILE );
         if( !aTmpURL.hasFinalSlash() )
             aTmpURL.setFinalSlash();
         aTmpURL.Append( aURL.getName() );
@@ -622,9 +612,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
     String aStrName = GetName ( maEdPath.GetText() );
 
     if ( aStrPath == aEmptyStr )
-    {
-        aStrPath = SFX_APP()->GetIniManager()->Get( SFX_KEY_WORK_PATH  );
-    }
+        aStrPath = SvtPathOptions().GetWorkPath();
 
     aDlg.SetPath ( aStrPath );
 
diff --git a/svx/source/dialog/hlinettp.cxx b/svx/source/dialog/hlinettp.cxx
index f0877dc8fb04..8cf1d218962e 100644
--- a/svx/source/dialog/hlinettp.cxx
+++ b/svx/source/dialog/hlinettp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hlinettp.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:08 $
+ *  last change: $Author: pb $ $Date: 2000-09-26 09:27:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,12 @@
 #ifndef _ADRPARSE_HXX
 #include <svtools/adrparse.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_USEROPTIONS_HXX
+#include <svtools/useroptions.hxx>
+#endif
 
 #include "hlinettp.hxx"
 #include "hyperdlg.hrc"
@@ -118,7 +124,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
     maCbbTarget.SetHelpId( HID_HYPERDLG_INET_PATH );
 
     // Find Path to Std-Doc
-    String aStrBasePaths( SFX_APP()->GetIniManager()->Get( SFX_KEY_TEMPLATE_PATH ) );
+    String aStrBasePaths( SvtPathOptions().GetTemplatePath() );
     BOOL bFound = FALSE;
     String aStrFilename;
     DirEntry aFileEntry;
@@ -291,9 +297,8 @@ void SvxHyperlinkInternetTp::FillDlgFields ( String& aStrURL )
             maFtPassword.Disable ();
 
             maEdLogin.SetText ( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( sAnonymous ) ) );
-            SvAddressParser aAddress(SFX_INIMANAGER()->GetAddressToken(ADDRESS_EMAIL));
-            maEdPassword.SetText ( aAddress.Count() ?
-                                   aAddress.GetEmailAddress(0) : String() );
+            SvAddressParser aAddress( SvtUserOptions().GetEmail() );
+            maEdPassword.SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : String() );
         }
         else
         {
@@ -812,9 +817,9 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, void *, EMPTYARG )
     // disable login-editfields if checked
     if ( maCbAnonymous.IsChecked() )
     {
-        SvAddressParser aAddress(SFX_INIMANAGER()->GetAddressToken(ADDRESS_EMAIL));
-        maEdLogin.SetText ( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM ( sAnonymous ) ) );
-        maEdPassword.SetText ( aAddress.Count() ? aAddress.GetEmailAddress(0) : String() );
+        SvAddressParser aAddress( SvtUserOptions().GetEmail() );
+        maEdLogin.SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM ( sAnonymous ) ) );
+        maEdPassword.SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : String() );
 
         maFtLogin.Disable ();
         maFtPassword.Disable ();
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 41d7200dd7d9..72f616ca70b9 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imapdlg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:09 $
+ *  last change: $Author: pb $ $Date: 2000-09-26 09:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,8 +91,8 @@
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
 #endif
 #ifndef _SFXDISPATCH_HXX
 #include <sfx2/dispatch.hxx>
@@ -281,8 +281,8 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *pBindings, SfxChildWindow *pCW,
     SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
 
     aStbStatus.InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE );
-    aStbStatus.InsertItem( 2, 10 + GetTextWidth( String::CreateFromAscii( " 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN );
-    aStbStatus.InsertItem( 3, 10 + GetTextWidth( String::CreateFromAscii( " 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN );
+    aStbStatus.InsertItem( 2, 10 + GetTextWidth( DEFINE_CONST_UNICODE( " 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN );
+    aStbStatus.InsertItem( 3, 10 + GetTextWidth( DEFINE_CONST_UNICODE( " 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN );
 
     aFtURL.Disable();
     aCbbURL.Disable();
@@ -638,23 +638,23 @@ void SvxIMapDlg::DoOpen()
 {
     SfxSimpleFileDialog aDlg( this, WB_3DLOOK | WB_OPEN );
     ImageMap        aLoadIMap;
-    const String    aFilter( String::CreateFromAscii( IMAP_ALL_FILTER ) );
+    const String    aFilter( DEFINE_CONST_UNICODE( IMAP_ALL_FILTER ) );
 
 #ifdef MAC
-    aDlg.AddFilter( aFilter, String::CreateFromAscii( IMAP_ALL_TYPE ), "XXXX0" );
-    aDlg.AddFilter( String::CreateFromAscii( IMAP_CERN_FILTER ), String::CreateFromAscii( IMAP_CERN_TYPE ), "XXXX0" );
-    aDlg.AddFilter( String::CreateFromAscii( IMAP_NCSA_FILTER ), String::CreateFromAscii( IMAP_NCSA_TYPE ), "XXXX0" );
-    aDlg.AddFilter( String::CreateFromAscii( IMAP_BINARY_FILTER ), String::CreateFromAscii( IMAP_BINARY_TYPE ), "XXXX0" );
+    aDlg.AddFilter( aFilter, DEFINE_CONST_UNICODE( IMAP_ALL_TYPE ), "XXXX0" );
+    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_CERN_FILTER ), DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ), "XXXX0" );
+    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ), DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ), "XXXX0" );
+    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_BINARY_FILTER ), DEFINE_CONST_UNICODE( IMAP_BINARY_TYPE ), "XXXX0" );
 #else
-    aDlg.AddFilter( aFilter, String::CreateFromAscii( IMAP_ALL_TYPE ) );
-    aDlg.AddFilter( String::CreateFromAscii( IMAP_CERN_FILTER ), String::CreateFromAscii( IMAP_CERN_TYPE ) );
-    aDlg.AddFilter( String::CreateFromAscii( IMAP_NCSA_FILTER ), String::CreateFromAscii( IMAP_NCSA_TYPE ) );
-    aDlg.AddFilter( String::CreateFromAscii( IMAP_BINARY_FILTER ), String::CreateFromAscii( IMAP_BINARY_TYPE ) );
+    aDlg.AddFilter( aFilter, DEFINE_CONST_UNICODE( IMAP_ALL_TYPE ) );
+    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_CERN_FILTER ), DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) );
+    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ), DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) );
+    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_BINARY_FILTER ), DEFINE_CONST_UNICODE( IMAP_BINARY_TYPE ) );
 #endif
 
     aDlg.SetCurFilter( aFilter );
-    aDlg.SetPath( SFX_INIMANAGER()->Get( SFX_KEY_GRAPHICS_PATH ) );
-    aDlg.SetDefaultExt( String::CreateFromAscii( IMAP_BINARY_EXT ) );
+    aDlg.SetPath( SvtPathOptions().GetGraphicPath() );
+    aDlg.SetDefaultExt( DEFINE_CONST_UNICODE( IMAP_BINARY_EXT ) );
 
     if ( aDlg.Execute() == RET_OK )
     {
@@ -684,26 +684,26 @@ void SvxIMapDlg::DoOpen()
 BOOL SvxIMapDlg::DoSave()
 {
     SfxSimpleFileDialog     aDlg( this, WB_3DLOOK | WB_SAVEAS );
-    const String    aBinFilter( String::CreateFromAscii( IMAP_BINARY_FILTER ) );
-    const String    aCERNFilter( String::CreateFromAscii( IMAP_CERN_FILTER ) );
-    const String    aNCSAFilter( String::CreateFromAscii( IMAP_NCSA_FILTER ) );
+    const String    aBinFilter( DEFINE_CONST_UNICODE( IMAP_BINARY_FILTER ) );
+    const String    aCERNFilter( DEFINE_CONST_UNICODE( IMAP_CERN_FILTER ) );
+    const String    aNCSAFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ) );
     SdrModel*       pModel = pIMapWnd->GetSdrModel();
     const BOOL      bChanged = pModel->IsChanged();
     BOOL            bRet;
 
 #ifdef MAC
-    aDlg.AddFilter( aCERNFilter, String::CreateFromAscii( IMAP_CERN_TYPE ), "XXXX0" );
-    aDlg.AddFilter( aNCSAFilter, String::CreateFromAscii( IMAP_NCSA_TYPE ), "XXXX0" );
-    aDlg.AddFilter( aBinFilter, String::CreateFromAscii( IMAP_BINARY_TYPE ), "XXXX0" );
+    aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ), "XXXX0" );
+    aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ), "XXXX0" );
+    aDlg.AddFilter( aBinFilter, DEFINE_CONST_UNICODE( IMAP_BINARY_TYPE ), "XXXX0" );
 #else
-    aDlg.AddFilter( aCERNFilter, String::CreateFromAscii( IMAP_CERN_TYPE ) );
-    aDlg.AddFilter( aNCSAFilter, String::CreateFromAscii( IMAP_NCSA_TYPE ) );
-    aDlg.AddFilter( aBinFilter, String::CreateFromAscii( IMAP_BINARY_TYPE ) );
+    aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) );
+    aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) );
+    aDlg.AddFilter( aBinFilter, DEFINE_CONST_UNICODE( IMAP_BINARY_TYPE ) );
 #endif
 
     aDlg.SetCurFilter( aCERNFilter );
-    aDlg.SetPath( SFX_INIMANAGER()->Get( SFX_KEY_GRAPHICS_PATH ) );
-    aDlg.SetDefaultExt( String::CreateFromAscii( IMAP_BINARY_EXT ) );
+    aDlg.SetPath( SvtPathOptions().GetGraphicPath() );
+    aDlg.SetDefaultExt( DEFINE_CONST_UNICODE( IMAP_BINARY_EXT ) );
 
     if( aDlg.Execute() == RET_OK )
     {
@@ -715,17 +715,17 @@ BOOL SvxIMapDlg::DoSave()
         if ( aFilter == aBinFilter )
         {
             nFormat = IMAP_FORMAT_BIN;
-            aExt = String::CreateFromAscii( IMAP_BINARY_EXT );
+            aExt = DEFINE_CONST_UNICODE( IMAP_BINARY_EXT );
         }
         else if ( aFilter == aCERNFilter )
         {
             nFormat = IMAP_FORMAT_CERN;
-            aExt = String::CreateFromAscii( IMAP_CERN_EXT );
+            aExt = DEFINE_CONST_UNICODE( IMAP_CERN_EXT );
         }
         else if ( aFilter == aNCSAFilter )
         {
             nFormat = IMAP_FORMAT_NCSA;
-            aExt = String::CreateFromAscii( IMAP_NCSA_EXT );
+            aExt = DEFINE_CONST_UNICODE( IMAP_NCSA_EXT );
         }
 
         INetURLObject aURL;
@@ -781,7 +781,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
         aEdtText.SetText( rInfo.aMarkDescription );
 
         if ( !rInfo.aMarkTarget.Len() )
-            pOwnData->pCbbTarget->SetText( String::CreateFromAscii( SELF_TARGET ) );
+            pOwnData->pCbbTarget->SetText( DEFINE_CONST_UNICODE( SELF_TARGET ) );
         else
             pOwnData->pCbbTarget->SetText( rInfo.aMarkTarget );
     }
@@ -827,7 +827,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
             aEdtText.SetText( rInfo.aMarkDescription );
 
         if ( !rInfo.aMarkTarget.Len() )
-            pOwnData->pCbbTarget->SetText( String::CreateFromAscii( SELF_TARGET ) );
+            pOwnData->pCbbTarget->SetText( DEFINE_CONST_UNICODE( SELF_TARGET ) );
         else
             pOwnData->pCbbTarget->SetText(  rInfo.aMarkTarget );
     }
@@ -851,7 +851,7 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
     GET_MODULE_FIELDUNIT( eFieldUnit );
 
     aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) );
-    aStr.Append( String::CreateFromAscii( " / " ) );
+    aStr.Append( DEFINE_CONST_UNICODE( " / " ) );
     aStr.Append( GetUnitString( rMousePos.Y(), eFieldUnit, cSep ) );
 
     aStbStatus.SetItemText( 2, aStr );
@@ -875,7 +875,7 @@ IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd )
     GET_MODULE_FIELDUNIT( eFieldUnit );
 
     aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) );
-    aStr.Append( String::CreateFromAscii( " x " ) );
+    aStr.Append( DEFINE_CONST_UNICODE( " x " ) );
     aStr.Append( GetUnitString( rSize.Height(), eFieldUnit, cSep ) );
 
     aStbStatus.SetItemText( 3, aStr );
@@ -927,7 +927,7 @@ IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, p )
     aNewInfo.aMarkDescription = aEdtText.GetText();
 
     if ( !aTargetText.Len() )
-        aNewInfo.aMarkTarget = String::CreateFromAscii( SELF_TARGET );
+        aNewInfo.aMarkTarget = DEFINE_CONST_UNICODE( SELF_TARGET );
     else
         aNewInfo.aMarkTarget = aTargetText;