summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-11-13 09:42:42 +0000
committerjp <jp@openoffice.org>2000-11-13 09:42:42 +0000
commite683b818e0ae25b928712d1b5a1cd48a91f86de3 (patch)
treefd089bdc214515337905023ce8f55b020768df93
parentffdb3bf034e745136cd7da7c28f36645e44c4401 (diff)
must changes: use Search from SvtPathOptions
-rw-r--r--sw/source/filter/html/swhtml.cxx13
-rw-r--r--sw/source/ui/config/uinums.cxx7
-rw-r--r--sw/source/ui/envelp/label1.cxx7
-rw-r--r--sw/source/ui/misc/glosdoc.cxx10
4 files changed, 23 insertions, 14 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 257f2347aef6..d7d46a064e55 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swhtml.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: mib $ $Date: 2000-10-31 09:07:20 $
+ * last change: $Author: jp $ $Date: 2000-11-13 10:42:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,6 +92,9 @@
#ifndef _CTRLTOOL_HXX
#include <svtools/ctrltool.hxx>
#endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
#ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx>
@@ -338,7 +341,8 @@ HTMLReader::HTMLReader()
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".vor") );
#endif
- if( SFX_INIMANAGER()->SearchFile( sTemplate, SFX_KEY_TEMPLATE_PATH ))
+ SvtPathOptions aOpt;
+ if( aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ))
SetTemplateName( sTemplate );
#ifndef PRODUCT
else
@@ -5239,6 +5243,9 @@ void _HTMLAttr::InsertPrev( _HTMLAttr *pPrv )
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.2 2000/10/31 09:07:20 mib
+ #79777#: Oboslete assert removed
+
Revision 1.1.1.1 2000/09/18 17:14:56 hr
initial import
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index bac3644ec831..337732430ec9 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: uinums.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: os $ $Date: 2000-10-12 08:32:44 $
+ * last change: $Author: jp $ $Date: 2000-11-13 10:42:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -184,7 +184,8 @@ void SwBaseNumRules::Init()
pNumRules[i] = 0;
String sNm( sFileName );
- if( SFX_INIMANAGER()->SearchFile( sNm, SFX_KEY_USERCONFIG_PATH ))
+ SvtPathOptions aOpt;
+ if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
{
SfxMedium aStrm( sNm, STREAM_STD_READ, TRUE );
Load( *aStrm.GetInStream() );
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index bfd9d25add64..de71650daadf 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: label1.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: os $ $Date: 2000-10-27 14:29:46 $
+ * last change: $Author: jp $ $Date: 2000-11-13 10:41:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -304,7 +304,8 @@ String lcl_GetLabelsIni()
{
String sRet( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
"labels.ini" )));
- if( !SFX_INIMANAGER()->SearchFile( sRet, SFX_KEY_USERCONFIG_PATH ))
+ SvtPathOptions aOpt;
+ if( !aOpt.SearchFile( sRet, SvtPathOptions::PATH_USERCONFIG ))
{
sRet.Insert( INET_PATH_TOKEN, 0 );
SvtPathOptions aPathOpt;
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 4736af579939..a51fec30a536 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: glosdoc.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: jp $ $Date: 2000-11-06 09:04:00 $
+ * last change: $Author: jp $ $Date: 2000-11-13 10:42:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -116,9 +116,6 @@
#ifndef __RSC //autogen
#include <tools/errinf.hxx>
#endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
-#endif
#ifndef _TOOLS_DEBUG_HXX //autogen
#include <tools/debug.hxx>
#endif
@@ -911,6 +908,9 @@ String SwGlossaries::GetExtension()
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.5 2000/11/06 09:04:00 jp
+ must changes: GlossaryPath -> AutoTextPath
+
Revision 1.4 2000/10/31 10:13:27 kso
Fixed: Typo in XContentAccess::queryContentIdentifierString() - the
second 'i' was missing ( SUPD>611 ).