diff options
author | jp <jp@openoffice.org> | 2000-11-13 09:55:48 +0000 |
---|---|---|
committer | jp <jp@openoffice.org> | 2000-11-13 09:55:48 +0000 |
commit | 7c481892ea6a7c4f9a4441c89b7ab8fe7b1c7981 (patch) | |
tree | f61f67a3d8b5a8fee873934407f0d88ae4619329 /sw | |
parent | e683b818e0ae25b928712d1b5a1cd48a91f86de3 (diff) |
remove IniManager
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/bastyp/swtypes.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/doc/docbasic.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/doc/docredln.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/ole/ndole.cxx | 11 | ||||
-rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 15 | ||||
-rw-r--r-- | sw/source/filter/html/htmlbas.cxx | 16 | ||||
-rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 7 | ||||
-rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/wrtsh/wrtsh2.cxx | 7 |
10 files changed, 41 insertions, 53 deletions
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx index ff90ba4ab6a0..39deb097effa 100644 --- a/sw/source/core/bastyp/swtypes.cxx +++ b/sw/source/core/bastyp/swtypes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swtypes.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: tl $ $Date: 2000-10-27 11:51:20 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:47:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,9 +78,6 @@ #include <offmgr/osplcfg.hxx> #endif -#ifndef _SFXINIMGR_HXX -#include <svtools/iniman.hxx> -#endif #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> #endif diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index f7e22600613f..beb969303ccb 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docbasic.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:49:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,9 +87,6 @@ #ifndef __SBX_SBXVALUE #include <svtools/sbxvar.hxx> #endif -#ifndef _SFXINIMGR_HXX -#include <svtools/iniman.hxx> -#endif #ifndef _SVCONFIG_HXX #include <svtools/config.hxx> #endif diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index a1b1583d0930..0568d363f37e 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docredln.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:49:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,9 +72,6 @@ #ifndef _SHL_HXX #include <tools/shl.hxx> #endif -#ifndef _SFXINIMGR_HXX //autogen -#include <svtools/iniman.hxx> -#endif #ifndef _SFXAPP_HXX //autogen #include <sfx2/app.hxx> #endif diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 487b9e40fcac..74cded31a87d 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: feshview.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:08:19 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:50:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,9 +94,6 @@ #ifndef _SVDCAPT_HXX //autogen #include <svx/svdocapt.hxx> #endif -#ifndef _SFXINIMGR_HXX //autogen -#include <svtools/iniman.hxx> -#endif #ifndef _SFXAPP_HXX //autogen #include <sfx2/app.hxx> #endif diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 5d168aaf724d..99dcffdda286 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndole.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:08:23 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:51:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,9 +78,6 @@ #ifndef _SFXAPP_HXX //autogen #include <sfx2/app.hxx> #endif -#ifndef _SFXINIMGR_HXX //autogen -#include <svtools/iniman.hxx> -#endif #ifndef _SVXLINKMGR_HXX #include <svx/linkmgr.hxx> #endif @@ -543,11 +540,13 @@ SvInPlaceObjectRef SwOLEObj::GetOleRef() // Init Size besorgen if( !nLRU_InitSize ) { +#if 0 +//JP 13.11.00: must be change to the new configuration! nLRU_InitSize = SFX_APP()->GetIniManager()->Get( SFX_GROUP_WORKINGSET_IMPL, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "MaxOLEObjectsInSWMemory" ))) .ToInt32(); - +#endif if( 20 > nLRU_InitSize ) nLRU_InitSize = 20; } diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 22984425aa58..f5d99fb06360 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fltini.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2000-10-06 13:08:02 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:46:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,9 +83,6 @@ #ifndef _PARHTML_HXX //autogen #include <svtools/parhtml.hxx> #endif -#ifndef _SFXINIMGR_HXX //autogen -#include <svtools/iniman.hxx> -#endif #ifndef _SVSTOR_HXX //autogen #include <so3/svstor.hxx> #endif @@ -508,6 +505,10 @@ BOOL SwReader::CheckPasswd( const String& rPasswd, const Reader& rOptions ) ULONG ReadFilterFlags( const sal_Char* pName, const sal_Char* pAltName ) { +return 0; + +#if 0 +// must be changed to the new configiguration String sName( String::CreateFromAscii( pName )); String aStr( SFX_APP()->GetIniManager()->Get( SFX_GROUP_USER, sName )); // aName suchen @@ -539,6 +540,7 @@ ULONG ReadFilterFlags( const sal_Char* pName, const sal_Char* pAltName ) nVal = aStr.ToInt32(); } return nVal; +#endif } /* */ @@ -1514,6 +1516,9 @@ Color ConvertBrushStyle(const Color& rCol, const Color& rFillCol, BYTE nStyle) /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.2 2000/10/06 13:08:02 jp + should changes: don't use IniManager + Revision 1.1.1.1 2000/09/19 10:59:15 hr initial import diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 371b46911d18..b3fc0fb33233 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlbas.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:55 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:46:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,11 +65,10 @@ #pragma hdrstop -#include "hintids.hxx" - -#ifndef _SFXINIMGR_HXX //autogen -#include <svtools/iniman.hxx> +#ifndef _HINTIDS_HXX +#include <hintids.hxx> #endif + #define _SVSTDARR_STRINGSSORTDTOR #include <svtools/svstdarr.hxx> #ifndef _SBXCLASS_HXX //autogen @@ -397,11 +396,14 @@ void SwHTMLWriter::OutBasicBodyEvents() Source Code Control System - Header - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlbas.cxx,v 1.1.1.1 2000-09-18 17:14:55 hr Exp $ + $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlbas.cxx,v 1.2 2000-11-13 10:46:28 jp Exp $ Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:55 hr + initial import + Revision 1.92 2000/09/18 16:04:43 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 3efb42e2b65a..d01fd31d897d 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olmenu.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tl $ $Date: 2000-10-27 12:21:48 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:53:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,9 +86,6 @@ #include <svx/spldlg.hxx> #endif -#ifndef _SFXINIMGR_HXX -#include <svtools/iniman.hxx> -#endif #ifndef _LINGU_LNGPROPS_HHX_ #include <lingu/lngprops.hxx> #endif diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index eae52ac97bfc..5de064b2918b 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -2,9 +2,9 @@ * * $RCSfile: glosbib.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-11-06 09:19:24 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:54:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,9 +85,6 @@ #ifndef _SV_HELP_HXX #include <vcl/help.hxx> #endif -#ifndef _SFXINIMGR_HXX -#include <svtools/iniman.hxx> -#endif #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> #endif @@ -679,6 +676,9 @@ void SwGlossaryGroupTLB::Clear() Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.3 2000/11/06 09:19:24 jp + must changes: tempfile + Revision 1.2 2000/10/20 14:18:05 os use comphelper methods diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 5b7d284d2b99..baf83e125ed0 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtsh2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-10-16 15:22:37 $ + * last change: $Author: jp $ $Date: 2000-11-13 10:55:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,9 +78,6 @@ #ifndef _SFXDOCINF_HXX //autogen #include <sfx2/docinf.hxx> #endif -#ifndef _SFXINIMGR_HXX //autogen -#include <svtools/iniman.hxx> -#endif #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif |