From 5ba8a3f904a9d96107ad97b33d4764296bd18690 Mon Sep 17 00:00:00 2001 From: "J. Graeme Lingard" Date: Thu, 7 Oct 2010 23:56:42 +0100 Subject: Remove redundant #include directives & comments --- dtrans/source/test/test_dtrans.cxx | 4 ---- dtrans/test/win32/dnd/atlwindow.cxx | 1 - dtrans/test/win32/dnd/dndTest.cxx | 2 -- dtrans/test/win32/dnd/transferable.hxx | 11 ----------- l10ntools/source/help/compilehelp.hxx | 2 -- l10ntools/source/helpmerge.cxx | 1 - sax/source/expatwrap/attrlistimpl.hxx | 1 - sax/source/fastparser/fastparser.cxx | 3 --- svl/source/numbers/zforlist.cxx | 1 - svl/source/numbers/zformat.cxx | 1 - svtools/inc/svtools/chartprettypainter.hxx | 1 - svtools/source/dialogs/property.cxx | 9 +-------- svtools/source/filter.vcl/filter/sgvmain.cxx | 4 ---- svtools/source/filter.vcl/filter/sgvtext.cxx | 1 - svtools/source/misc/imap2.cxx | 1 - svtools/source/misc/langtab.cxx | 3 --- svtools/source/plugapp/commtest.cxx | 1 - svtools/source/uno/treecontrolpeer.hxx | 1 - toolkit/inc/toolkit/awt/vclxdevice.hxx | 1 - toolkit/source/controls/grid/defaultgridcolumnmodel.hxx | 1 - toolkit/source/helper/listenermultiplexer.cxx | 1 - toolkit/workben/controls.cxx | 1 - tools/source/fsys/os2.hxx | 1 - unotools/source/i18n/textsearch.cxx | 3 --- vcl/aqua/source/a11y/aqua11yfocuslistener.hxx | 4 +--- vcl/inc/vcl/graphite_cache.hxx | 1 - vcl/os2/inc/sallang.hxx | 1 - vcl/os2/source/app/salinfo.cxx | 4 ---- vcl/source/app/svapp.cxx | 1 - vcl/source/window/scrwnd.cxx | 1 - vcl/source/window/winproc.cxx | 3 --- vcl/unx/gtk/a11y/atkeditabletext.cxx | 3 --- vcl/unx/source/gdi/xrender_peer.cxx | 2 +- vos/source/socket.cxx | 1 - 34 files changed, 3 insertions(+), 74 deletions(-) diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx index 41d5bfb4f32f..f9944b7db5d3 100644 --- a/dtrans/source/test/test_dtrans.cxx +++ b/dtrans/source/test/test_dtrans.cxx @@ -54,10 +54,6 @@ #include #include -//#include - -//#include - //------------------------------------------------------------------------ // my defines //------------------------------------------------------------------------ diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx index 2ed1b1b956bb..fd85ffa804a5 100644 --- a/dtrans/test/win32/dnd/atlwindow.cxx +++ b/dtrans/test/win32/dnd/atlwindow.cxx @@ -40,7 +40,6 @@ #include "atlwindow.hxx" #include "targetlistener.hxx" #include "sourcelistener.hxx" -//#include "transferable.hxx" #include #include diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx index e1a96598da62..77dae4f9e076 100644 --- a/dtrans/test/win32/dnd/dndTest.cxx +++ b/dtrans/test/win32/dnd/dndTest.cxx @@ -50,10 +50,8 @@ CComModule _Module; #include #include #include -//#include "transferable.hxx" #include "sourcelistener.hxx" - #include "atlwindow.hxx" BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx index a9509f497ab1..f7d891799122 100644 --- a/dtrans/test/win32/dnd/transferable.hxx +++ b/dtrans/test/win32/dnd/transferable.hxx @@ -27,17 +27,6 @@ #ifndef _TRANSFERABLE_HXX_ #define _TRANSFERABLE_HXX_ -//_________________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________________ - - -//#include "..\ImplHelper.hxx" - -//_________________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________________ - #include #include #include diff --git a/l10ntools/source/help/compilehelp.hxx b/l10ntools/source/help/compilehelp.hxx index 9c59083bf038..8b23f03e0caa 100644 --- a/l10ntools/source/help/compilehelp.hxx +++ b/l10ntools/source/help/compilehelp.hxx @@ -37,8 +37,6 @@ #endif #define HELPLINKER_DLLPRIVATE SAL_DLLPRIVATE - -//#include #include enum HelpProcessingErrorClass diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 15cb1e311002..1f433a7f98c1 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -43,7 +43,6 @@ #include "rtl/strbuf.hxx" #ifdef WNT #include -//#include #include "tools/prewin.h" #include #include "tools/postwin.h" diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index aaf6cf84b359..a35eced63b3f 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -29,7 +29,6 @@ #define _SAX_ATTRLISTIMPL_HXX #include "sal/config.h" -//#include "sax/saxdllapi.h" #include diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 1a4cc9278e1e..d37367eb05df 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -25,9 +25,6 @@ * ************************************************************************/ -//#include -//#include - #include #include diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 7343a0a9c0e6..ecaf708674df 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -30,7 +30,6 @@ #ifndef GCC #endif -// #include #include #include #include diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 97f06171a4fc..b91997a814a8 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -30,7 +30,6 @@ #include #include #include -// #include #include #include #include diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx index c885bdb83de1..f4a816117a40 100644 --- a/svtools/inc/svtools/chartprettypainter.hxx +++ b/svtools/inc/svtools/chartprettypainter.hxx @@ -30,7 +30,6 @@ #include "svtools/svtdllapi.h" -//#include #include #include #include diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx index 3b081ce2f520..ed05272d4f6f 100644 --- a/svtools/source/dialogs/property.cxx +++ b/svtools/source/dialogs/property.cxx @@ -32,15 +32,8 @@ #ifndef GCC #endif -//------------------------------------------------------------------ - -//#include "Svitems.hxx" - #include "property.hxx" -/* -#include "property.hrc" -#include "Scresid.hxx" -*/ + #define FRAME_OFFSET 4 diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx index e175380244b3..faafc4a98d12 100644 --- a/svtools/source/filter.vcl/filter/sgvmain.cxx +++ b/svtools/source/filter.vcl/filter/sgvmain.cxx @@ -39,10 +39,6 @@ #include "sgvspln.hxx" #include -//#if OSL_DEBUG_LEVEL > 1 -//#include "Debug.c" -//#endif - #define SWAPPOINT(p) { \ p.x=SWAPSHORT(p.x); \ p.y=SWAPSHORT(p.y); } diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx index 4a0be80b55be..ab131b4c1233 100644 --- a/svtools/source/filter.vcl/filter/sgvtext.cxx +++ b/svtools/source/filter.vcl/filter/sgvtext.cxx @@ -34,7 +34,6 @@ #include "sgffilt.hxx" #include "sgfbram.hxx" #include "sgvmain.hxx" -// #include "Debug.c" extern SgfFontLst* pSgfFonts; diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index bd5ab933ebc8..1fa433199b2b 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -32,7 +32,6 @@ #include #endif #include -// #include #include #include #include diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index d1ff94572a99..f04648bbb03a 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -28,12 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -// include --------------------------------------------------------------- - #include #include -//#include #include #include diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx index 3a235afcc61b..9e2195c02738 100644 --- a/svtools/source/plugapp/commtest.cxx +++ b/svtools/source/plugapp/commtest.cxx @@ -35,7 +35,6 @@ #include #include "communi.hxx" #include "brooker.hxx" -//#include #include "commtest.hrc" diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 336830804a6f..0229374fcf49 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -37,7 +37,6 @@ #include -//#include #include diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index 62753a36136d..7a3f10c3a347 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -35,7 +35,6 @@ #include #include -// #include #include class OutputDevice; diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx index 8b8c8bfc795c..fae9358bb1f4 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx @@ -29,7 +29,6 @@ #include "precompiled_toolkit.hxx" #include #include -//#include #include #include #include diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index 9b8df60521ae..71a9020932ac 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -26,7 +26,6 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -//#include "precompiled_toolkit.hxx" #include "precompiled_toolkit.hxx" #include #include diff --git a/toolkit/workben/controls.cxx b/toolkit/workben/controls.cxx index 9047e914a76d..c8acb125e993 100644 --- a/toolkit/workben/controls.cxx +++ b/toolkit/workben/controls.cxx @@ -43,7 +43,6 @@ #include -// #include #include // InitExtToolkit diff --git a/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx index c5e54ba0ad47..08ead519933a 100644 --- a/tools/source/fsys/os2.hxx +++ b/tools/source/fsys/os2.hxx @@ -71,7 +71,6 @@ inline BOOL DRIVE_EXISTS( char c ) } #include -//#include inline Time MsDos2Time( FTIME* aTime ) { diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 6a3dcd2b7d28..114a920277fb 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -29,9 +29,6 @@ #include "precompiled_unotools.hxx" #include #include -#ifndef _INTN_HXX //autogen -//#include -#endif #include #include #include diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx index 1fdd340c698e..9e0a23961e58 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx @@ -33,8 +33,6 @@ #include "keyboardfocuslistener.hxx" #include "aquavcltypes.h" -// #include - class AquaA11yFocusListener : public KeyboardFocusListener, public salhelper::ReferenceObject @@ -59,4 +57,4 @@ public: virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()); }; -#endif // _AQUA11YFOCUSLISTENER_HXX_ \ No newline at end of file +#endif // _AQUA11YFOCUSLISTENER_HXX_ diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx index af1392ed4d4b..5f9794c11538 100644 --- a/vcl/inc/vcl/graphite_cache.hxx +++ b/vcl/inc/vcl/graphite_cache.hxx @@ -36,7 +36,6 @@ #define GRCACHE_REUSE_VECTORS 1 -//#include #include class TextSourceAdaptor; diff --git a/vcl/os2/inc/sallang.hxx b/vcl/os2/inc/sallang.hxx index 00caecd90eee..0c465a7acd65 100644 --- a/vcl/os2/inc/sallang.hxx +++ b/vcl/os2/inc/sallang.hxx @@ -28,7 +28,6 @@ #ifndef _SALLANG_HXX #define _SALLANG_HXX -//#include #include // -------------------- diff --git a/vcl/os2/source/app/salinfo.cxx b/vcl/os2/source/app/salinfo.cxx index e48aacd4c521..47c9b8b6297d 100644 --- a/vcl/os2/source/app/salinfo.cxx +++ b/vcl/os2/source/app/salinfo.cxx @@ -40,10 +40,6 @@ #include #include "vcl/window.hxx" -#ifndef _SV_SALGTYPE_HXX -//#include -#endif - #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer class Os2SalSystem : public SalSystem diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e503172eb2c6..71d063bed39d 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -140,7 +140,6 @@ namespace } -// #include class Reflection; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index e0efb37c9444..748d4fae0b63 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -// #include #include #include #include diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ae226a595fac..469c6661d366 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -32,9 +32,6 @@ #include #include #include -#ifndef _INTN_HXX -//#include -#endif #include #include #include diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index c0399145b07c..fdc05745eeda 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -34,9 +34,6 @@ #include #include -// #include -// #include - #include #include diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx index 8d24e4098df4..b5afb8363fca 100644 --- a/vcl/unx/source/gdi/xrender_peer.cxx +++ b/vcl/unx/source/gdi/xrender_peer.cxx @@ -31,7 +31,7 @@ #include #include #include -//#include + using namespace rtl; #include diff --git a/vos/source/socket.cxx b/vos/source/socket.cxx index c32faf17a4a5..0b222eb7034f 100644 --- a/vos/source/socket.cxx +++ b/vos/source/socket.cxx @@ -31,7 +31,6 @@ #include #include #include -//#include using namespace vos; -- cgit v1.2.3