[Libreoffice-commits] .: cppuhelper/source cppu/source io/test remotebridges/source sal/osl sal/qa sal/rtl sal/workben
J Graeme Lingard
jgraeme at kemper.freedesktop.org
Sun Dec 5 12:30:03 PST 2010
cppu/source/typelib/typelib.cxx | 15 -----
cppuhelper/source/factory.cxx | 19 -------
cppuhelper/source/interfacecontainer.cxx | 25 ---------
io/test/stm/datatest.cxx | 11 ----
remotebridges/source/bridge/remote_bridge.cxx | 3 -
sal/osl/os2/pipeimpl.cxx | 16 ------
sal/osl/w32/pipeimpl.cxx | 16 ------
sal/qa/OStringBuffer/rtl_String_Const.h | 49 -------------------
sal/qa/OStringBuffer/rtl_String_Utils.cxx | 20 -------
sal/qa/OStringBuffer/rtl_String_Utils.hxx | 14 -----
sal/qa/OStringBuffer/rtl_String_Utils_Const.h | 18 -------
sal/qa/osl/condition/osl_Condition_Const.h | 6 --
sal/qa/osl/file/osl_File_Const.h | 19 -------
sal/qa/osl/mutex/osl_Mutex_Const.h | 6 --
sal/qa/osl/socket/osl_Socket_Const.h | 15 -----
sal/qa/osl/socket/osl_Socket_Const_orig.h | 15 -----
sal/qa/osl/socket/osl_StreamSocket.cxx | 3 -
sal/qa/rtl_strings/rtl_OUString.cxx | 2
sal/qa/rtl_strings/rtl_String_Const.h | 51 --------------------
sal/qa/rtl_strings/rtl_String_Utils.cxx | 20 -------
sal/qa/rtl_strings/rtl_String_Utils.hxx | 14 -----
sal/qa/rtl_strings/rtl_String_Utils_Const.h | 18 -------
sal/rtl/source/bootstrap.cxx | 6 --
sal/workben/clipboardwben/testcopy/XTDataObject.hxx | 9 ---
sal/workben/t_osl_getVolInfo.cxx | 10 ---
sal/workben/t_osl_joinProcess.cxx | 4 -
26 files changed, 2 insertions(+), 402 deletions(-)
New commits:
commit 7b277251a7b79fe3f83841ab9e3028670262e4dc
Author: J. Graeme Lingard <jgraeme+git at gmail.com>
Date: Sun Dec 5 20:28:21 2010 +0000
Remove redundant comments
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 5c05e43..dd2f38b 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -53,9 +53,6 @@ using namespace rtl;
using namespace std;
using namespace osl;
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
#ifdef SAL_W32
#pragma pack(push, 8)
#elif defined(SAL_OS2)
@@ -364,10 +361,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
namespace { struct Init : public rtl::Static< TypeDescriptor_Init_Impl, Init > {}; }
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
extern "C" void SAL_CALL typelib_typedescription_registerCallback(
void * pContext, typelib_typedescription_Callback pCallback )
SAL_THROW_EXTERN_C()
@@ -407,10 +400,6 @@ extern "C" void SAL_CALL typelib_typedescription_revokeCallback(
}
}
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
const typelib_TypeDescription * pTypeDescription,
sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize )
@@ -2282,10 +2271,6 @@ extern "C" void SAL_CALL typelib_typedescription_getByName(
}
}
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
typelib_TypeDescriptionReference ** ppTDR,
typelib_TypeClass eTypeClass,
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 2142588..187da68 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -65,9 +65,6 @@ using namespace com::sun::star::registry;
namespace cppu
{
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
class OSingleFactoryHelper
: public XServiceInfo
, public XSingleServiceFactory
@@ -267,10 +264,6 @@ Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void)
return aServiceNames;
}
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
struct OFactoryComponentHelper_Mutex
{
Mutex aMutex;
@@ -543,10 +536,6 @@ sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com::
return sal_True;
}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
class ORegistryFactoryHelper : public OFactoryComponentHelper,
public OPropertySetHelper
@@ -954,10 +943,6 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s
return retVal;
}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleServiceFactory,
XUnloadingPreference >
{
@@ -1047,10 +1032,6 @@ sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(::com::sun:
return sal_True;
}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
// global function
Reference<XSingleServiceFactory > SAL_CALL createSingleFactory(
const Reference<XMultiServiceFactory > & rServiceManager,
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 672a7f1..18e10a7 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -47,10 +47,6 @@ using namespace com::sun::star::lang;
namespace cppu
{
-
-//===================================================================
-//===================================================================
-//===================================================================
/**
* Reallocate the sequence.
*/
@@ -80,17 +76,10 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq,
rSeq = aDestSeq;
}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
#ifdef _MSC_VER
#pragma warning( disable: 4786 )
#endif
-//===================================================================
-//===================================================================
-//===================================================================
OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ )
SAL_THROW( () )
: rCont( rCont_ )
@@ -171,11 +160,6 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () )
}
}
-//===================================================================
-//===================================================================
-//===================================================================
-
-
OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW( () )
: rMutex( rMutex_ )
, bInUse( sal_False )
@@ -367,10 +351,6 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () )
aGuard.clear();
}
-//##################################################################################################
-//##################################################################################################
-//##################################################################################################
-
// specialized class for type
typedef ::std::vector< std::pair < Type , void* > > t_type2ptr;
@@ -539,11 +519,6 @@ void OMultiTypeInterfaceContainerHelper::clear()
}
}
-
-//##################################################################################################
-//##################################################################################################
-//##################################################################################################
-
// specialized class for long
typedef ::std::vector< std::pair < sal_Int32 , void* > > t_long2ptr;
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 3f86a21..85179f1 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -386,14 +386,6 @@ OUString ODataStreamTest_getImplementationName( int i) throw ()
}
}
-
-/**------------------------------------------------------
-*
-*
-*
-*
-*
-*------------------------------------------------------*/
class MyPersistObject : public WeakImplHelper2< XPersistObject , XPropertySet >
{
public:
@@ -657,9 +649,6 @@ OUString OMyPersistObject_getImplementationName( ) throw ()
return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.io.PersistTest" ) );
}
-
-// ---------------------------------------------
-// -----------------------------------------------
class OObjectStreamTest :
public ODataStreamTest
{
diff --git a/remotebridges/source/bridge/remote_bridge.cxx b/remotebridges/source/bridge/remote_bridge.cxx
index 1d2af80..27f2155 100644
--- a/remotebridges/source/bridge/remote_bridge.cxx
+++ b/remotebridges/source/bridge/remote_bridge.cxx
@@ -388,9 +388,6 @@ namespace remotebridges_bridge
m->dispose();
}
- //---------------------------------
- //
- //---------------------------------
Reference< XInterface > SAL_CALL CreateInstance( const Reference< XComponentContext > &)
{
return Reference< XInterface > ( ( OWeakObject * ) new ORemoteBridge );
diff --git a/sal/osl/os2/pipeimpl.cxx b/sal/osl/os2/pipeimpl.cxx
index 4961c1b..f8a5acd 100644
--- a/sal/osl/os2/pipeimpl.cxx
+++ b/sal/osl/os2/pipeimpl.cxx
@@ -121,10 +121,6 @@ public:
virtual Pipe *AcceptConnection();
};
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::CreatePipeDataMapping( LPCTSTR lpName )
{
HANDLE hMapping = NULL;
@@ -187,10 +183,6 @@ HANDLE Pipe::CreatePipeDataMapping( LPCTSTR lpName )
return hMapping;
}
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::OpenPipeDataMapping( LPCTSTR lpName )
{
HANDLE hMapping = NULL;
@@ -207,10 +199,6 @@ HANDLE Pipe::OpenPipeDataMapping( LPCTSTR lpName )
return hMapping;
}
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
{
HANDLE hMutex = NULL;
@@ -227,10 +215,6 @@ HANDLE Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
return hMutex;
}
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumCount )
{
HANDLE hSemaphore = NULL;
diff --git a/sal/osl/w32/pipeimpl.cxx b/sal/osl/w32/pipeimpl.cxx
index a7ee4bb..c7cb159 100644
--- a/sal/osl/w32/pipeimpl.cxx
+++ b/sal/osl/w32/pipeimpl.cxx
@@ -151,10 +151,6 @@ public:
virtual Pipe *AcceptConnection();
};
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::CreatePipeDataMapping( LPCTSTR lpName )
{
HANDLE hMapping = NULL;
@@ -217,10 +213,6 @@ HANDLE Pipe::CreatePipeDataMapping( LPCTSTR lpName )
return hMapping;
}
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::OpenPipeDataMapping( LPCTSTR lpName )
{
HANDLE hMapping = NULL;
@@ -237,10 +229,6 @@ HANDLE Pipe::OpenPipeDataMapping( LPCTSTR lpName )
return hMapping;
}
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
{
HANDLE hMutex = NULL;
@@ -257,10 +245,6 @@ HANDLE Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
return hMutex;
}
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumCount )
{
HANDLE hSemaphore = NULL;
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index 3549d3b..a72c51e 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -26,9 +26,6 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_CONST_H_
#define _RTL_STRING_CONST_H_
@@ -36,14 +33,8 @@
#include <rtl_String_Utils.hxx>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <limits.h>
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
@@ -56,28 +47,16 @@
#include <rtl/ustring.h>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
extern "C"
{
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_US;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS;
static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Char *kTestStr1 = "Sun Microsystems";
static const sal_Char *kTestStr2 = "Sun Microsystems Java Technology";
static const sal_Char *kTestStr3 = "Sun microsystems";
@@ -139,9 +118,6 @@ static const sal_Char *kTestStr143 = "Sun \377";
static const sal_Char *kTestStr144 = "\377";
static const sal_Char *kTestStr145 = "\50\3\5\7\11\13\15\17sun\377";
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int32 kTestStr1Len = 16;
static const sal_Int32 kTestStr2Len = 32;
static const sal_Int32 kTestStr3Len = 16;
@@ -315,8 +291,6 @@ static const sal_Int32 kTestStr170Len = 27;
static const sal_Int32 kTestStr171Len = 27;
static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
static const sal_Int32 uTestStr1Len = 16;
static const sal_Int32 uTestStr2Len = 32;
static const sal_Int32 uTestStr3Len = 16;
@@ -324,34 +298,19 @@ static const sal_Int32 uTestStr4Len = 16;
static const sal_Int32 uTestStr5Len = 16;
static const sal_Int32 uTestStr9Len = 32;
static const sal_Int32 uTestStr22Len = 32;
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
const sal_Unicode uTestStr31[]= {0x400,0x410,0x4DF};
const sal_Unicode uTestStr32[]= {0x9F9F,0xA000,0x8F80,0x9AD9};
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int32 uTestStr31Len = 3;
static const sal_Int32 uTestStr32Len = 4;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int16 kRadixBinary = 2;
static const sal_Int16 kRadixOctol = 8;
static const sal_Int16 kRadixDecimal = 10;
static const sal_Int16 kRadixHexdecimal = 16;
static const sal_Int16 kRadixBase36 = 36;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int8 kSInt8Max = SCHAR_MAX;
static const sal_Int16 kUInt8Max = UCHAR_MAX;
static const sal_Int16 kSInt16Max = SHRT_MAX;
@@ -385,9 +344,6 @@ static const sal_Int64 kInt64MaxNums[kInt64MaxNumsCount] =
kSInt64Max
};
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int32 kBinaryNumsCount = 16;
static const sal_Int32 kBinaryMaxNumsCount = 7;
@@ -416,8 +372,6 @@ static const sal_Int32 kBase36NumsCount = 36;
static const sal_Int32 kBase36MaxNumsCount = 7;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
static const sal_Int32 nDoubleCount=24;
static const double expValDouble[nDoubleCount]=
{
@@ -550,9 +504,6 @@ static const sal_Int32 kNonSInt16Max = SHRT_MIN;
}
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#endif /* _RTL_STRING_CONST_H_ */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index d0b1e67..0713133 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -29,15 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sal.hxx"
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <math.h>
#include <stdlib.h>
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
@@ -50,16 +44,10 @@
#include <rtl/string.hxx>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_UTILS_CONST_H_
#include <rtl_String_Utils_Const.h>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
using namespace rtl;
sal_uInt32 AStringLen( const sal_Char *pAStr )
@@ -277,11 +265,6 @@ sal_Bool AStringToDoubleCompare ( const sal_Char *pStr,
return cmp;
} // AStringToDoubleCompare
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
sal_uInt32 UStringLen( const sal_Unicode *pUStr )
{
sal_uInt32 nUStrLen = 0;
@@ -611,7 +594,4 @@ sal_Bool AStringToUStringNCopy( sal_Unicode *pDest,
return bCopied;
} // AStringToUStringNCopy
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
index 25261c9..d9770d3 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
@@ -26,23 +26,14 @@
*
#*************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_UTILS_HXX_
#define _RTL_STRING_UTILS_HXX_
#ifdef __cplusplus
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <math.h>
#include <stdlib.h>
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
@@ -55,8 +46,6 @@
#include <rtl/string.hxx>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
sal_Char* cpystr( sal_Char* dst, const sal_Char* src );
sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
@@ -124,9 +113,6 @@ sal_Bool AStringToUStringNCopy( sal_Unicode *pDest,
const sal_uInt32 nSrcLen
);
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#endif /* __cplusplus */
#endif /* _RTL_STRING_UTILS_HXX */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index af12c91..f6488ad 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -26,30 +26,18 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_UTILS_CONST_H_
#define _RTL_STRING_UTILS_CONST_H_
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
extern "C"
{
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int32 kErrCompareAStringToUString = -2;
static const sal_Int32 kErrCompareNAStringToUString = -3;
static const sal_Int32 kErrCompareAStringToRTLUString = -4;
@@ -59,16 +47,10 @@ static const sal_Int32 kErrAStringToByteStringNCompare = -7;
static const sal_Int32 kErrCompareAStringToString = -8;
static const sal_Int32 kErrCompareNAStringToString = -9;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
}
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#endif /* _RTL_STRING_UTILS_CONST_H_ */
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index e7c5a30..22b0853 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -26,15 +26,9 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _OSL_CONDITION_CONST_H_
#define _OSL_CONDITION_CONST_H_
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 6e9542e..50aa2e9 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -26,14 +26,9 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _OSL_FILE_CONST_H_
#define _OSL_FILE_CONST_H_
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -43,12 +38,6 @@
#include <rtl/ustring.hxx>
#include <rtl/uri.hxx>
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
#ifdef __cplusplus
extern "C"
{
@@ -228,18 +217,10 @@ OSLTEST_DECLARE( VolURL5, FILE_PREFIX "c:/temp" );
OSLTEST_DECLARE( VolURL6, FILE_PREFIX "e:/" );
#endif
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
}
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
#endif /* _OSL_FILE_CONST_H_ */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index a95619a..b235c8b 100644
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -26,15 +26,9 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _OSL_MUTEX_CONST_H_
#define _OSL_MUTEX_CONST_H_
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index 60226c6..4d444a8 100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -26,14 +26,9 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _OSL_SOCKET_CONST_H_
#define _OSL_SOCKET_CONST_H_
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
#include <sal/types.h>
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
@@ -59,9 +54,6 @@
const char * pTestString1 = "test socket";
const char * pTestString2 = " Passed#OK";
-//define read count
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
#ifdef __cplusplus
extern "C"
@@ -183,17 +175,10 @@ OSLTEST_DECLARE( HostIpZero, "0.0.0.0" );
//------------------------------------------------------------------------
OSLTEST_DECLARE( NullURL, "" );
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
}
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
#endif /* _OSL_SOCKET_CONST_H_ */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index 4eefb70..69153f2 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -26,14 +26,9 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _OSL_SOCKET_CONST_H_
#define _OSL_SOCKET_CONST_H_
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
#include <sal/types.h>
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
@@ -59,9 +54,6 @@
const char * pTestString1 = "test socket";
const char * pTestString2 = " Passed#OK";
-//define read count
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
#ifdef __cplusplus
extern "C"
@@ -187,17 +179,10 @@ OSLTEST_DECLARE( HostIpZero, "0.0.0.0" );
//------------------------------------------------------------------------
OSLTEST_DECLARE( NullURL, "" );
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
}
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
#endif /* _OSL_SOCKET_CONST_H_ */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index a3f0b5d..8190256 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -976,8 +976,7 @@ namespace osl_StreamSocket
// LLA: asAcceptorSocket.close();
// LLA: }
// LLA: }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
/** Client Socket Thread, served as a temp little client to communicate with server.
*/
diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx b/sal/qa/rtl_strings/rtl_OUString.cxx
index 218db1b..5eb38fb 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -37,8 +37,6 @@
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
#include <osl/thread.h>
#include <rtl_String_Const.h>
#include <rtl_String_Utils.hxx>
diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h
index c59e0ff..899b5fa 100644
--- a/sal/qa/rtl_strings/rtl_String_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Const.h
@@ -26,9 +26,6 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_CONST_H_
#define _RTL_STRING_CONST_H_
@@ -36,14 +33,8 @@
#include <rtl_String_Utils.hxx>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <limits.h>
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
@@ -56,28 +47,16 @@
#include <rtl/ustring.h>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
extern "C"
{
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_US;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS;
static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Char *kTestStr1 = "Sun Microsystems";
static const sal_Char *kTestStr2 = "Sun Microsystems Java Technology";
static const sal_Char *kTestStr3 = "Sun microsystems";
@@ -137,8 +116,6 @@ static const sal_Char *kTestStr56 = "\50\3\5\7\11\13\15\17suns";
//static const sal_Char *kTestStr57 = "\50\3\5\7\11\13\15\17sun\77777";
//static const sal_Char *kTestStr58 = "\50\3\5\7\11\13\15\17sun\10000";
static const sal_Char *kTestStr1PlusStr6 = "Sun Microsystems" "Java Technology";
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
static const sal_Int32 kTestStr1Len = 16;
static const sal_Int32 kTestStr2Len = 32;
@@ -200,8 +177,6 @@ static const sal_Int32 kTestStr57Len = 12;
static const sal_Int32 kTestStr58Len = 12;
static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
static sal_Unicode aUStr1[kTestStr1Len+1];
static sal_Unicode aUStr2[kTestStr2Len+1];
static sal_Unicode aUStr3[kTestStr3Len+1];
@@ -400,34 +375,19 @@ static const sal_Int32 uTestStr4Len = 16;
static const sal_Int32 uTestStr5Len = 16;
static const sal_Int32 uTestStr9Len = 32;
static const sal_Int32 uTestStr22Len = 32;
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
const sal_Unicode uTestStr31[]= {0x400,0x410,0x4DF};
const sal_Unicode uTestStr32[]= {0x9F9F,0xA000,0x8F80,0x9AD9};
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int32 uTestStr31Len = 3;
static const sal_Int32 uTestStr32Len = 4;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int16 kRadixBinary = 2;
static const sal_Int16 kRadixOctol = 8;
static const sal_Int16 kRadixDecimal = 10;
static const sal_Int16 kRadixHexdecimal = 16;
static const sal_Int16 kRadixBase36 = 36;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int8 kSInt8Max = SCHAR_MAX;
static const sal_Int16 kUInt8Max = UCHAR_MAX;
static const sal_Int16 kSInt16Max = SHRT_MAX;
@@ -460,9 +420,6 @@ static const sal_Int64 kInt64MaxNums[kInt64MaxNumsCount] =
kSInt64Max
};
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Char *kSInt8MaxBinaryStr = "1111111";
static const sal_Char *kUInt8MaxBinaryStr = "11111111";
static const sal_Char *kSInt16MaxBinaryStr = "111111111111111";
@@ -514,9 +471,6 @@ static const sal_Char *kSInt32MaxBase36Str = "zik0zj";
static const sal_Char *kUInt32MaxBase36Str = "1z141z3";
static const sal_Char *kSInt64MaxBase36Str = "1y2p0ij32e8e7";
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int32 kBinaryNumsCount = 16;
static const sal_Char *kBinaryNumsStr[kBinaryNumsCount] =
@@ -645,8 +599,6 @@ static const sal_Char *kBase36MaxNumsStr[kBase36MaxNumsCount] =
kSInt64MaxBase36Str
};
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
static const sal_Int32 nDoubleCount=24;
// static const sal_Char *inputDouble[nDoubleCount] =
// {
@@ -879,9 +831,6 @@ static const sal_Int32 kNonSInt16Max = SHRT_MIN;
}
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#endif /* _RTL_STRING_CONST_H_ */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index 16a49f6..f138c7c 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -29,15 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sal.hxx"
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <math.h>
#include <stdlib.h>
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
@@ -50,16 +44,10 @@
#include <rtl/string.hxx>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_UTILS_CONST_H_
#include <rtl_String_Utils_Const.h>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
using namespace rtl;
sal_uInt32 AStringLen( const sal_Char *pAStr )
@@ -255,11 +243,6 @@ sal_Bool AStringToDoubleCompare ( const sal_Char *pStr,
return cmp;
} // AStringToDoubleCompare
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
sal_uInt32 UStringLen( const sal_Unicode *pUStr )
{
sal_uInt32 nUStrLen = 0;
@@ -589,7 +572,4 @@ sal_Bool AStringToUStringNCopy( sal_Unicode *pDest,
return bCopied;
} // AStringToUStringNCopy
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx
index 52b6a37..be4083b 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.hxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx
@@ -26,23 +26,14 @@
*
#*************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_UTILS_HXX_
#define _RTL_STRING_UTILS_HXX_
#ifdef __cplusplus
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#include <math.h>
#include <stdlib.h>
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
@@ -55,8 +46,6 @@
#include <rtl/string.hxx>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
sal_Char* cpystr( sal_Char* dst, const sal_Char* src );
sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
@@ -123,9 +112,6 @@ sal_Bool AStringToUStringNCopy( sal_Unicode *pDest,
const sal_uInt32 nSrcLen
);
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#endif /* __cplusplus */
#endif /* _RTL_STRING_UTILS_HXX */
diff --git a/sal/qa/rtl_strings/rtl_String_Utils_Const.h b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
index af12c91..f6488ad 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
@@ -26,30 +26,18 @@
*
************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _RTL_STRING_UTILS_CONST_H_
#define _RTL_STRING_UTILS_CONST_H_
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
extern "C"
{
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
static const sal_Int32 kErrCompareAStringToUString = -2;
static const sal_Int32 kErrCompareNAStringToUString = -3;
static const sal_Int32 kErrCompareAStringToRTLUString = -4;
@@ -59,16 +47,10 @@ static const sal_Int32 kErrAStringToByteStringNCompare = -7;
static const sal_Int32 kErrCompareAStringToString = -8;
static const sal_Int32 kErrCompareNAStringToString = -9;
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#ifdef __cplusplus
}
#endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
#endif /* _RTL_STRING_UTILS_CONST_H_ */
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 7f22ac2..412826d 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -312,9 +312,6 @@ inline void EnsureNoFinalSlash (rtl::OUString & url)
}
}
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
struct Bootstrap_Impl
{
sal_Int32 _nRefCount;
@@ -604,9 +601,6 @@ void Bootstrap_Impl::expandValue(
requestFile, requestKey, requestStack)).pData);
}
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
namespace {
struct bootstrap_map {
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
index 19d6000..35a0ebc 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
@@ -45,11 +45,6 @@
#include <ole2.h>
#include <objidl.h>
-
-//------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------
-
class EnumFormatEtc;
class CXTDataObject : public IDataObject
@@ -99,10 +94,6 @@ private:
friend class CEnumFormatEtc;
};
-//------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------
-
class CEnumFormatEtc : public IEnumFORMATETC
{
public:
diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx
index 05eae56..2f16020 100644
--- a/sal/workben/t_osl_getVolInfo.cxx
+++ b/sal/workben/t_osl_getVolInfo.cxx
@@ -48,11 +48,7 @@
# define TEST_PATH_5 "/net/athene/export/home/tra/projects"
# define TEST_PATH_6 "/blah"
#endif
-
-//------------------------------
-//
-//------------------------------
-
+
void test_getVolumeInformation(const rtl::OUString& path_url)
{
oslVolumeInfo vi;
@@ -78,10 +74,6 @@ void test_getVolumeInformation(const rtl::OUString& path_url)
err == osl_File_E_None
);
}
-
-//------------------------------
-//
-//------------------------------
class TestClass_osl_getVolumeInformation : public CppUnit::TestFixture
{
diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx
index 1476727..abfbba5 100644
--- a/sal/workben/t_osl_joinProcess.cxx
+++ b/sal/workben/t_osl_joinProcess.cxx
@@ -42,10 +42,6 @@
#endif
const rtl::OUString CWD = rtl::OUString::createFromAscii(".");
-
-//------------------------------
-//
-//------------------------------
class Test_osl_Process : public CppUnit::TestFixture
{
More information about the Libreoffice-commits
mailing list