diff options
26 files changed, 1 insertions, 401 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 0902fd98deb2..dbd005a2d680 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 ab23cf7a1d9e..b0d5fcbface9 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 53a06f3112c9..b7c141e425ac 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 94e4cbdf48bc..6b1f5c59e556 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 d29412f2d2cf..f63a418c3d50 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 0ec2ba7f2887..aba0dd370e99 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 ad661fb5744d..9fa2bc85e5fb 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 2a93e754af3b..7b9ad1c83f07 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; @@ -325,33 +299,18 @@ 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 b87d8c7e91a2..c7809e574744 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 ad671417c63a..87c97174b71b 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 36a35593deab..8af53eeab65d 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 1f018be86223..102a59aeb79c 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 150dd6071c42..499303697b5f 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 e11685b163c2..59c83c40eb87 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 6d22bf03904b..67840f41c3bc 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 a0dce812e583..17be3cc6f8bc 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 e9a785692e44..939c01b24a04 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 47930f2412d1..bb00fd3e5544 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 1a65f8c9fe6a..37128465acb6 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]; @@ -401,33 +376,18 @@ 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 7eef86564159..2b0d3c5ba3fa 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 cf6817a7fb8b..7c059ae57f27 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 36a35593deab..8af53eeab65d 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 f303a81dd8d9..7709dfc7d6f1 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 e6b68408e62a..213247c1e6b2 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 a57a414730b1..8b6e929156ae 100644 --- a/sal/workben/t_osl_getVolInfo.cxx +++ b/sal/workben/t_osl_getVolInfo.cxx @@ -49,10 +49,6 @@ # define TEST_PATH_6 "/blah" #endif -//------------------------------ -// -//------------------------------ - void test_getVolumeInformation(const rtl::OUString& path_url) { oslVolumeInfo vi; @@ -79,10 +75,6 @@ void test_getVolumeInformation(const rtl::OUString& path_url) ); } -//------------------------------ -// -//------------------------------ - class TestClass_osl_getVolumeInformation : public CppUnit::TestFixture { public: diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx index 5866bcafb98a..2202040ae673 100644 --- a/sal/workben/t_osl_joinProcess.cxx +++ b/sal/workben/t_osl_joinProcess.cxx @@ -43,10 +43,6 @@ const rtl::OUString CWD = rtl::OUString::createFromAscii("."); -//------------------------------ -// -//------------------------------ - class Test_osl_Process : public CppUnit::TestFixture { public: |