Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/ure

36 files changed, 3 insertions, 151 deletions

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index bf2826594162..e6669d38c99a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -40,7 +40,6 @@
 #include "bridges/cpp_uno/shared/vtablefactory.hxx"
 
 #include "share.hxx"
-// #include <stdio.h>
 
 
 using namespace ::com::sun::star::uno;
@@ -48,7 +47,6 @@ using namespace ::com::sun::star::uno;
 namespace
 {
 
-//==================================================================================================
 static typelib_TypeClass cpp2uno_call(
     bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
     const typelib_TypeDescription * pMemberTypeDescr,
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
index c6870af48258..f8a885854c6c 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
@@ -30,8 +30,6 @@
 
 #include <stdio.h>
 
-// #include <malloc.h>
-
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <uno/data.h>
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 0ff4872804bb..2473eaddf776 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -31,7 +31,6 @@
 #include <sal/alloca.h>
 
 #include "jni_bridge.h"
-//#include "jni_finalizer.h"
 
 #include <rtl/ustrbuf.hxx>
 
diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h
index 8a30a538247c..b2ef40e054f7 100644
--- a/bridges/test/testcomp.h
+++ b/bridges/test/testcomp.h
@@ -24,12 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//#include <com/sun/star/bridge/XServer.hpp>
-//#include <com/sun/star/bridge/XClient.hpp>
+
 #include <stdio.h>
 
 #include <com/sun/star/bridge/XInstanceProvider.hpp>
-//#include <com/sun/star/bridge/XConnectionAdministration.hpp>
 #include <osl/thread.hxx>
 
 
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 56b5caf3b299..0efc5523341a 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -35,7 +35,6 @@
 #include <windows.h>
 
 #include "sal/types.h"
-//#include "tools/pathutils.hxx"
 
 namespace cli_ure {
 
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index ee870a52e286..71d1fdd81531 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -25,22 +25,17 @@
  *
  ************************************************************************/
 
-#include <iostream>
-
 #include "osl/interlck.h"
 #include "rtl/ustring.hxx"
 #include "uno/environment.hxx"
 #include "uno/mapping.hxx"
 #include "uno/dispatcher.h"
 
-//#include "cascade_mappping.hxx"
 #include "cppu/EnvDcp.hxx"
 
 
-//#define LOG_CALLING_named_purpose_getMapping
-
-//#define LOG_LIFECYLE_MediatorMapping
 #ifdef LOG_LIFECYLE_MediatorMapping
+#  include <iostream>
 #  define LOG_LIFECYLE_MediatorMapping_emit(x) x
 
 #else
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 8abd7b82ef8d..28b5f61cb9eb 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -30,7 +30,6 @@
 
 #include "libxml/parser.h"
 #include "libxml/xpath.h"
-//#include "libxml/xpathinternals.h"
 #include "rtl/ustring.hxx"
 namespace jfw
 {
diff --git a/offapi/com/sun/star/chart2/CoordinateSystemType.idl b/offapi/com/sun/star/chart2/CoordinateSystemType.idl
index faba718fe384..dc8f42cead79 100644
--- a/offapi/com/sun/star/chart2/CoordinateSystemType.idl
+++ b/offapi/com/sun/star/chart2/CoordinateSystemType.idl
@@ -1,16 +1,9 @@
 #ifndef com_sun_star_chart2_CoordinateSystemType_idl
 #define com_sun_star_chart2_CoordinateSystemType_idl
 
-// #ifndef com_sun_star_chart2_XCoordinateSystemType_idl
-// #include <com/sun/star/chart2/XCoordinateSystemType.idl>
-// #endif
-
-//=============================================================================
 
 module com {  module sun {  module star {  module chart2 {
 
-//=============================================================================
-
 /**
 <p>
 The service CoordinateSystemType represents a special type of coordinate system.
@@ -29,8 +22,6 @@ service CoordinateSystemType
 //  interface ::com::sun::star::chart2::XCoordinateSystemType;
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl
index e78592fb7144..412d9f0799e1 100644
--- a/offapi/com/sun/star/chart2/DataSeries.idl
+++ b/offapi/com/sun/star/chart2/DataSeries.idl
@@ -32,7 +32,6 @@
 #include <com/sun/star/container/XContainer.idl>
 #include <com/sun/star/style/XStyle.idl>
 
-//#include <com/sun/star/chart2/ChartTypeSupplier.idl>
 #include <com/sun/star/chart2/CoordinateSystemSupplier.idl>
 #include <com/sun/star/chart2/data/XDataSink.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
diff --git a/offapi/com/sun/star/chart2/FillBitmap.idl b/offapi/com/sun/star/chart2/FillBitmap.idl
index a3020b50b8b0..55b193a3eb7a 100644
--- a/offapi/com/sun/star/chart2/FillBitmap.idl
+++ b/offapi/com/sun/star/chart2/FillBitmap.idl
@@ -27,10 +27,6 @@
 #ifndef com_sun_star_chart2_FillBitmap_idl
 #define com_sun_star_chart2_FillBitmap_idl
 
-// #ifndef __com_sun_star_awt_XBitmap_idl__
-// #include <com/sun/star/awt/XBitmap.idl>
-// #endif
-
 #ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
 #endif
diff --git a/offapi/com/sun/star/chart2/XDataSeries.idl b/offapi/com/sun/star/chart2/XDataSeries.idl
index aa55196ef67d..d22f87b2680f 100644
--- a/offapi/com/sun/star/chart2/XDataSeries.idl
+++ b/offapi/com/sun/star/chart2/XDataSeries.idl
@@ -27,8 +27,6 @@
 #ifndef com_sun_star_chart2_XDataSeries_idl
 #define com_sun_star_chart2_XDataSeries_idl
 
-// #include <com/sun/star/chart2/XCoordinateSystem.idl>
-
 #ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
diff --git a/offapi/com/sun/star/chart2/XTarget.idl b/offapi/com/sun/star/chart2/XTarget.idl
index 1e18166d35fb..e41afe75fe50 100644
--- a/offapi/com/sun/star/chart2/XTarget.idl
+++ b/offapi/com/sun/star/chart2/XTarget.idl
@@ -5,16 +5,9 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-// #ifndef __com_sun_star_drawing_XShapes_idl__
-// #include <com/sun/star/drawing/XShapes.idl>
-// #endif
-
-//=============================================================================
 
 module com {  module sun {  module star {  module chart2 {
 
-//=============================================================================
-
 //................... wrong --> XDrawGroup
 
 // [in] com::sun::star::drawing::XShapes xShapes
@@ -26,8 +19,6 @@ interface XTarget : ::com::sun::star::uno::XInterface
     //... provide something for creation of Transformation ...
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/chart2/XUndoHelper.idl b/offapi/com/sun/star/chart2/XUndoHelper.idl
index 6c782564e04f..a269c43cd251 100644
--- a/offapi/com/sun/star/chart2/XUndoHelper.idl
+++ b/offapi/com/sun/star/chart2/XUndoHelper.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/frame/XModel.idl>
-// #include <com/sun/star/beans/PropertyValue.idl>
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
index dadba2306884..27c1f53920df 100644
--- a/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/chart2/data/XDataSequence.idl>
-// #include <com/sun/star/lang/IllegalArgumentException.idl>
 
 module com
 {
diff --git a/offapi/com/sun/star/util/XTextSearch.idl b/offapi/com/sun/star/util/XTextSearch.idl
index cc9e45058c47..4afbacd19894 100644
--- a/offapi/com/sun/star/util/XTextSearch.idl
+++ b/offapi/com/sun/star/util/XTextSearch.idl
@@ -31,15 +31,10 @@
 
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/uno/XInterface.idl>
-//#include <com/sun/star/lang/CascadeTransliterator.idl>
 
-//=============================================================================
 
 module com { module sun { module star { module util {
 
-//=============================================================================
-
-
 published enum SearchAlgorithms {
     ABSOLUTE,       // "normal" a kind of Boyer-Moore
     REGEXP,                 // regular expression
diff --git a/sal/inc/rtl/tres.hxx b/sal/inc/rtl/tres.hxx
index 6fcd5b7c61e7..3434011396af 100644
--- a/sal/inc/rtl/tres.hxx
+++ b/sal/inc/rtl/tres.hxx
@@ -28,11 +28,8 @@
 #ifndef _RTL_TRES_HXX_
 #define _RTL_TRES_HXX_
 
-
 #include <rtl/tres.h>
 
-//#include <stdarg.h>
-
 // <namespace_rtl>
 namespace rtl
 {
diff --git a/sal/osl/os2/dllentry.c b/sal/osl/os2/dllentry.c
index 494119599f8b..3eaca9e62305 100644
--- a/sal/osl/os2/dllentry.c
+++ b/sal/osl/os2/dllentry.c
@@ -28,7 +28,6 @@
 #include "system.h"
 #include "sockimpl.h"
 #include "secimpl.h"
-//#include "daemimpl.h"
 
 #include <osl/diagnose.h>
 
diff --git a/sal/osl/os2/process.c b/sal/osl/os2/process.c
index e83552192bfb..cdc26b63963a 100644
--- a/sal/osl/os2/process.c
+++ b/sal/osl/os2/process.c
@@ -29,21 +29,16 @@
 #include <osl/thread.h>
 
 #include <osl/diagnose.h>
-//#include <osl/socket.h>
 
 #ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
 #endif
 
 #include "procimpl.h"
-//#include "sockimpl.h"
-//#include "secimpl.h"
 
 #include <ctype.h>
 
-//#ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
-//#endif
 
 // for exception logging
 #include <stdio.h>
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index cc7f61ec6a8b..cf8c2e5eedf6 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -66,7 +66,6 @@ static const sal_Char* MOUNTTAB="/etc/mnttab";
 #include <sys/vfs.h>
 #define  HAVE_STATFS_H
 #include <sys/quota.h>
-//#include <ctype.h>
 static const sal_Char* MOUNTTAB="/etc/mtab";
 
 #elif defined(NETBSD) || defined(FREEBSD)
@@ -75,7 +74,6 @@ static const sal_Char* MOUNTTAB="/etc/mtab";
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <ufs/ufs/quota.h>
-//#include <ctype.h>
 #define  HAVE_STATFS_H
 
 /* No mounting table on *BSD
@@ -85,7 +83,6 @@ static const sal_Char* MOUNTTAB="/etc/mtab";
 #elif defined(MACOSX)
 
 #include <ufs/ufs/quota.h>
-//#include <ctype.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #define HAVE_STATFS_H
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index ede4cd7e074f..af81e21a49b8 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -25,12 +25,10 @@
  *
  ************************************************************************/
 
-
 #include "system.h"
 
 #include <osl/pipe.h>
 #include <osl/diagnose.h>
-/*#include <osl/signal.h>*/
 #include <osl/thread.h>
 #include <osl/interlck.h>
 
@@ -45,9 +43,6 @@
 sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
 oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security);
 
-/*#define DEBUG_OSL_PIPE*/
-/*#define TRACE_OSL_PIPE*/
-
 
 /*****************************************************************************/
 /* enum oslPipeError */
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 0687a69345de..b407cf063b1a 100755
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -25,22 +25,15 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _OSL_SECURITY_CONST_H_
 #define _OSL_SECURITY_CONST_H_
 
 #if ( defined WNT )                     // Windows
-//#define UNICODE
 #include <tools/prewin.h>
-// #include <windows.h>
 #include <io.h>
 #include <tools/postwin.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
@@ -55,7 +48,6 @@
 #endif
 
 #include <testshl/simpleheader.hxx>
-// LLA: #include <testshl2/cmdlinebits.hxx>
 
 
 #define BUFSIZE 1024
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 9a60bb8249b3..554ef9817bc9 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -54,13 +54,8 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
-
 #include <testshl/simpleheader.hxx>
 
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 83ec82b5a77a..06ae793d32d1 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -54,13 +54,8 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
-
 #include <testshl/simpleheader.hxx>
 
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index 6c68287ae748..1c78ed2e6b53 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -54,13 +54,8 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
-
 #include <testshl/simpleheader.hxx>
 
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 9883511cb43e..eec3b10262e3 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -54,13 +54,8 @@
      inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
 */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
-
 #include <testshl/simpleheader.hxx>
 
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 #include <osl/conditn.hxx>
 
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index e664f13c4880..fb018a3ff06b 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -24,14 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 
 #ifndef _SOCKETHELPER_HXX_
 #define _SOCKETHELPER_HXX_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <sal/types.h>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
@@ -78,7 +74,6 @@ extern "C"
 
 #if ( defined WNT )                     // Windows
 #include <tools/prewin.h>
-// #include <windows.h>
 #include <winsock.h>
 #include <string.h>
 #include <tools/postwin.h>
@@ -86,9 +81,6 @@ extern "C"
 
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index efaa7dc531bc..c82a962c7336 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -39,8 +39,6 @@
 #include "testshl/stringhelper.hxx"
 
 #include <testshl/simpleheader.hxx>
-//#include "stringhelper.hxx"
-//#include "valueequal.hxx"
 #include <rtl/bootstrap.hxx>
 
 #include <rtl/ustrbuf.hxx>
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 159bc2c06044..a95807eee65f 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -32,8 +32,6 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -45,13 +43,9 @@
 #include <rtl/logfile.hxx>
 #include <testshl/simpleheader.hxx>
 
-// #include <osl/module.hxx>
 #include <osl/file.hxx>
 #if ( defined WNT )                     // Windows
 #include <tools/prewin.h>
-// #define UNICODE
-// #define WIN32_LEAN_AND_MEAN
-// #include <windows.h>
 #include <tchar.h>
 #include <tools/postwin.h>
 #endif
diff --git a/sal/qa/rtl/math/test_rtl_math.cxx b/sal/qa/rtl/math/test_rtl_math.cxx
index 887e3ddd1214..9d1dfde55936 100644
--- a/sal/qa/rtl/math/test_rtl_math.cxx
+++ b/sal/qa/rtl/math/test_rtl_math.cxx
@@ -34,7 +34,6 @@
 #include "rtl/string.h"
 #include "rtl/string.hxx"
 #include "rtl/textenc.h"
-// #include "rtl/tres.h"
 #include <testshl/tresstatewrapper.hxx>
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 0c5d3f8345ac..7b7e68625a99 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -32,28 +32,18 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
 #include <string.h>
 #include <stdio.h>
 
-// #include <osl/diagnose.h>
-
 #include <rtl/string.hxx>
 
 #include <testshl/simpleheader.hxx>
 
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
 
-// #if OSL_DEBUG_LEVEL > 0
-// #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
-// #else
-// #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
-// #endif
 
 using namespace rtl;
 
-// -----------------------------------------------------------------------------
 namespace rtl_OString
 {
     class oldtests : public CppUnit::TestFixture
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 4a0d6d008c1c..b1fa1f553d2f 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -32,8 +32,6 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
 #include <string.h>
 #include <stdio.h>
 
@@ -44,8 +42,6 @@
 #include <wcstr.h>
 #endif
 
-// #include <osl/diagnose.h>
-
 #include <rtl/ustring.hxx>
 
 #include <rtl/string.hxx>
@@ -55,15 +51,10 @@
 #include <testshl/simpleheader.hxx>
 
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
-// #if OSL_DEBUG_LEVEL > 0
-// #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
-// #else
-// #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
-// #endif
+
 
 using namespace rtl;
 
-// -----------------------------------------------------------------------------
 namespace rtl_OUString
 {
     class oldtests : public CppUnit::TestFixture
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index bf760e5c5b91..63334ac2c1f9 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -32,14 +32,9 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
-
 #include <string.h>
 #include <stdio.h>
 
-// #include <osl/diagnose.h>
-
 #include <rtl/strbuf.hxx>
 
 #include <rtl/ustrbuf.hxx>
@@ -50,13 +45,7 @@ using namespace rtl;
 
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
 
-// #if OSL_DEBUG_LEVEL > 0
-// #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
-// #else
-// #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
-// #endif
 
-// -----------------------------------------------------------------------------
 namespace rtl_OStringBuffer
 {
     class oldtests : public CppUnit::TestFixture
diff --git a/sal/workben/salstattest.c b/sal/workben/salstattest.c
index e19e07ad8260..2de27960d06a 100644
--- a/sal/workben/salstattest.c
+++ b/sal/workben/salstattest.c
@@ -29,9 +29,6 @@
 #include <systools/win32/shell9x.h>
 #include <systools/win32/kernel9x.h>
 
-//#include <windows.h>
-//#include <shlobj.h>
-
 int _cdecl main( int argc, char * argv[] )
 {
     BROWSEINFOW bi;
diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
index 076a2e9c1e62..b7c7f523f781 100644
--- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
+++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
@@ -31,7 +31,6 @@
 
 #include <jni.h>
 
-//#include <iostream>
 #include <stdio.h>
 #include <sal/main.h>
 #include <rtl/process.h>
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index e9111bd3cd1d..737adb540141 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -31,7 +31,6 @@
 
 #include <jni.h>
 
-//#include <iostream>
 #include <stdio.h>
 #include <sal/main.h>
 #include <rtl/process.h>
@@ -47,8 +46,6 @@
 #include <com/sun/star/registry/XImplementationRegistration.hpp>
 #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
 
-//#include <cppuhelper/implbase1.hxx>
-
 using namespace std;
 using namespace rtl;
 using namespace cppu;
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index a706f8666fee..5748cfd3d473 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -34,8 +34,6 @@
 #include <cppuhelper/servicefactory.hxx>
 #include <osl/diagnose.h>
 
-//#include <vos/dynload.hxx>
-
 #include <ModuleA/XIntroTest.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
@@ -48,7 +46,6 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/reflection/XIdlReflection.hpp>
-//#include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/registry/XImplementationRegistration.hpp>
 #include <com/sun/star/lang/XComponent.hpp>