summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-11-13 09:30:28 +0000
committerjp <jp@openoffice.org>2000-11-13 09:30:28 +0000
commitffdb3bf034e745136cd7da7c28f36645e44c4401 (patch)
treecce1f115e01451c61f3f1ef8223c495014d91238
parent7b2779ca976ea49b70a202a9fe79fa42c056410c (diff)
must changes: use Search from SvtPathOptions
-rw-r--r--sw/source/core/doc/tblafmt.cxx25
1 files changed, 4 insertions, 21 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 1125106d1d97..e7a40405d020 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tblafmt.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jp $ $Date: 2000-10-06 13:06:03 $
+ * last change: $Author: jp $ $Date: 2000-11-13 10:30:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -795,24 +795,6 @@ BOOL SwTableAutoFmt::Save( SvStream& rStream ) const
BOOL b;
rStream << nVal;
rStream.WriteByteString( aName, rStream.GetStreamCharSet() );
- if( USHRT_MAX == nStrResId && 0 != SFX_INIMANAGER()->Get(
- SFX_GROUP_WORKINGSET_IMPL, String::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM("SaveTableAutoFmtNameId" ))).ToInt32())
- {
- // check Name for ResId
- for( USHORT nId = RID_SVXSTR_TBLAFMT_BEGIN;
- RID_SVXSTR_TBLAFMT_END > nId; ++nId )
- {
- String s( SVX_RES( nId ) );
- if( s == aName )
- {
- SwTableAutoFmt* pThis = (SwTableAutoFmt*)this;
- pThis->nStrResId = nId - RID_SVXSTR_TBLAFMT_BEGIN;
- break;
- }
- }
- }
-
rStream << nStrResId;
rStream << ( b = bInclFont );
rStream << ( b = bInclJustify );
@@ -902,7 +884,8 @@ BOOL SwTableAutoFmtTbl::Load()
BOOL bRet = FALSE;
String sNm( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( sAutoTblFmtName )));
- if( SFX_INIMANAGER()->SearchFile( sNm, SFX_KEY_USERCONFIG_PATH ))
+ SvtPathOptions aOpt;
+ if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
{
SfxMedium aStream( sNm, STREAM_STD_READ, TRUE );
bRet = Load( *aStream.GetInStream() );