[Libreoffice-commits] .: dtrans/source dtrans/test l10ntools/source sax/source svl/source svtools/inc svtools/source toolkit/inc toolkit/source toolkit/workben tools/source unotools/source vcl/aqua vcl/inc vcl/os2 vcl/source vcl/unx vos/source

Kohei Yoshida kohei at kemper.freedesktop.org
Thu Oct 7 17:49:23 PDT 2010


 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           |    3 ---
 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, 2 insertions(+), 74 deletions(-)

New commits:
commit 00c889d777492a5e4c08b9fd82e17450af1ec101
Author: J. Graeme Lingard <jgraeme+git at gmail.com>
Date:   Thu Oct 7 23:56:42 2010 +0100

    Remove redundant #include directives & comments

diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 05d525f..e03c98d 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -54,10 +54,6 @@
 #include <stdio.h>
 #include <string.h>
 
-//#include <memory>
-
-//#include <process.h>
-
 //------------------------------------------------------------------------
 // my defines
 //------------------------------------------------------------------------
diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx
index aed105a..629ed70 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 <map>
 
 #include <winbase.h>
diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx
index feeef9a..af1e87f 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.cxx
@@ -50,10 +50,8 @@ CComModule _Module;
 #include <com/sun/star/lang/XComponent.hpp>
 #include <rtl/process.h>
 #include <cppuhelper/servicefactory.hxx>
-//#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 74180d4..4217716 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 <cppuhelper/servicefactory.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/l10ntools/source/help/compilehelp.hxx b/l10ntools/source/help/compilehelp.hxx
index abc70da..edfa8d8 100644
--- a/l10ntools/source/help/compilehelp.hxx
+++ b/l10ntools/source/help/compilehelp.hxx
@@ -37,8 +37,6 @@
 #endif
 #define HELPLINKER_DLLPRIVATE SAL_DLLPRIVATE
 
-
-//#include <helplinkerdllapi.h>
 #include <rtl/ustring.hxx>
 
 enum HelpProcessingErrorClass
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 19f7c4a..6935ad5 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -43,7 +43,6 @@
 #include "rtl/strbuf.hxx"
 #ifdef WNT
 #include <direct.h>
-//#include <WinBase.h>
 #include "tools/prewin.h"
 #include <windows.h>
 #include "tools/postwin.h"
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index 25b5629..2db0e12 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 <cppuhelper/implbase2.hxx>
 
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 0fbaae0..a574921 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -25,9 +25,6 @@
  *
  ************************************************************************/
 
-//#include <stdlib.h>
-//#include <sal/alloca.h>
-
 #include <boost/scoped_ptr.hpp>
 
 #include <osl/diagnose.h>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 17662ae..7f47732 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -30,7 +30,6 @@
 #ifndef GCC
 #endif
 
-// #include <math.h>
 #include <tools/debug.hxx>
 #include <unotools/charclass.hxx>
 #include <i18npool/mslangid.hxx>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 492702b..ddefb59 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <float.h>
-// #include <math.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <tools/debug.hxx>
diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx
index 68b4579..57a958d 100644
--- a/svtools/inc/svtools/chartprettypainter.hxx
+++ b/svtools/inc/svtools/chartprettypainter.hxx
@@ -30,7 +30,6 @@
 
 #include "svtools/svtdllapi.h"
 
-//#include <svtools/embedhlp.hxx>
 #include <vcl/outdev.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index 8e631e4..087db18 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 96caf66..72e6e29 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 <unotools/ucbstreamhelper.hxx>
 
-//#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 cb86fca..7414168 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 9d5027d..c9157cd 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -32,7 +32,6 @@
 #include <sysdep.hxx>
 #endif
 #include <string.h>
-// #include <math.h>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index fd89f87..567a6e7 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 <tools/shl.hxx>
 #include <tools/debug.hxx>
 
-//#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/i18n/DirectionProperty.hpp>
 
 #include <i18npool/lang.h>
diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx
index f5693c1..9c57af8 100644
--- a/svtools/source/plugapp/commtest.cxx
+++ b/svtools/source/plugapp/commtest.cxx
@@ -35,7 +35,6 @@
 #include <tools/simplecm.hxx>
 #include "communi.hxx"
 #include "brooker.hxx"
-//#include <tools/bcst.hxx>
 
 #include "commtest.hrc"
 
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 1b325d4..9cb448a 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -37,7 +37,6 @@
 
 #include <vcl/image.hxx>
 
