diff options
author | Joseph Powers <jpowers27@cox.net> | 2011-02-19 08:29:03 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2011-02-19 08:29:03 -0800 |
commit | aefcf32dc048b0de2129c8ad1af0dfea50c4c9bb (patch) | |
tree | cba1a8bd7ef080b606439a1e3272e014c672aac1 | |
parent | Remove DECLARE_LIST( ImplStatusItemList, ImplStatusItem* ) (diff) | |
download | core-aefcf32dc048b0de2129c8ad1af0dfea50c4c9bb.tar.gz core-aefcf32dc048b0de2129c8ad1af0dfea50c4c9bb.zip |
Some more #include <tools/list.hxx> cleanup
I basically removed them for everywhere and then added back in only the
ones required to get it to build.
I did a "make distclean" on Mac and it worked.
47 files changed, 8 insertions, 56 deletions
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index eaf4fc565444..d68984eed564 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -30,7 +30,6 @@ #define _CFG_MERGE_HXX #include <tools/string.hxx> -#include <tools/list.hxx> #include <boost/unordered_map.hpp> #include <vector> diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 9845dab78796..37524ac7fec6 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -35,7 +35,6 @@ #endif #include <tools/string.hxx> -#include <tools/list.hxx> #include <tools/stream.hxx> #include <tools/fsys.hxx> #include <osl/file.hxx> diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx index 16fb7b20fdbb..f905ec627d72 100644 --- a/l10ntools/inc/tagtest.hxx +++ b/l10ntools/inc/tagtest.hxx @@ -30,7 +30,6 @@ #define _TAGTEST_HXX_ #include <tools/string.hxx> -#include <tools/list.hxx> #include <boost/unordered_map.hpp> #include <vector> @@ -242,7 +241,7 @@ public: maList.clear(); } - void insert( TokenInfo p, size_t nIndex = LIST_APPEND ) + void insert( TokenInfo p, size_t nIndex = size_t(-1) ) { if ( nIndex < maList.size() ) { TokenListImpl::iterator it = maList.begin(); diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 1589cf9fa9bb..5a25b3d65959 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -34,7 +34,6 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include "tools/string.hxx" -#include "tools/list.hxx" #define ENABLE_BYTESTRING_STREAM_OPERATORS #include "tools/stream.hxx" #include "tools/isofallback.hxx" diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index 510ccce21c3a..62bd546fb7ac 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -31,7 +31,6 @@ #include <stdio.h> #include <tools/fsys.hxx> #include <tools/stream.hxx> -#include <tools/list.hxx> // local includes #include "tagtest.hxx" diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx index 467541fbb53c..8d191d816eaf 100644 --- a/padmin/source/progress.cxx +++ b/padmin/source/progress.cxx @@ -30,7 +30,6 @@ #include <stdio.h> #include <tools/string.hxx> #include <tools/stream.hxx> -#include <tools/list.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <progress.hxx> diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx index b115c2b4f066..0ae101a0c48d 100644 --- a/rsc/inc/rsclst.hxx +++ b/rsc/inc/rsclst.hxx @@ -29,7 +29,6 @@ #ifndef _RSCLST_HXX #define _RSCLST_HXX -#include <tools/list.hxx> #include <rscall.h> class REResourceList; diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index 7706a0e61b8d..5506412d42f6 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -36,7 +36,6 @@ class RscPtrPtr; #endif #include <stdio.h> #include <tools/string.hxx> -#include <tools/list.hxx> #include <vector> /******************* T y p e s *******************************************/ diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index a6943ea1b0cd..a3fea2ea5172 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -49,6 +49,7 @@ #include <rtl/textcvt.h> #include <rtl/textenc.h> +#include <tools/list.hxx> using namespace rtl; diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx index e899570e85ed..5896dbe5b335 100644 --- a/rsc/source/parser/rscyacc.cxx +++ b/rsc/source/parser/rscyacc.cxx @@ -33,6 +33,7 @@ #include <string.h> #include <tools/rc.h> +#include <tools/list.hxx> #include <rscerror.h> #include <rsctools.hxx> #include <rscclass.hxx> diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index 53df93e0b7c5..6bba925f32f0 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -32,6 +32,7 @@ // Programmuebergreifende Includes. #include <rscdef.hxx> +#include <tools/list.hxx> /****************** C o d e **********************************************/ /****************** R s c I d ********************************************/ diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 8a2337ea5017..c6d75b36f0ef 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -29,7 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sot.hxx" -#include <tools/list.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> #include <tools/rtti.hxx> diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index f1143e8b8a57..9dd4af022a1b 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -60,7 +60,6 @@ #include <unotools/streamwrap.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/localfilehelper.hxx> -#include <tools/list.hxx> #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 24c2c3a6a1c4..695d87e2aa49 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -47,17 +47,8 @@ #include <postwin.h> #include "ddewrap.hxx" -/* -extern "C" -{ -#define BOOL WIN_BOOL -#define BYTE WIN_BYTE -#undef BOOL -#undef BYTE -}; -*/ - #endif + #include <tools/string.hxx> #include <tools/list.hxx> #include <tools/shl.hxx> diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx index 857471948228..b13d2e5c131a 100644 --- a/svtools/inc/ctrltool.hxx +++ b/svtools/inc/ctrltool.hxx @@ -30,9 +30,9 @@ #define _CTRLTOOL_HXX #include "svtools/svtdllapi.h" +#include <tools/list.hxx> #include <sal/types.h> -#include <tools/list.hxx> #include <vcl/metric.hxx> class ImplFontListNameInfo; diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx index 3c80ab060415..129ccf76803f 100644 --- a/svtools/inc/taskbar.hxx +++ b/svtools/inc/taskbar.hxx @@ -31,7 +31,6 @@ #include "svtools/svtdllapi.h" #include <tools/time.hxx> -#include <tools/list.hxx> #include <vcl/timer.hxx> #include <vcl/toolbox.hxx> #include <vcl/status.hxx> diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 3def4aeb8b66..38c233b27699 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -32,7 +32,6 @@ #define _SV_HEADBAR_CXX #include <svtools/headbar.hxx> #include <tools/debug.hxx> -#include <tools/list.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx index 185989c5b68f..8298374fb40b 100644 --- a/svtools/source/control/taskbar.cxx +++ b/svtools/source/control/taskbar.cxx @@ -31,7 +31,6 @@ #define _TASKBAR_CXX -#include <tools/list.hxx> #include <tools/debug.hxx> #include <vcl/floatwin.hxx> diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx index 30bc76dca436..21cf187b6cea 100644 --- a/svtools/source/control/taskbox.cxx +++ b/svtools/source/control/taskbox.cxx @@ -31,7 +31,6 @@ #define _TASKBAR_CXX -#include <tools/list.hxx> #include <tools/debug.hxx> #include <vcl/image.hxx> #include <vcl/help.hxx> diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx index 1e4634a2a1fe..8c367a7d135a 100644 --- a/svtools/source/control/taskmisc.cxx +++ b/svtools/source/control/taskmisc.cxx @@ -31,7 +31,6 @@ #define _TASKBAR_CXX -#include <tools/list.hxx> #include <tools/debug.hxx> #include <vcl/help.hxx> diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index c3f8d4d0bc30..03c5199391a4 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -31,7 +31,6 @@ #define _TASKBAR_CXX -#include <tools/list.hxx> #include <tools/debug.hxx> #include <tools/date.hxx> #include <vcl/image.hxx> diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index f20913941aae..3df14947481f 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <osl/mutex.hxx> -#include <tools/list.hxx> #include <tools/color.hxx> #include <tools/string.hxx> #include <vcl/image.hxx> diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 72fc9f07fc4d..87888d148f53 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include <tools/list.hxx> #include <tools/debug.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx index eb129fc5bca1..df2e3ffaf6a5 100644 --- a/svtools/source/edit/textdat2.hxx +++ b/svtools/source/edit/textdat2.hxx @@ -31,7 +31,6 @@ #define _TEXTDAT2_HXX #include <svl/svarray.hxx> -#include <tools/list.hxx> #include <vcl/seleng.hxx> #include <vcl/virdev.hxx> #include <vcl/cursor.hxx> diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx index ed8919a5cb22..ea7619f3da25 100644 --- a/svtools/source/edit/textdoc.hxx +++ b/svtools/source/edit/textdoc.hxx @@ -35,7 +35,6 @@ #include <tools/debug.hxx> #include <tools/string.hxx> -#include <tools/list.hxx> typedef TextCharAttrib* TextCharAttribPtr; SV_DECL_PTRARR_DEL( TextCharAttribs, TextCharAttribPtr, 0, 4 ) diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index a91ad1e833f3..a2b7593d159b 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -29,7 +29,6 @@ #ifndef _GRFCACHE_HXX #define _GRFCACHE_HXX -#include <tools/list.hxx> #include <vcl/graph.hxx> #include <vcl/timer.hxx> #include <svtools/grfmgr.hxx> diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx index 300536d3951c..2a078fe1a8ba 100644 --- a/toolkit/inc/pch/precompiled_toolkit.hxx +++ b/toolkit/inc/pch/precompiled_toolkit.hxx @@ -303,7 +303,6 @@ #include "tools/diagnose_ex.h" #include "tools/gen.hxx" #include "tools/link.hxx" -#include "tools/list.hxx" #include "tools/poly.hxx" #include "tools/simplerm.hxx" #include "tools/solar.h" diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx index 2393aa0de0b4..322faee119bb 100644 --- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx +++ b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx @@ -41,7 +41,6 @@ #include <toolkit/helper/servicenames.hxx> #include <osl/mutex.hxx> -#include <tools/list.hxx> #include <tools/gen.hxx> #include <vector> diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index c23b91ff6834..40db8aae5b51 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -49,7 +49,6 @@ #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <tools/list.hxx> #include <cppuhelper/typeprovider.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 7344d769fe3e..b67ec421db96 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -44,7 +44,6 @@ #include <comphelper/sequence.hxx> #include <tools/debug.hxx> -#include <tools/list.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index 75a63f7e380a..650f4ade4b58 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -40,7 +40,6 @@ #include "sal/main.h" #include <tools/string.hxx> -#include <tools/list.hxx> #include <tools/fsys.hxx> #include <tools/stream.hxx> diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx index b315df754af0..0178d57c6ef2 100644 --- a/tools/inc/bootstrp/mkcreate.hxx +++ b/tools/inc/bootstrp/mkcreate.hxx @@ -32,7 +32,6 @@ #include <tools/string.hxx> #include "bootstrp/sstring.hxx" -#include <tools/list.hxx> #include "bootstrp/prj.hxx" class SvStream; diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx index 70afc28c6c07..ba63b9a1c8ea 100644 --- a/tools/inc/bootstrp/sstring.hxx +++ b/tools/inc/bootstrp/sstring.hxx @@ -30,7 +30,6 @@ #define _SSTRING_HXX #include <tools/string.hxx> -#include <tools/list.hxx> #include <vector> #define NOT_THERE LIST_ENTRY_NOTFOUND diff --git a/tools/inc/tools/geninfo.hxx b/tools/inc/tools/geninfo.hxx index dfdcee18cb1a..97a6b963cdb0 100644 --- a/tools/inc/tools/geninfo.hxx +++ b/tools/inc/tools/geninfo.hxx @@ -31,7 +31,6 @@ #include "tools/toolsdllapi.h" #include <tools/string.hxx> -#include <tools/list.hxx> #include <vector> // forwards diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index 77d08c5f0818..63af8114ddf8 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -34,7 +34,6 @@ #include <rtl/textenc.h> #include <tools/inetmime.hxx> -#include <tools/list.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx index 6215e959e42f..e077914c8eea 100644 --- a/tools/inc/tools/multisel.hxx +++ b/tools/inc/tools/multisel.hxx @@ -30,7 +30,6 @@ #include "tools/toolsdllapi.h" #include <tools/gen.hxx> -#include <tools/list.hxx> #include <tools/string.hxx> #include <vector> @@ -40,7 +39,7 @@ typedef ::std::vector< Range* > ImpSelList; -#define SFX_ENDOFSELECTION CONTAINER_ENTRY_NOTFOUND +#define SFX_ENDOFSELECTION ULONG_MAX //------------------------------------------------------------------ diff --git a/tools/source/fsys/comdep.cxx b/tools/source/fsys/comdep.cxx index b1dd7342ed27..1904e39132ba 100644 --- a/tools/source/fsys/comdep.cxx +++ b/tools/source/fsys/comdep.cxx @@ -31,7 +31,6 @@ #include "comdep.hxx" #include <tools/debug.hxx> -#include <tools/list.hxx> #include <tools/fsys.hxx> DBG_NAMEEX( DirEntry ) diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 0cd50dc948fe..a276bf3bfca3 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -29,7 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" - #if !defined UNX #include <io.h> #include <process.h> @@ -47,7 +46,6 @@ #include <stdio.h> #include <string.h> #include <tools/debug.hxx> -#include <tools/list.hxx> #include "comdep.hxx" #include <tools/fsys.hxx> #define _TOOLS_HXX diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx index 4d914e68b19c..d0d6a4f8513c 100644 --- a/tools/source/fsys/os2.cxx +++ b/tools/source/fsys/os2.cxx @@ -36,7 +36,6 @@ #include <malloc.h> #endif #include <tools/debug.hxx> -#include <tools/list.hxx> #include <tools/bigint.hxx> #include <tools/fsys.hxx> #include "comdep.hxx" diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index 55fff85a4401..cf9bd901abc4 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -35,7 +35,6 @@ #include <cstdarg> #include <limits.h> #include <tools/debug.hxx> -#include <tools/list.hxx> #include "comdep.hxx" #include <tools/fsys.hxx> diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 887dff9e79e3..31f6e707c7dc 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -59,7 +59,6 @@ struct mnttab #endif #include <tools/debug.hxx> -#include <tools/list.hxx> #include <tools/fsys.hxx> #include "comdep.hxx" #include <rtl/instance.hxx> diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 2c9eae238bf3..1b2d892ec1a2 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -42,7 +42,6 @@ #include "wntmsc.hxx" #include <tools/errinf.hxx> #include <tools/debug.hxx> -#include <tools/list.hxx> #include <tools/wldcrd.hxx> #include <tools/fsys.hxx> #include <tools/bigint.hxx> diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 63ecaad720b9..ec0a8261e61d 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -31,8 +31,8 @@ #include <vcl/dllapi.h> #include <tools/gen.hxx> -#include <tools/list.hxx> #include <tools/link.hxx> +#include <tools/list.hxx> #include <tools/string.hxx> #include <vcl/mapmod.hxx> diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx index ff59ba9bb5a5..17492c14a3be 100644 --- a/vcl/inc/vcl/outfont.hxx +++ b/vcl/inc/vcl/outfont.hxx @@ -30,7 +30,6 @@ #define _SV_OUTFONT_HXX #include <tools/string.hxx> -#include <tools/list.hxx> #include <i18npool/lang.h> #include <tools/gen.hxx> #include <tools/solar.h> diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 8a591f2a3126..6d76050623cd 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -31,7 +31,6 @@ #include "svsys.h" #include "vcl/salinst.hxx" -#include "tools/list.hxx" #include "tools/debug.hxx" #include "tools/diagnose_ex.h" #include "vcl/svdata.hxx" diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index ea24b661efa0..3e44838c3ea4 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -31,7 +31,6 @@ #include <svsys.h> #include <rtl/logfile.hxx> -#include <tools/list.hxx> #include <tools/debug.hxx> #include <tools/rc.h> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index d4095b91b5f7..f08b9c7282a5 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <tools/list.hxx> #include <tools/debug.hxx> #include <tools/rc.h> |