diff options
| -rw-r--r-- | starmath/source/config.cxx | 10 | ||||
| -rw-r--r-- | starmath/source/document.cxx | 13 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 11 |
3 files changed, 22 insertions, 12 deletions
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx index b7ebeb2dee2f..eba67b9f23cf 100644 --- a/starmath/source/config.cxx +++ b/starmath/source/config.cxx @@ -2,9 +2,9 @@ * * $RCSfile: config.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tl $ $Date: 2000-11-03 13:50:12 $ + * last change: $Author: jp $ $Date: 2000-11-13 11:11:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,6 +70,9 @@ #ifndef _SFXSMPLHINT_HXX //autogen #include <svtools/smplhint.hxx> #endif +#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX +#include <svtools/pathoptions.hxx> +#endif #ifndef _SFX_INIMGR_HXX //autogen #include <sfx2/inimgr.hxx> #endif @@ -196,7 +199,8 @@ void SmConfig::UseDefault() bNoRightSpaces = TRUE; aSymbolFile = C2S(DEFSYMFILE); - SFX_INIMANAGER()->SearchFile( aSymbolFile, SFX_KEY_USERCONFIG_PATH ); + SvtPathOptions aOpt; + aOpt.SearchFile( aSymbolFile, SvtPathOptions::PATH_USERCONFIG ); ePrintSize = PRINT_SIZE_NORMAL; nPrintZoom = 100; diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 0e926b26554b..690760780077 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -2,9 +2,9 @@ * * $RCSfile: document.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-11-08 14:49:23 $ + * last change: $Author: jp $ $Date: 2000-11-13 11:11:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,9 @@ #ifndef _SFXSMPLHINT_HXX //autogen #include <svtools/smplhint.hxx> #endif +#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX +#include <svtools/pathoptions.hxx> +#endif #ifndef _SO_CLSIDS_HXX //autogen #include <so3/clsids.hxx> #endif @@ -265,9 +268,11 @@ void SmDocShell::LoadSymbols() { SmModule *pp = SM_MOD1(); String sURL( pp->GetConfig()->GetSymbolFile() ); - sURL = SFX_INIMANAGER()->SubstPathVars( sURL ); + + SvtPathOptions aOpt; + sURL = aOpt.SubstituteVariable( sURL ); if( !FStatHelper::IsDocument( sURL ) ) - SFX_INIMANAGER()->SearchFile( sURL, SFX_KEY_USERCONFIG_PATH ); + aOpt.SearchFile( sURL, SvtPathOptions::PATH_USERCONFIG ); pp->GetSymSetManager()->Load( sURL ); } diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 65dfdff6b2d8..0ffb6fd7e732 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbmgr.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2000-11-13 08:25:50 $ + * last change: $Author: jp $ $Date: 2000-11-13 11:06:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,9 +121,6 @@ #ifndef _SFXENUMITEM_HXX //autogen #include <svtools/eitem.hxx> #endif -#ifndef _SFXINIMGR_HXX //autogen -#include <svtools/iniman.hxx> -#endif #ifndef _SFX_PRINTER_HXX //autogen #include <sfx2/printer.hxx> #endif @@ -707,9 +704,13 @@ String lcl_FindColumn(const String& sFormatStr,USHORT &nUsedPos, BYTE &nSepara inline String lcl_GetDBInsertMode( String sDBName ) { sDBName.SearchAndReplace( DB_DELIM, '.'); + return aEmptyStr; +#if 0 +//JP 13.11.00: must be change to the new configuration return SFX_APP()->GetIniManager()->Get( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "DataBaseFormatInfo" )), FALSE, FALSE, sDBName ); +#endif } |