-//#include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase2.hxx>
 
 
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index a41abb2..309791c 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/weak.hxx>
 #include <vos/mutex.hxx>
 
-// #include <com/sun/star/awt/XTextConstraints.hpp>
 #include <com/sun/star/awt/XUnitConversion.hpp>
 
 class OutputDevice;
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index b98975e..c69bfb6 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
@@ -29,7 +29,6 @@
 #include "precompiled_toolkit.hxx"
 #include <com/sun/star/awt/grid/XGridColumnModel.hpp>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
-//#include <com/sun/star/awt/grid/GridColumnEvent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
index 541150e..807c2bf 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 <toolkit/helper/listenermultiplexer.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/toolkit/workben/controls.cxx b/toolkit/workben/controls.cxx
index f5a5146..4aaf311 100644
--- a/toolkit/workben/controls.cxx
+++ b/toolkit/workben/controls.cxx
@@ -43,7 +43,6 @@
 
 
 #include <unoctrl.hxx>
-// #include <unoctrl2.hxx>
 
 #include <svtools/unoiface.hxx>	// InitExtToolkit
 
diff --git a/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx
index e4315b7..9a633cd 100644
--- a/tools/source/fsys/os2.hxx
+++ b/tools/source/fsys/os2.hxx
@@ -71,7 +71,6 @@ inline BOOL DRIVE_EXISTS( char c )
 }
 
 #include <time.h>
-//#include <datetime.hxx>
 
 inline Time MsDos2Time( FTIME* aTime )
 {
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 9a6b6ee..76f4863 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -29,9 +29,6 @@
 #include "precompiled_unotools.hxx"
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
-#ifndef _INTN_HXX //autogen
-//#include <tools/intn.hxx>
-#endif
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/SearchFlags.hdl>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index aae6fb3..c3fd233 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 <com/sun/star/accessibility/XAccessibleContext.hpp>
-
 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 575e5bb..06bb67f 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 <rope>
 #include <hash_map>
 
 class TextSourceAdaptor;
diff --git a/vcl/os2/inc/sallang.hxx b/vcl/os2/inc/sallang.hxx
index 25c4498..e58a7ad 100644
--- a/vcl/os2/inc/sallang.hxx
+++ b/vcl/os2/inc/sallang.hxx
@@ -28,7 +28,6 @@
 #ifndef _SALLANG_HXX
 #define _SALLANG_HXX
 
-//#include <tools/lang.hxx>
 #include <i18npool/mslangid.hxx>
 
 // --------------------
diff --git a/vcl/os2/source/app/salinfo.cxx b/vcl/os2/source/app/salinfo.cxx
index f4d9fba..221330c 100644
--- a/vcl/os2/source/app/salinfo.cxx
+++ b/vcl/os2/source/app/salinfo.cxx
@@ -40,10 +40,6 @@
 #include <rtl/ustrbuf.hxx>
 #include "vcl/window.hxx"
 
-#ifndef _SV_SALGTYPE_HXX
-//#include <salgtype.hxx>
-#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 1ba14b1..1f0bb80 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -140,7 +140,6 @@ namespace
 }
 
 
-// #include <usr/refl.hxx>
 class Reflection;
 
 
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index a4f3ab0..04eee8d 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 <math.h>
 #include <limits.h>
 #include <tools/time.hxx>
 #include <tools/debug.hxx>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 6ec81a8..b28d6f9 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -32,9 +32,6 @@
 #include <vcl/salwtype.hxx>
 #include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
-#ifndef _INTN_HXX
-//#include <tools/intn.hxx>
-#endif
 #include <vcl/i18nhelp.hxx>
 #include <vcl/unohelp.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index 7673b21..9519e06 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -34,9 +34,6 @@
 #include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
 #include <com/sun/star/accessibility/TextSegment.hpp>
 
-// #include <functional>
-// #include <hash_map>
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx
index 27756e6..ff1a84d 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/source/gdi/xrender_peer.cxx
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
-//#include <osl/thread.h>
+
 using namespace rtl;
 
 #include <xrender_peer.hxx>
diff --git a/vos/source/socket.cxx b/vos/source/socket.cxx
index af03342..2cc8419 100644
--- a/vos/source/socket.cxx
+++ b/vos/source/socket.cxx
@@ -31,7 +31,6 @@
 #include <osl/time.h>
 #include <vos/socket.hxx>
 #include <vos/diagnose.hxx>
-//#include <osl/tools.h>
 
 using namespace vos;
 


More information about the Libreoffice-commits mailing list