From e2041ab2716e0f387ff6700d04fa6cda84ed443e Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 3 Nov 2000 12:50:12 +0000 Subject: Most SfxIniManager calls removed --- starmath/source/config.cxx | 7 +++---- starmath/source/document.cxx | 8 +++----- starmath/source/symbol.cxx | 7 +++---- 3 files changed, 9 insertions(+), 13 deletions(-) (limited to 'starmath') diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx index 843cc8fae2b8..b7ebeb2dee2f 100644 --- a/starmath/source/config.cxx +++ b/starmath/source/config.cxx @@ -2,9 +2,9 @@ * * $RCSfile: config.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2000-11-02 15:07:16 $ + * last change: $Author: tl $ $Date: 2000-11-03 13:50:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -196,8 +196,7 @@ void SmConfig::UseDefault() bNoRightSpaces = TRUE; aSymbolFile = C2S(DEFSYMFILE); - SfxIniManager* pIniMgr = SFX_INIMANAGER(); - pIniMgr->SearchFile( aSymbolFile, SFX_KEY_USERCONFIG_PATH ); + SFX_INIMANAGER()->SearchFile( aSymbolFile, SFX_KEY_USERCONFIG_PATH ); ePrintSize = PRINT_SIZE_NORMAL; nPrintZoom = 100; diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 130f00126f47..5b46217ccd97 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -2,9 +2,9 @@ * * $RCSfile: document.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:57:26 $ + * last change: $Author: tl $ $Date: 2000-11-03 13:50:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -262,8 +262,6 @@ void SmDocShell::LoadSymbols() { SmModule *pp = SM_MOD1(); String sURL(pp->GetConfig()->GetSymbolFile()); - SfxIniManager* pIniMgr = SFX_INIMANAGER(); - sURL = pIniMgr->SubstPathVars( sURL ); BOOL bExist = FALSE; INetURLObject aURLObj; aURLObj.SetSmartProtocol( INET_PROT_FILE ); @@ -276,7 +274,7 @@ void SmDocShell::LoadSymbols() } catch(...){} if(!bExist) - pIniMgr->SearchFile( sURL, SFX_KEY_USERCONFIG_PATH ); + SFX_INIMANAGER()->SearchFile( sURL, SFX_KEY_USERCONFIG_PATH ); sURL = URIHelper::SmartRelToAbs(sURL); pp->GetSymSetManager()->Load(sURL); diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index 5df7914ae85e..fb1f83950e37 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: symbol.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2000-11-02 15:07:16 $ + * last change: $Author: tl $ $Date: 2000-11-03 13:50:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -579,8 +579,7 @@ void SmSymSetManager::Load(const String &rURL) { ErrorBox aErrorBox( NULL, SmResId( RID_READSYMBOLERROR ) ); String aString( aErrorBox.GetMessText() ); - String aIniFile = SFX_INIMANAGER()->SubstPathVars( aStreamName ); - aString.SearchAndReplaceAscii( "%FILE%", aIniFile ); + aString.SearchAndReplaceAscii( "%FILE%", aStreamName ); aErrorBox.SetMessText( aString ); aErrorBox.Execute(); -- cgit v1.2.3