diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:51:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 05:35:12 -0600 |
| commit | 4133c3e6ff31b63d6ea3e426f4e8715bf7895a86 (patch) | |
| tree | 8723b297da9a03403ac1c08f7082bdd3fd4c6fe8 /sal | |
| parent | f586542c3d3e5fda3a73c736ceaee3719859942d (diff) | |
Remove visual noise from sal
Change-Id: Idf07c7d31c0a523f929aded9ff3183a3f01b16b9
Reviewed-on: https://gerrit.libreoffice.org/8297
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sal')
39 files changed, 391 insertions, 391 deletions
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index 71abf0071932..b82eb8cbad14 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -23,9 +23,9 @@ #include <osl/diagnose.h> #include <rtl/alloc.h> -// ======================================================================= + // AllocatorTraits -// ======================================================================= + namespace { @@ -70,7 +70,7 @@ struct AllocatorTraits } }; -// ======================================================================= + struct VectorTraits : public AllocatorTraits { @@ -95,9 +95,9 @@ const AllocatorTraits::signature_type ScalarTraits::g_signature = "new() "; } // anonymous namespace -// ======================================================================= + // Allocator -// ======================================================================= + static void default_handler (void) { @@ -105,7 +105,7 @@ static void default_handler (void) throw std::bad_alloc(); } -// ======================================================================= + static void* allocate ( std::size_t n, AllocatorTraits const & rTraits) @@ -128,7 +128,7 @@ static void* allocate ( } } -// ======================================================================= + static void* allocate_nothrow ( std::size_t n, AllocatorTraits const & rTraits) @@ -144,7 +144,7 @@ static void* allocate_nothrow ( } } -// ======================================================================= + static void deallocate (void * p, AllocatorTraits const & rTraits) SAL_THROW(()) @@ -155,70 +155,70 @@ static void deallocate (void * p, AllocatorTraits const & rTraits) } } -// ======================================================================= + // T * p = new T; delete p; -// ======================================================================= + void* SAL_CALL operator new (std::size_t n) throw (std::bad_alloc) { return allocate (n, ScalarTraits()); } -// ======================================================================= + void SAL_CALL operator delete (void * p) throw () { deallocate (p, ScalarTraits()); } -// ======================================================================= + // T * p = new(nothrow) T; delete(nothrow) p; -// ======================================================================= + void* SAL_CALL operator new (std::size_t n, std::nothrow_t const &) throw () { return allocate_nothrow (n, ScalarTraits()); } -// ======================================================================= + void SAL_CALL operator delete (void * p, std::nothrow_t const &) throw () { deallocate (p, ScalarTraits()); } -// ======================================================================= + // T * p = new T[n]; delete[] p; -// ======================================================================= + void* SAL_CALL operator new[] (std::size_t n) throw (std::bad_alloc) { return allocate (n, VectorTraits()); } -// ======================================================================= + void SAL_CALL operator delete[] (void * p) throw () { deallocate (p, VectorTraits()); } -// ======================================================================= + // T * p = new(nothrow) T[n]; delete(nothrow)[] p; -// ======================================================================= + void* SAL_CALL operator new[] (std::size_t n, std::nothrow_t const &) throw () { return allocate_nothrow (n, VectorTraits()); } -// ======================================================================= + void SAL_CALL operator delete[] (void * p, std::nothrow_t const &) throw () { deallocate (p, VectorTraits()); } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c index 96d752546be2..79dbf6734fbe 100644 --- a/sal/osl/w32/dllentry.c +++ b/sal/osl/w32/dllentry.c @@ -35,9 +35,9 @@ #include "internal/rtllifecycle.h" -//------------------------------------------------------------------------------ + // externals -//------------------------------------------------------------------------------ + extern DWORD g_dwTLSTextEncodingIndex; extern void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void); @@ -304,7 +304,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) { // No error check, it works or it does not // Thread should only be started for headless mode, see desktop/win32/source/officeloader.cxx - CreateThread( NULL, 0, ParentMonitorThreadProc, (LPVOID)dwParentProcessId, 0, &dwThreadId ); // + CreateThread( NULL, 0, ParentMonitorThreadProc, (LPVOID)dwParentProcessId, 0, &dwThreadId ); } } diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 30a4f550a1f5..dcea2fb3f5c5 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -50,9 +50,9 @@ #undef min #endif -//################################################################## + // File handle implementation -//################################################################## + struct FileHandle_Impl { CRITICAL_SECTION m_mutex; @@ -651,9 +651,9 @@ oslFileError FileHandle_Impl::syncFile() return (result); } -//################################################################## + // File I/O functions -//################################################################## + extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle ( @@ -694,7 +694,7 @@ SAL_CALL osl_createFileHandleFromOSHandle ( return (oslFileHandle)(pImpl); } -//############################################# + oslFileError SAL_CALL osl_openFile( rtl_uString * strPath, @@ -735,7 +735,7 @@ SAL_CALL osl_openFile( return (result); } -//############################################# + oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle) { @@ -755,7 +755,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_getFileOSHandle( oslFileHandle Handle, @@ -771,7 +771,7 @@ SAL_CALL osl_getFileOSHandle( return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_closeFile(oslFileHandle Handle) { @@ -798,7 +798,7 @@ SAL_CALL osl_closeFile(oslFileHandle Handle) return (result); } -//############################################# + oslFileError SAL_CALL osl_mapFile( oslFileHandle Handle, @@ -871,7 +871,7 @@ SAL_CALL osl_mapFile( return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */) { @@ -884,14 +884,14 @@ SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */) return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_unmapMappedFile(oslFileHandle /* Handle */, void* pAddr, sal_uInt64 uLength) { return osl_unmapFile( pAddr, uLength ); } -//############################################# + oslFileError SAL_CALL osl_readLine( oslFileHandle Handle, @@ -911,7 +911,7 @@ SAL_CALL osl_readLine( return (result); } -//############################################# + oslFileError SAL_CALL osl_readFile( oslFileHandle Handle, @@ -932,7 +932,7 @@ SAL_CALL osl_readFile( return (result); } -//############################################# + oslFileError SAL_CALL osl_writeFile( oslFileHandle Handle, @@ -954,7 +954,7 @@ SAL_CALL osl_writeFile( return (result); } -//############################################# + oslFileError SAL_CALL osl_readFileAt( oslFileHandle Handle, @@ -980,7 +980,7 @@ SAL_CALL osl_readFileAt( return pImpl->readFileAt (nOffset, pBuffer, uBytesRequested, pBytesRead); } -//############################################# + oslFileError SAL_CALL osl_writeFileAt( oslFileHandle Handle, @@ -1006,7 +1006,7 @@ SAL_CALL osl_writeFileAt( return pImpl->writeFileAt (nOffset, pBuffer, uBytesToWrite, pBytesWritten); } -//############################################# + oslFileError SAL_CALL osl_isEndOfFile (oslFileHandle Handle, sal_Bool *pIsEOF) { @@ -1020,7 +1020,7 @@ SAL_CALL osl_isEndOfFile (oslFileHandle Handle, sal_Bool *pIsEOF) return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos) { @@ -1033,7 +1033,7 @@ SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos) return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset) { @@ -1077,7 +1077,7 @@ SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset return pImpl->setPos (nPos + nOffset); } -//############################################# + oslFileError SAL_CALL osl_getFileSize (oslFileHandle Handle, sal_uInt64 *pSize) { @@ -1091,7 +1091,7 @@ SAL_CALL osl_getFileSize (oslFileHandle Handle, sal_uInt64 *pSize) return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_setFileSize (oslFileHandle Handle, sal_uInt64 uSize) { @@ -1115,11 +1115,11 @@ SAL_CALL osl_setFileSize (oslFileHandle Handle, sal_uInt64 uSize) return pImpl->setSize (uSize); } -//################################################################## + // File handling functions -//################################################################## -//############################################# + + oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath ) { rtl_uString *strSysPath = NULL; @@ -1137,7 +1137,7 @@ oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath ) return error; } -//############################################# + oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPath ) { rtl_uString *strSysPath = NULL, *strSysDestPath = NULL; @@ -1165,7 +1165,7 @@ oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPa return error; } -//############################################# + oslFileError SAL_CALL osl_moveFile( rtl_uString* strPath, rtl_uString *strDestPath ) { rtl_uString *strSysPath = NULL, *strSysDestPath = NULL; diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 071e29447176..2f598720e787 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -39,12 +39,12 @@ #include <ctype.h> #endif -//##################################################### + static const wchar_t UNC_PREFIX[] = L"\\\\"; static const wchar_t BACKSLASH = '\\'; static const wchar_t SLASH = '/'; -//##################################################### + extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime) { SYSTEMTIME BaseSysTime; @@ -77,7 +77,7 @@ extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime return fSuccess; } -//##################################################### + extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal) { SYSTEMTIME BaseSysTime; @@ -108,10 +108,10 @@ extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal return fSuccess; } -//##################################################### + namespace /* private */ { - //##################################################### + struct Component { Component() : @@ -125,7 +125,7 @@ namespace /* private */ const sal_Unicode* end_; }; - //##################################################### + struct UNCComponents { Component server_; @@ -133,15 +133,15 @@ namespace /* private */ Component resource_; }; - //##################################################### + inline bool is_UNC_path(const sal_Unicode* path) { return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast<LPCWSTR>(path), SAL_N_ELEMENTS(UNC_PREFIX) - 1)); } - //##################################################### + inline bool is_UNC_path(const rtl::OUString& path) { return is_UNC_path(path.getStr()); } - //##################################################### + void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc) { OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path"); @@ -178,12 +178,12 @@ namespace /* private */ "Postcondition violated: Invalid UNC path detected"); } - //##################################################### + void parse_UNC_path(const rtl::OUString& path, UNCComponents* puncc) { parse_UNC_path(path.getStr(), puncc); } - //##################################################### + bool has_path_parent(const sal_Unicode* path) { // Has the given path a parent or are we already there, @@ -203,17 +203,17 @@ namespace /* private */ return has_parent; } - //##################################################### + inline bool has_path_parent(const rtl::OUString& path) { return has_path_parent(path.getStr()); } } // end namespace private -//##################################################### + // volume handling functions -//##################################################### -//##################################################### + + oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle ) { if ( Handle ) @@ -225,7 +225,7 @@ oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handl return osl_File_E_INVAL; } -//##################################################### + oslFileError SAL_CALL osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle ) { if ( Handle ) @@ -237,7 +237,7 @@ oslFileError SAL_CALL osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handl return osl_File_E_INVAL; } -//##################################################### + oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath ) { if ( Handle && pstrPath ) @@ -249,9 +249,9 @@ oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle return osl_File_E_INVAL; } -//################################################################## + // directory handling functions -//################################################################## + #define DIRECTORYITEM_DRIVE 0 #define DIRECTORYITEM_FILE 1 @@ -269,7 +269,7 @@ struct DirectoryItem_Impl int nRefCount; }; -//##################################################### + #define DIRECTORYTYPE_LOCALROOT 0 #define DIRECTORYTYPE_NETROOT 1 @@ -285,7 +285,7 @@ struct Directory_Impl rtl_uString* m_pDirectoryPath; }; -//##################################################### + typedef struct tagDRIVEENUM { @@ -294,7 +294,7 @@ typedef struct tagDRIVEENUM LPCTSTR lpCurrent; } DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM; -//##################################################### + static HANDLE WINAPI OpenLogicalDrivesEnum(void) { @@ -317,7 +317,7 @@ static HANDLE WINAPI OpenLogicalDrivesEnum(void) return pEnum ? (HANDLE)pEnum : INVALID_HANDLE_VALUE; } -//##################################################### + static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer) { BOOL fSuccess = FALSE; @@ -342,7 +342,7 @@ static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer) return fSuccess; } -//##################################################### + static BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum) { BOOL fSuccess = FALSE; @@ -359,14 +359,14 @@ static BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum) return fSuccess; } -//##################################################### + typedef struct tagDIRECTORY { HANDLE hFind; WIN32_FIND_DATA aFirstData; } DIRECTORY, *PDIRECTORY, FAR *LPDIRECTORY; -//##################################################### + static HANDLE WINAPI OpenDirectory( rtl_uString* pPath) { LPDIRECTORY pDirectory = NULL; @@ -413,7 +413,7 @@ static HANDLE WINAPI OpenDirectory( rtl_uString* pPath) return (HANDLE)pDirectory; } -//##################################################### + BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData) { BOOL fSuccess = FALSE; @@ -449,7 +449,7 @@ BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData) return fSuccess; } -//##################################################### + static BOOL WINAPI CloseDirectory(HANDLE hDirectory) { BOOL fSuccess = FALSE; @@ -468,7 +468,7 @@ static BOOL WINAPI CloseDirectory(HANDLE hDirectory) return fSuccess; } -//##################################################### + static oslFileError osl_openLocalRoot( rtl_uString *strDirectoryPath, oslDirectory *pDirectory) { @@ -540,7 +540,7 @@ static oslFileError osl_openLocalRoot( return error; } -//##################################################### + static oslFileError SAL_CALL osl_openFileDirectory( rtl_uString *strDirectoryPath, oslDirectory *pDirectory) { @@ -593,7 +593,7 @@ static oslFileError SAL_CALL osl_openFileDirectory( return error; } -//##################################################### + static oslFileError SAL_CALL osl_openNetworkServer( rtl_uString *strSysDirPath, oslDirectory *pDirectory) { @@ -625,7 +625,7 @@ static oslFileError SAL_CALL osl_openNetworkServer( return oslTranslateFileError( dwError ); } -//############################################# + static DWORD create_dir_with_callback( rtl_uString * dir_path, oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, @@ -652,7 +652,7 @@ static DWORD create_dir_with_callback( return GetLastError(); } -//############################################# + static int path_make_parent(sal_Unicode* path) { /* Cut off the last part of the given path to @@ -671,7 +671,7 @@ static int path_make_parent(sal_Unicode* path) return (pos_last_backslash - path); } -//############################################# + static DWORD create_dir_recursively_( rtl_uString * dir_path, oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, @@ -702,7 +702,7 @@ static DWORD create_dir_recursively_( return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData); } -//############################################# + oslFileError SAL_CALL osl_createDirectoryPath( rtl_uString* aDirectoryUrl, oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, @@ -727,7 +727,7 @@ oslFileError SAL_CALL osl_createDirectoryPath( sys_path.pData, aDirectoryCreationCallbackFunc, pData)); } -//##################################################### + oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath) { rtl_uString *strSysPath = NULL; @@ -765,7 +765,7 @@ oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath) return error; } -//##################################################### + oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath) { rtl_uString *strSysPath = NULL; @@ -783,7 +783,7 @@ oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath) return error; } -//##################################################### + oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirectory *pDirectory) { oslFileError error; @@ -814,7 +814,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirect return error; } -//##################################################### + static oslFileError SAL_CALL osl_getNextNetResource( oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ ) { @@ -860,7 +860,7 @@ static oslFileError SAL_CALL osl_getNextNetResource( } } -//##################################################### + static oslFileError SAL_CALL osl_getNextDrive( oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ ) { @@ -902,7 +902,7 @@ static oslFileError SAL_CALL osl_getNextDrive( } } -//##################################################### + static oslFileError SAL_CALL osl_getNextFileItem( oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/) { @@ -951,7 +951,7 @@ static oslFileError SAL_CALL osl_getNextFileItem( } } -//##################################################### + oslFileError SAL_CALL osl_getNextDirectoryItem( oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint) { @@ -979,7 +979,7 @@ oslFileError SAL_CALL osl_getNextDirectoryItem( } } -//##################################################### + oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory) { Directory_Impl *pDirImpl = (Directory_Impl *)Directory; @@ -1017,7 +1017,7 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory) return eError; } -//##################################################### + /* Different types of paths */ typedef enum _PATHTYPE { @@ -1157,7 +1157,7 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector return error; } -//##################################################### + oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item ) { DirectoryItem_Impl *pItemImpl = (DirectoryItem_Impl *)Item; @@ -1169,7 +1169,7 @@ oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item ) return osl_File_E_None; } -//##################################################### + oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item ) { DirectoryItem_Impl *pItemImpl = (DirectoryItem_Impl *)Item; @@ -1211,19 +1211,19 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b) return sal_False; } -//##################################################### + // volume / file info handling functions -//##################################################### -//##################################################### + + static inline bool is_floppy_A_present() { return (GetLogicalDrives() & 1); } -//##################################################### + static inline bool is_floppy_B_present() { return (GetLogicalDrives() & 2); } -//##################################################### + bool is_floppy_volume_mount_point(const rtl::OUString& path) { // determines if a volume mount point shows to a floppy @@ -1251,7 +1251,7 @@ bool is_floppy_volume_mount_point(const rtl::OUString& path) return false; } -//################################################ + static bool is_floppy_drive(const rtl::OUString& path) { static const LPCWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb"); @@ -1266,7 +1266,7 @@ static bool is_floppy_drive(const rtl::OUString& path) return ((wcschr(FLOPPY_DRV_LETTERS, pszPath[0]) && (L':' == pszPath[1])) || is_floppy_volume_mount_point(path)); } -//##################################################### + static bool is_volume_mount_point(const rtl::OUString& path) { rtl::OUString p(path); @@ -1297,7 +1297,7 @@ static bool is_volume_mount_point(const rtl::OUString& path) return is_volume_root; } -//############################################# + static UINT get_volume_mount_point_drive_type(const rtl::OUString& path) { if (0 == path.getLength()) @@ -1313,13 +1313,13 @@ static UINT get_volume_mount_point_drive_type(const rtl::OUString& path) return DRIVE_NO_ROOT_DIR; } -//############################################# + static inline bool is_drivetype_request(sal_uInt32 field_mask) { return (field_mask & osl_VolumeInfo_Mask_Attributes); } -//############################################# + static oslFileError osl_get_drive_type( const rtl::OUString& path, oslVolumeInfo* pInfo) { @@ -1366,7 +1366,7 @@ static oslFileError osl_get_drive_type( return osl_File_E_None; } -//############################################# + static inline bool is_volume_space_info_request(sal_uInt32 field_mask) { return (field_mask & @@ -1375,7 +1375,7 @@ static inline bool is_volume_space_info_request(sal_uInt32 field_mask) osl_VolumeInfo_Mask_FreeSpace)); } -//############################################# + static void get_volume_space_information( const rtl::OUString& path, oslVolumeInfo *pInfo) { @@ -1394,7 +1394,7 @@ static void get_volume_space_information( } } -//############################################# + static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask) { return (field_mask & @@ -1404,7 +1404,7 @@ static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask) osl_VolumeInfo_Mask_FileSystemCaseHandling)); } -//############################################# + static oslFileError get_filesystem_attributes( const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo) { @@ -1458,7 +1458,7 @@ static oslFileError get_filesystem_attributes( return osl_File_E_None; } -//##################################################### + static bool path_get_parent(rtl::OUString& path) { OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes"); @@ -1475,7 +1475,7 @@ static bool path_get_parent(rtl::OUString& path) return false; } -//##################################################### + static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root) { rtl::OUString sys_path(system_path); @@ -1487,7 +1487,7 @@ static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OU osl::systemPathEnsureSeparator(volume_root); } -//############################################# + oslFileError SAL_CALL osl_getVolumeInformation( rtl_uString *ustrURL, oslVolumeInfo *pInfo, sal_uInt32 uFieldMask ) { @@ -1522,7 +1522,7 @@ oslFileError SAL_CALL osl_getVolumeInformation( return osl_File_E_None; } -//##################################################### + static oslFileError SAL_CALL osl_getDriveInfo( oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask) { @@ -1621,7 +1621,7 @@ static oslFileError SAL_CALL osl_getDriveInfo( return osl_File_E_None; } -//##################################################### + static oslFileError SAL_CALL osl_getServerInfo( oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask ) { @@ -1651,7 +1651,7 @@ static oslFileError SAL_CALL osl_getServerInfo( return osl_File_E_None; } -//############################################# + oslFileError SAL_CALL osl_getFileStatus( oslDirectoryItem Item, oslFileStatus *pStatus, @@ -1767,11 +1767,11 @@ oslFileError SAL_CALL osl_getFileStatus( return osl_File_E_None; } -//##################################################### + // file attributes handling functions -//##################################################### -//############################################# + + oslFileError SAL_CALL osl_setFileAttributes( rtl_uString *ustrFileURL, sal_uInt64 uAttributes ) @@ -1812,7 +1812,7 @@ oslFileError SAL_CALL osl_setFileAttributes( return error; } -//##################################################### + oslFileError SAL_CALL osl_setFileTime( rtl_uString *filePath, const TimeValue *aCreationTime, diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx index 233b56e62bee..c9a039a45d25 100644 --- a/sal/osl/w32/file_url.cxx +++ b/sal/osl/w32/file_url.cxx @@ -40,14 +40,14 @@ #define WSTR_LONG_PATH_PREFIX_UNC L"\\\\?\\UNC\\" -//################################################################## + // FileURL functions -//################################################################## + extern "C" oslMutex g_CurrentDirectoryMutex; /* Initialized in dllentry.c */ oslMutex g_CurrentDirectoryMutex = 0; -//##################################################### + static BOOL IsValidFilePathComponent( LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags) { @@ -223,7 +223,7 @@ static BOOL IsValidFilePathComponent( return fValid; } -//##################################################### + #define CHARSET_SEPARATOR TEXT("\\/") DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_uString **corrected) @@ -384,7 +384,7 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u return fValid ? dwPathType : PATHTYPE_ERROR; } -//##################################################### + static sal_Int32 PathRemoveFileSpec(LPTSTR lpPath, LPTSTR lpFileName, sal_Int32 nFileBufLen ) { sal_Int32 nRemoved = 0; @@ -420,7 +420,7 @@ static sal_Int32 PathRemoveFileSpec(LPTSTR lpPath, LPTSTR lpFileName, sal_Int32 return nRemoved; } -//##################################################### + // Undocumented in SHELL32.DLL ordinal 32 static LPTSTR PathAddBackslash(LPTSTR lpPath, sal_Int32 nBufLen) { @@ -440,7 +440,7 @@ static LPTSTR PathAddBackslash(LPTSTR lpPath, sal_Int32 nBufLen) return lpEndPath; } -//##################################################### + // Same as GetLongPathName but also 95/NT4 static DWORD GetCaseCorrectPathNameEx( LPTSTR lpszPath, // path buffer to convert @@ -526,7 +526,7 @@ static DWORD GetCaseCorrectPathNameEx( return _tcslen( lpszPath ); } -//##################################################### + DWORD GetCaseCorrectPathName( LPCTSTR lpszShortPath, // file name LPTSTR lpszLongPath, // path buffer @@ -560,7 +560,7 @@ DWORD GetCaseCorrectPathName( } -//############################################# + static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL ) { sal_Char *pBuffer; @@ -623,7 +623,7 @@ static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedUR return bValidEncoded; } -//############################################# + static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL ) { /* Encode non ascii characters within the URL */ @@ -692,7 +692,7 @@ static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL ) rtl_freeMemory( pszEncodedURL ); } -//############################################# + oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative ) { @@ -831,7 +831,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p return nError; } -//############################################# + oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL ) { oslFileError nError = osl_File_E_INVAL; /* Assume failure */ @@ -937,21 +937,21 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** return nError; } -//##################################################### + oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString* ustrPath, rtl_uString** pustrURL ) { return _osl_getFileURLFromSystemPath( ustrPath, pustrURL ); } -//##################################################### + oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrURL, rtl_uString **pustrPath) { return _osl_getSystemPathFromFileURL( ustrURL, pustrPath, sal_True ); } -//##################################################### + oslFileError SAL_CALL osl_searchFileURL( rtl_uString *ustrFileName, rtl_uString *ustrSystemSearchPath, @@ -1034,7 +1034,7 @@ oslFileError SAL_CALL osl_searchFileURL( return error; } -//##################################################### + oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL ) { @@ -1115,7 +1115,7 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr return eError; } -//##################################################### + oslFileError SAL_CALL osl_getCanonicalName( rtl_uString *strRequested, rtl_uString **strValid ) { rtl_uString_newFromString(strValid, strRequested); diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 5d2e5a0b752c..2b83d0c128b8 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -46,10 +46,10 @@ #include <string> #include <string.h> -//################################################# + extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile, sal_uInt32 uFlags ); -//################################################# + const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('='); const sal_Char* SPACE = " "; const rtl::OUString ENV_COMSPEC ("COMSPEC"); @@ -57,14 +57,14 @@ const rtl::OUString QUOTE("\""); namespace /* private */ { - //################################################# + typedef std::list<rtl::OUString> string_container_t; typedef string_container_t::iterator string_container_iterator_t; typedef string_container_t::const_iterator string_container_const_iterator_t; typedef std::pair<string_container_iterator_t, string_container_iterator_t> iterator_pair_t; typedef std::vector<sal_Unicode> environment_container_t; - //################################################# + /* Function object that compares two strings that are expected to be environment variables in the form "name=value". Only the 'name' part will be compared. @@ -90,7 +90,7 @@ namespace /* private */ } }; - //################################################# + /* Function object used by for_each algorithm to calculate the sum of the length of all strings in a string container. */ @@ -119,14 +119,14 @@ namespace /* private */ size_t sum_; }; - //################################################# + inline size_t calc_sum_of_string_lengths(const string_container_t& string_cont) { return std::for_each( string_cont.begin(), string_cont.end(), sum_of_string_lengths()); } - //################################################# + void read_environment(/*out*/ string_container_t* environment) { // GetEnvironmentStrings returns a sorted list, Windows @@ -142,7 +142,7 @@ namespace /* private */ FreeEnvironmentStrings(env); } - //################################################# + /* the environment list must be sorted, new values should either replace existing ones or should be added to the list, environment variables will @@ -184,7 +184,7 @@ namespace /* private */ return true; } - //################################################# + /* Create a merged environment */ bool setup_process_environment( rtl_uString* environment_vars[], @@ -221,7 +221,7 @@ namespace /* private */ return true; } - //########################################################## + /* In contrast to the Win32 API function CreatePipe with this function the caller is able to determine separately which handle of the pipe is inheritable. */ @@ -274,7 +274,7 @@ namespace /* private */ return bRet; } - //######################################################### + // Add a quote sign to the start and the end of a string // if not already present rtl::OUString quote_string(const rtl::OUString& string) @@ -324,7 +324,7 @@ namespace /* private */ } return ret; } - //########################################################## + // Returns the system path of the executable which can either // be provided via the strImageName parameter or as first // element of the strArguments list. @@ -358,7 +358,7 @@ namespace /* private */ return exe_path; } - //########################################################## + rtl::OUString get_file_extension(const rtl::OUString& file_name) { sal_Int32 index = file_name.lastIndexOf('.'); @@ -368,7 +368,7 @@ namespace /* private */ return rtl::OUString(); } - //########################################################## + bool is_batch_file(const rtl::OUString& file_name) { rtl::OUString ext = get_file_extension(file_name); @@ -377,7 +377,7 @@ namespace /* private */ ext.equalsIgnoreAsciiCase("btm")); } - //########################################################## + rtl::OUString get_batch_processor() { rtl::OUString comspec; @@ -395,7 +395,7 @@ namespace /* private */ } // namespace private -//################################################# + oslProcessError SAL_CALL osl_executeProcess( rtl_uString *strImageName, rtl_uString *strArguments[], @@ -421,7 +421,7 @@ oslProcessError SAL_CALL osl_executeProcess( NULL, NULL, NULL ); } -//################################################# + oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( rtl_uString *ustrImageName, rtl_uString *ustrArguments[], diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx index d85410316b8f..422ad27ee98c 100644 --- a/sal/osl/w32/tempfile.cxx +++ b/sal/osl/w32/tempfile.cxx @@ -32,7 +32,7 @@ #include <malloc.h> #include <tchar.h> -//##################################################### + // Allocate n number of t's on the stack return a pointer to it in p #ifdef __MINGW32__ #define STACK_ALLOC(p, t, n) (p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t))); @@ -43,9 +43,9 @@ extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(HANDLE hFile, sal_uInt32 uFlags); -//##################################################### + // Temp file functions -//##################################################### + static oslFileError osl_setup_base_directory_impl_( rtl_uString* pustrDirectoryURL, @@ -75,7 +75,7 @@ static oslFileError osl_setup_base_directory_impl_( return error; } -//##################################################### + static oslFileError osl_setup_createTempFile_impl_( rtl_uString* pustrDirectoryURL, oslFileHandle* pHandle, @@ -102,7 +102,7 @@ static oslFileError osl_setup_createTempFile_impl_( return osl_error; } -//##################################################### + static oslFileError osl_win32_GetTempFileName_impl_( rtl_uString* base_directory, LPWSTR temp_file_name) { @@ -120,7 +120,7 @@ static oslFileError osl_win32_GetTempFileName_impl_( return osl_error; } -//##################################################### + static sal_Bool osl_win32_CreateFile_impl_( LPCWSTR file_name, sal_Bool b_delete_on_close, oslFileHandle* p_handle) { @@ -148,7 +148,7 @@ static sal_Bool osl_win32_CreateFile_impl_( return (sal_Bool)IsValidHandle(hFile); } -//############################################# + static oslFileError osl_createTempFile_impl_( rtl_uString* base_directory, LPWSTR tmp_name, @@ -181,7 +181,7 @@ static oslFileError osl_createTempFile_impl_( return osl_error; } -//############################################# + oslFileError SAL_CALL osl_createTempFile( rtl_uString* pustrDirectoryURL, oslFileHandle* pHandle, @@ -225,7 +225,7 @@ oslFileError SAL_CALL osl_createTempFile( return osl_error; } -//############################################# + oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** pustrTempDir) { ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH ); diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c index 52fe8ac09b87..4e66aaeceb6f 100644 --- a/sal/osl/w32/time.c +++ b/sal/osl/w32/time.c @@ -27,9 +27,9 @@ extern sal_Bool TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime extern BOOL FileTimeToTimeValue( const FILETIME *cpFTime, TimeValue *pTimeVal ); -//-------------------------------------------------- + // osl_getSystemTime -//-------------------------------------------------- + sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal) { @@ -61,9 +61,9 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal) return (sal_True); } -//-------------------------------------------------- + // osl_getDateTimeFromTimeValue -//-------------------------------------------------- + sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDateTime* pDateTime ) { @@ -91,9 +91,9 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDa return sal_False; } -//-------------------------------------------------- + // osl_getTimeValueFromDateTime -//-------------------------------------------------- + sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, TimeValue* pTimeVal ) { @@ -122,9 +122,9 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, Ti } -//-------------------------------------------------- + // osl_getLocalTimeFromSystemTime -//-------------------------------------------------- + sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal ) { @@ -153,9 +153,9 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVa return sal_False; } -//-------------------------------------------------- + // osl_getSystemTimeFromLocalTime -//-------------------------------------------------- + sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( const TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal ) { diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index d07d7e92f3ee..19e25c1d25f3 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -294,7 +294,7 @@ static const sal_Int32 kSInt32Max = INT_MAX; static const sal_Int64 kUInt32Max = UINT_MAX; static const sal_Int64 kSInt64Max = SAL_CONST_INT64(9223372036854775807); -//------------------------------------------------------------------------ + static const sal_Int32 kInt32MaxNumsCount = 5; @@ -319,25 +319,25 @@ static const sal_Int32 kBinaryNumsCount = 16; static const sal_Int32 kBinaryMaxNumsCount = 7; -//------------------------------------------------------------------------ + static const sal_Int32 kOctolNumsCount = 16; static const sal_Int32 kOctolMaxNumsCount = 7; -//------------------------------------------------------------------------ + static const sal_Int32 kDecimalNumsCount = 16; static const sal_Int32 kDecimalMaxNumsCount = 7; -//------------------------------------------------------------------------ + static const sal_Int32 kHexDecimalNumsCount = 16; static const sal_Int32 kHexDecimalMaxNumsCount = 7; -//------------------------------------------------------------------------ + static const sal_Int32 kBase36NumsCount = 36; @@ -352,7 +352,7 @@ static const double expValDouble[nDoubleCount]= 1.7e-309,6.5822e-16,1.7e+307,2.2e30,3.1,3.1,-3.1, 0.0,0.0,0.0,1.00e+308 }; -//------------------------------------------------------------------------ + static const sal_Int32 nFloatCount=22; static const float expValFloat[nFloatCount] = { @@ -362,7 +362,7 @@ static const float expValFloat[nFloatCount] = 1.00e38f,6.241e-37f,6.241e37f,3.1f,3.1f,-3.1f, 3.1f,0.0f,0.0f,0.0f }; -//------------------------------------------------------------------------ + static const sal_Int32 nCharCount=15; static const sal_Unicode expValChar[nCharCount] = { @@ -371,7 +371,7 @@ static const sal_Unicode expValChar[nCharCount] = 64,10,39,34, 0,0,83 }; -//------------------------------------------------------------------------ + static const sal_Int32 nDefaultCount=6; static const sal_Unicode input1Default[nDefaultCount] = { @@ -385,7 +385,7 @@ static const sal_Int32 expValDefault[nDefaultCount] = { 4,9,-1,-1,3,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nNormalCount=10; static const sal_Unicode input1Normal[nNormalCount] = { @@ -399,7 +399,7 @@ static const sal_Int32 expValNormal[nNormalCount] = { 4,-1,-1,9,15,-1,-1,-1,-1,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nlastDefaultCount=5; static const sal_Unicode input1lastDefault[nlastDefaultCount] = { @@ -413,7 +413,7 @@ static const sal_Int32 expVallastDefault[nlastDefaultCount] = { 4,15,-1,21,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nlastNormalCount=8; static const sal_Unicode input1lastNormal[nlastNormalCount] = { @@ -427,7 +427,7 @@ static const sal_Int32 expVallastNormal[nlastNormalCount] = { 4,-1,4,15,-1,-1,-1,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrDefaultCount=6; static const sal_Int32 input2StrDefault[nStrDefaultCount] = { @@ -437,7 +437,7 @@ static const sal_Int32 expValStrDefault[nStrDefaultCount] = { 0,4,-1,-1,-1,3 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrNormalCount=9; static const sal_Int32 input2StrNormal[nStrNormalCount] = { @@ -447,7 +447,7 @@ static const sal_Int32 expValStrNormal[nStrNormalCount] = { 0,-1,4,-1,-1,-1,-1,-1,3 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrLastDefaultCount=6; static const sal_Int32 input2StrLastDefault[nStrLastDefaultCount] = { @@ -457,7 +457,7 @@ static const sal_Int32 expValStrLastDefault[nStrLastDefaultCount] = { 0,4,-1,-1,-1,3 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrLastNormalCount=12; static const sal_Int32 input2StrLastNormal[nStrLastNormalCount] = { @@ -467,10 +467,10 @@ static const sal_Int32 expValStrLastNormal[nStrLastNormalCount] = { 0,-1,0,4,-1,-1,-1,-1,-1,3,15,11 }; -//------------------------------------------------------------------------ + static const sal_Int32 kNonSInt32Max = INT_MIN; static const sal_Int32 kNonSInt16Max = SHRT_MIN; -//------------------------------------------------------------------------ + #ifdef __cplusplus } #endif diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx index 75e0bf6a9d4a..276e3a29ebfc 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx @@ -42,13 +42,13 @@ sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); sal_uInt32 AStringLen( const sal_Char *pAStr ); -//------------------------------------------------------------------------ + bool AStringNIsValid( const sal_Char *pAStr, const sal_uInt32 nStrLen ); -//------------------------------------------------------------------------ + sal_Int32 AStringToUStringCompare( const sal_Unicode *pUStr, const sal_Char *pAStr diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index 04b6d1390091..e2f746a5cbc9 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -39,9 +39,9 @@ #define OSLTEST_DECLARE_USTRING( str_name, str_value ) \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value ) -//------------------------------------------------------------------------ + // condition names -//------------------------------------------------------------------------ + OSLTEST_DECLARE_USTRING( TestCon, "testcondition" ); const char pTestString[17] = "Sun Microsystems"; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index b5c5faaf05e8..b1aa84bbb908 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -258,7 +258,7 @@ inline bool t_compareTime( TimeValue *m_aEndTime, TimeValue *m_aStartTime, sal_ { // sal_uInt64 uTimeValue; // sal_Int64 iTimeValue; - // + // iTimeValue = t_abs64(( tv1->Seconds - tv2->Seconds) * 1000000000 + tv1->Nanosec - tv2->Nanosec); // uTimeValue = ( iTimeValue / 1000000 ); @@ -6022,9 +6022,9 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class remove - //######################################## + // TEST Directory::createPath - //######################################## + #ifdef WNT # define PATH_BUFFER_SIZE MAX_PATH @@ -6034,7 +6034,7 @@ namespace osl_Directory #define TEST_PATH_POSTFIX "hello/world" - //######################################## + OUString get_test_path() { static OUString test_path; @@ -6088,7 +6088,7 @@ namespace osl_Directory return test_path; } - //######################################## + void rm_test_path(const OUString& path) { sal_Unicode buffer[PATH_BUFFER_SIZE]; @@ -6109,7 +6109,7 @@ namespace osl_Directory } } - //######################################## + class DirCreatedObserver : public DirectoryCreationObserver { public: @@ -6132,15 +6132,15 @@ namespace osl_Directory }; - //######################################## + class createPath : public CppUnit::TestFixture { public: - //########################################## + createPath() {} - //########################################## + void with_relative_path() { FileBase::RC rc = Directory::createPath( OUString(TEST_PATH_POSTFIX)); @@ -6153,7 +6153,7 @@ namespace osl_Directory ); } - //########################################## + void without_callback() { OUString tp_url = get_test_path(); @@ -6171,7 +6171,7 @@ namespace osl_Directory ); } - //########################################## + void with_callback() { OUString tp_url = get_test_path(); @@ -6195,7 +6195,7 @@ namespace osl_Directory #ifdef WNT - //########################################## + const char* get_unused_drive_letter() { static const char m_aBuff[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -6213,7 +6213,7 @@ namespace osl_Directory return NULL; } - //########################################## + void at_invalid_logical_drive() { const char* drv = get_unused_drive_letter(); diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index 281002bba0f3..ccb27f157992 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -36,19 +36,19 @@ extern "C" -//------------------------------------------------------------------------ + // common used string resource // these common used string will be used as assist resource in test // they are mostly OS independent, some of the resource can be reused // so, acommon test data repository will be better since it can be // shared among all test code -//------------------------------------------------------------------------ + const sal_Char pBuffer_Char[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; const sal_Char pBuffer_Number[] = "1234567890"; const sal_Char pBuffer_Blank[] = ""; -//------------------------------------------------------------------------ + // OS dependent/independent definitions/includes // we use FILE_PREFIX for URL prefix, // TEST_PLATFORM for test platform initial, @@ -57,17 +57,17 @@ const sal_Char pBuffer_Blank[] = ""; // PATH_LIST_DELIMITER for separator of path list in comrresponding platform, // PATH_SEPARATOR for separator in URL or system path in comrresponding platform, // PATH_MAX/MAX_PATH for max path length in comrresponding platform, -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ + + // OS independent const definition -//------------------------------------------------------------------------ + # define FILE_PREFIX "file:///" # define TEST_FILE_SIZE 1024 -//------------------------------------------------------------------------ + // OS dependent declaration and includes -//------------------------------------------------------------------------ + #if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> @@ -106,12 +106,12 @@ const sal_Char pBuffer_Blank[] = ""; #endif -//------------------------------------------------------------------------ + // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length -//------------------------------------------------------------------------ + #define OSLTEST_DECLARE( str_name, str_value ) \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( ( str_value ) ) @@ -119,9 +119,9 @@ const sal_Char pBuffer_Blank[] = ""; #define OSLTEST_DECLARE_UTF8(str_name, str_value ) \ ::rtl::OUString a##str_name = ::rtl::Uri::decode( ::rtl::OUString::createFromAscii( ( str_value ) ), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8) -//------------------------------------------------------------------------ + // OS independent file definition -//------------------------------------------------------------------------ + OSLTEST_DECLARE( NullURL, "" ); OSLTEST_DECLARE( SlashURL, PATH_SEPARATOR ); OSLTEST_DECLARE( PreURL, FILE_PREFIX ); @@ -132,9 +132,9 @@ OSLTEST_DECLARE( TempDirectorySys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ); OSLTEST_DECLARE( UserDirectoryURL, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "" ); OSLTEST_DECLARE( UserDirectorySys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "" ); -//------------------------------------------------------------------------ + // common used URL:temp, canonical, root, relative, link,etc -//------------------------------------------------------------------------ + OSLTEST_DECLARE( CanURL1, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" ); OSLTEST_DECLARE( CanURL2, "ca@#;+.,$///78no\0ni..name" ); OSLTEST_DECLARE( CanURL3, "ca@#;+.,$//tmp/678nonical//name" ); @@ -158,9 +158,9 @@ OSLTEST_DECLARE( RelURL5, TEST_PLATFORM_TEMP "/./../" TEST_PLATFORM_TEMP ); OSLTEST_DECLARE( LnkURL1, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/link.file" ); OSLTEST_DECLARE( HidURL1, ".hiddenfile" ); -//------------------------------------------------------------------------ + // common used System Path:temp, root,etc -//------------------------------------------------------------------------ + OSLTEST_DECLARE( RootSys, TEST_PLATFORM_ROOT ); OSLTEST_DECLARE( SysPath1, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system.path" ); OSLTEST_DECLARE( SysPath2, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system/path" ); @@ -170,11 +170,11 @@ OSLTEST_DECLARE_UTF8( SysPath5, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/%E6%9C%A OSLTEST_DECLARE( SysPathLnk, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/link.file" ); OSLTEST_DECLARE( FifoSys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo" ); -//------------------------------------------------------------------------ + // FileType URL, we pick some canonical file in corresponding system for test: // socket, link, etc. // Note that this may be changed in the different platform, so be careful to use. -//------------------------------------------------------------------------ + #if ( defined UNX ) // Unix OSLTEST_DECLARE( TypeURL1, FILE_PREFIX "dev/ccv"); //socket Solaris/Linux OSLTEST_DECLARE( TypeURL2, FILE_PREFIX "devices/pseudo/tcp@0:tcp"); //special Solaris/Linux @@ -185,10 +185,10 @@ OSLTEST_DECLARE( TypeURL2, FILE_PREFIX "" ); OSLTEST_DECLARE( TypeURL3, FILE_PREFIX "" ); #endif -//------------------------------------------------------------------------ + // Volume device URL, we pick some canonical volume device for test: // UNIX file system, Floppy Disk, Proc file system, Temp file system, Compact Disk. -//------------------------------------------------------------------------ + #if ( defined UNX ) // Unix OSLTEST_DECLARE( VolURL1, FILE_PREFIX ""); //ufs Solaris/Linux #ifdef SOLARIS diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 2311e842c0cd..a808fb942a13 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -72,7 +72,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -//##################################### + // register test suites CPPUNIT_TEST_SUITE_REGISTRATION(test_osl_writeFile); diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 4517967929d8..4dd4fe437f40 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -38,9 +38,9 @@ # define FILE_PREFIX "file:///" -//------------------------------------------------------------------------ + // function pointer type. -//------------------------------------------------------------------------ + typedef sal_Bool (* FuncPtr )( sal_Bool ); diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 36ecf045c65a..9df0de13f922 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -70,7 +70,7 @@ const rtl::OUString EXECUTABLE_NAME ("osl_process_child"); #endif -//######################################## + using namespace osl; using ::rtl::OUString; @@ -102,7 +102,7 @@ inline ::rtl::OUString getExecutablePath( void ) //rtl::OUString CWD = getExecutablePath(); -//######################################## + class Test_osl_joinProcess : public CppUnit::TestFixture { const OUString join_param_; @@ -308,13 +308,13 @@ public: CPPUNIT_TEST_SUITE_END(); }; -//######################################################### + typedef std::vector<std::string, rtl::Allocator<std::string> > string_container_t; typedef string_container_t::const_iterator string_container_const_iter_t; typedef string_container_t::iterator string_container_iter_t; -//######################################################### + class exclude : public std::unary_function<std::string, bool> { public: @@ -405,7 +405,7 @@ namespace } #endif -//######################################################### + class Test_osl_executeProcess : public CppUnit::TestFixture { const OUString env_param_; @@ -748,7 +748,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -//##################################### + // register test suites //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_joinProcess, "Test_osl_joinProcess"); CPPUNIT_TEST_SUITE_REGISTRATION(Test_osl_executeProcess); diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx index aedfc391e145..3a303d5bae9b 100644 --- a/sal/qa/osl/process/osl_process_child.cxx +++ b/sal/qa/osl/process/osl_process_child.cxx @@ -18,7 +18,7 @@ */ -//######################################## + #if ( defined WNT ) // Windows @@ -48,7 +48,7 @@ # endif #endif -//######################################## + #ifdef WNT @@ -57,22 +57,22 @@ # define SLEEP(t) (sleep((t))) #endif -//######################################## + void wait_for_seconds(char* time) { SLEEP(atoi(time)); } -//######################################## + #ifdef WNT -//######################################## + void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size) { LPCWSTR strW = reinterpret_cast<LPCWSTR>(_strW); WideCharToMultiByte(CP_ACP, 0, strW, -1, strA, size, NULL, NULL); } -//######################################## + void dump_env(char* file_path) { LPTSTR env = reinterpret_cast<LPTSTR>( @@ -99,7 +99,7 @@ void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size) } #endif -//######################################## + int main(int argc, char* argv[]) { if (argc > 2) diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index 68c8bd3f75e4..5bdededb7eea 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -26,7 +26,7 @@ #include <stdio.h> #include <osl/profile.h> -//================================================================================================== + namespace osl_Profile { diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index c992fe7fc1a6..df7d21e89b2c 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -40,9 +40,9 @@ extern "C" #endif # include <stdio.h> -//------------------------------------------------------------------------ + // OS dependent declaration and includes -//------------------------------------------------------------------------ + #if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> @@ -65,12 +65,12 @@ extern "C" #endif -//------------------------------------------------------------------------ + // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length -//------------------------------------------------------------------------ + #define OSLTEST_DECLARE( str_name, str_value ) \ static const sal_Char p##str_name[] = str_value; \ @@ -78,14 +78,14 @@ extern "C" ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( p##str_name ) -//------------------------------------------------------------------------ + // Ip version definition -//------------------------------------------------------------------------ + #define IP_VER 4 /// currently only IPv4 is considered. -//------------------------------------------------------------------------ + // Hostnames. -//------------------------------------------------------------------------ + // OSLTEST_DECLARE( HostName1, "localhost" ); // OSLTEST_DECLARE( HostIp1, "127.0.0.1" ); OSLTEST_DECLARE( HostName2, "longshot.prc.sun.com" ); @@ -103,9 +103,9 @@ OSLTEST_DECLARE( HostIpInval, "123.45.67.89" ); //this is valid ip number,bu OSLTEST_DECLARE( HostNameInval, "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" ); OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); -//------------------------------------------------------------------------ + // OS independent file definition -//------------------------------------------------------------------------ + OSLTEST_DECLARE( NullURL, "" ); #ifdef __cplusplus diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index ce63ed8fd603..ff8ece1ca7b3 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -40,9 +40,9 @@ extern "C" #endif # include <stdio.h> -//------------------------------------------------------------------------ + // OS dependent declaration and includes -//------------------------------------------------------------------------ + #if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> @@ -65,12 +65,12 @@ extern "C" #endif -//------------------------------------------------------------------------ + // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length -//------------------------------------------------------------------------ + #define OSLTEST_DECLARE( str_name, str_value ) \ static const sal_Char p##str_name[] = str_value; \ @@ -78,14 +78,14 @@ extern "C" ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( p##str_name ) -//------------------------------------------------------------------------ + // Ip version definition -//------------------------------------------------------------------------ + #define IP_VER 4 /// currently only IPv4 is considered. -//------------------------------------------------------------------------ + // Ip port definition -//------------------------------------------------------------------------ + #define IP_PORT_ZERO 0 #define IP_PORT_FTP 21 #define IP_PORT_TELNET 23 @@ -114,9 +114,9 @@ extern "C" #define IP_PORT_TMP 9999 #define IP_PORT_INVAL 99999 -//------------------------------------------------------------------------ + // service definitions. -//------------------------------------------------------------------------ + OSLTEST_DECLARE( ServiceFTP, "ftp" ); OSLTEST_DECLARE( ServiceTELNET, "telnet" ); OSLTEST_DECLARE( ServiceGOPHER, "gopher" ); @@ -124,15 +124,15 @@ OSLTEST_DECLARE( ServiceIMAP, "imap" ); OSLTEST_DECLARE( ServiceHTTPS, "https" ); OSLTEST_DECLARE( ServiceNETBIOS, "netbios-dgm" ); -//------------------------------------------------------------------------ + // protocol definitions. -//------------------------------------------------------------------------ + OSLTEST_DECLARE( ProtocolTCP, "tcp" ); OSLTEST_DECLARE( ProtocolUDP, "udp" ); -//------------------------------------------------------------------------ + // Hostnames. -//------------------------------------------------------------------------ + OSLTEST_DECLARE( HostName1, "localhost" ); OSLTEST_DECLARE( HostIp1, "127.0.0.1" ); OSLTEST_DECLARE( HostName2, "longshot.prc.sun.com" ); @@ -150,9 +150,9 @@ OSLTEST_DECLARE( HostIpInval1, "123.345.67.89" ); //this is real invalid ip nu OSLTEST_DECLARE( HostNameInval, "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" ); OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); -//------------------------------------------------------------------------ + // OS independent file definition -//------------------------------------------------------------------------ + OSLTEST_DECLARE( NullURL, "" ); #ifdef __cplusplus diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index 49785cd50432..4c45369d3eaf 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -40,9 +40,9 @@ extern "C" { #endif -//------------------------------------------------------------------------ + // OS dependent declaration and includes -//------------------------------------------------------------------------ + #if ( defined UNX ) //Unix #include <unistd.h> diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index 9235a910c7c4..b2a93d1901e1 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -299,10 +299,10 @@ namespace rtl_ustr // CPPUNIT_TEST(hashCode_003); // CPPUNIT_TEST_SUITE_END(); // }; // class compare -// -// -// -// + + + + class indexOfChar : public CppUnit::TestFixture { public: @@ -348,7 +348,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class indexOfChar -// + class lastIndexOfChar : public CppUnit::TestFixture { public: diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h index ebf0b3cb4120..71f4ae7dbb68 100644 --- a/sal/qa/rtl/process/rtl_Process_Const.h +++ b/sal/qa/rtl/process/rtl_Process_Const.h @@ -20,7 +20,7 @@ #ifndef _RTL_PROCESS_CONST_H_ #define _RTL_PROCESS_CONST_H_ -//------------------------------------------------------------------------ + #include <rtl/ustring.hxx> using namespace ::rtl; @@ -29,13 +29,13 @@ using namespace ::rtl; extern "C" { #endif -//------------------------------------------------------------------------ + ::rtl::OUString suParam0(RTL_CONSTASCII_USTRINGPARAM("-join")); ::rtl::OUString suParam1(RTL_CONSTASCII_USTRINGPARAM("-with")); ::rtl::OUString suParam2(RTL_CONSTASCII_USTRINGPARAM("-child")); ::rtl::OUString suParam3(RTL_CONSTASCII_USTRINGPARAM("-process")); -//------------------------------------------------------------------------ + #ifdef __cplusplus } #endif diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 5c957f633cf0..3c7742212d11 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -666,7 +666,7 @@ void Test::testSingleByte() { 0x03a6,0x0398,0x03a9,0x03b4,0x221e,0x03c6,0x03b5,0x2229, 0x2261,0x00b1,0x2265,0x2264,0x2320,0x2321,0x00f7,0x2248, 0x00b0,0x2219,0x00b7,0x221a,0x207f,0x00b2,0x25a0,0x00a0 } }, - // ... + { RTL_TEXTENCODING_ASCII_US, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, @@ -799,7 +799,7 @@ void Test::testSingleByte() { 0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF, 0xFFFF,0x00F1,0x00F2,0x00F3,0x00F4,0x0121,0x00F6,0x00F7, 0x011D,0x00F9,0x00FA,0x00FB,0x00FC,0x016D,0x015D,0x02D9 } }, - // ... + { RTL_TEXTENCODING_ISO_8859_6, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, @@ -833,7 +833,7 @@ void Test::testSingleByte() { 0x0648,0x0649,0x064A,0x064B,0x064C,0x064D,0x064E,0x064F, 0x0650,0x0651,0x0652,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF } }, - // ... + { RTL_TEXTENCODING_ISO_8859_8, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, @@ -867,7 +867,7 @@ void Test::testSingleByte() { 0x05D8,0x05D9,0x05DA,0x05DB,0x05DC,0x05DD,0x05DE,0x05DF, 0x05E0,0x05E1,0x05E2,0x05E3,0x05E4,0x05E5,0x05E6,0x05E7, 0x05E8,0x05E9,0x05EA,0xFFFF,0xFFFF,0x200E,0x200F,0xFFFF } }, - // ... + { RTL_TEXTENCODING_TIS_620, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, diff --git a/sal/rtl/byteseq.cxx b/sal/rtl/byteseq.cxx index 10f2546fa024..c593cdc8b04f 100644 --- a/sal/rtl/byteseq.cxx +++ b/sal/rtl/byteseq.cxx @@ -35,7 +35,7 @@ static sal_Sequence aEmpty_rtl_ByteSeq = { 0 } /* sal_Unicode buffer[1]; */ }; -//================================================================================================== + void SAL_CALL rtl_byte_sequence_reference2One( sal_Sequence ** ppSequence ) SAL_THROW_EXTERN_C() { @@ -73,7 +73,7 @@ void SAL_CALL rtl_byte_sequence_reference2One( } } -//================================================================================================== + void SAL_CALL rtl_byte_sequence_realloc( sal_Sequence ** ppSequence, sal_Int32 nSize ) SAL_THROW_EXTERN_C() { @@ -123,7 +123,7 @@ void SAL_CALL rtl_byte_sequence_realloc( *ppSequence = pSequence; } -//================================================================================================== + void SAL_CALL rtl_byte_sequence_acquire( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { @@ -131,7 +131,7 @@ void SAL_CALL rtl_byte_sequence_acquire( sal_Sequence *pSequence ) osl_atomic_increment( &(pSequence->nRefCount) ); } -//================================================================================================== + void SAL_CALL rtl_byte_sequence_release( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { @@ -144,7 +144,7 @@ void SAL_CALL rtl_byte_sequence_release( sal_Sequence *pSequence ) } } -//================================================================================================== + void SAL_CALL rtl_byte_sequence_construct( sal_Sequence **ppSequence , sal_Int32 nLength ) SAL_THROW_EXTERN_C() { @@ -172,7 +172,7 @@ void SAL_CALL rtl_byte_sequence_construct( sal_Sequence **ppSequence , sal_Int32 } } -//================================================================================================== + void SAL_CALL rtl_byte_sequence_constructNoDefault( sal_Sequence **ppSequence , sal_Int32 nLength ) SAL_THROW_EXTERN_C() { @@ -192,7 +192,7 @@ void SAL_CALL rtl_byte_sequence_constructNoDefault( sal_Sequence **ppSequence , } } -//================================================================================================== + void SAL_CALL rtl_byte_sequence_constructFromArray( sal_Sequence **ppSequence, const sal_Int8 *pData , sal_Int32 nLength ) SAL_THROW_EXTERN_C() @@ -202,7 +202,7 @@ void SAL_CALL rtl_byte_sequence_constructFromArray( memcpy( (*ppSequence)->elements, pData, nLength ); } -//================================================================================================== + void SAL_CALL rtl_byte_sequence_assign( sal_Sequence **ppSequence , sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { @@ -220,7 +220,7 @@ void SAL_CALL rtl_byte_sequence_assign( sal_Sequence **ppSequence , sal_Sequence } -//================================================================================================== + sal_Bool SAL_CALL rtl_byte_sequence_equals( sal_Sequence *pSequence1 , sal_Sequence *pSequence2 ) SAL_THROW_EXTERN_C() { @@ -241,14 +241,14 @@ sal_Bool SAL_CALL rtl_byte_sequence_equals( sal_Sequence *pSequence1 , sal_Seque } -//================================================================================================== + const sal_Int8 *SAL_CALL rtl_byte_sequence_getConstArray( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { return ((const sal_Int8*)(pSequence->elements)); } -//================================================================================================== + sal_Int32 SAL_CALL rtl_byte_sequence_getLength( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.h b/sal/workben/clipboardwben/testcopy/StdAfx.h index d71036003969..480916b75367 100644 --- a/sal/workben/clipboardwben/testcopy/StdAfx.h +++ b/sal/workben/clipboardwben/testcopy/StdAfx.h @@ -2,7 +2,7 @@ // stdafx.h : Include-Datei für Standard-System-Include-Dateien, // oder projektspezifische Include-Dateien, die häufig benutzt, aber // in unregelmäßigen Abständen geändert werden. -// + #if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx index 063cccdcf022..df80774bcb84 100644 --- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx +++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx @@ -29,9 +29,9 @@ -//============================================================================ + // OTWrapperDataObject -//============================================================================ + // ctor @@ -274,9 +274,9 @@ CXTDataObject::operator IDataObject*( ) } -//============================================================================ + // CEnumFormatEtc -//============================================================================ + diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx index 48b3a33c26d4..6595e9a03a62 100644 --- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx +++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx @@ -39,9 +39,9 @@ public: CXTDataObject( LONG nRefCntInitVal = 0); ~CXTDataObject( ); - //----------------------------------------------------------------- + // ole interface implementation - //----------------------------------------------------------------- + //IUnknown STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject); diff --git a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx index b359d48687ff..b545d414334d 100644 --- a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx +++ b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx @@ -19,7 +19,7 @@ // TestWin32.cpp : Defines the entry point for the application. -// + #define _WIN32_DCOM #undef _UNICODE diff --git a/sal/workben/clipboardwben/testcopy/cbcpytest.rc b/sal/workben/clipboardwben/testcopy/cbcpytest.rc index 2bf8fd181e47..fba2f72a8472 100644 --- a/sal/workben/clipboardwben/testcopy/cbcpytest.rc +++ b/sal/workben/clipboardwben/testcopy/cbcpytest.rc @@ -17,23 +17,23 @@ */ //Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #define APSTUDIO_HIDDEN_SYMBOLS #include "windows.h" #undef APSTUDIO_HIDDEN_SYMBOLS #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -42,20 +42,20 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // Icon -// + // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_TESTWIN32 ICON DISCARDABLE "TestWin32.ICO" IDI_SMALL ICON DISCARDABLE "SMALL.ICO" -///////////////////////////////////////////////////////////////////////////// -// + + // Menu -// + IDC_TESTWIN32 MENU DISCARDABLE BEGIN @@ -70,10 +70,10 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// + + // Accelerator -// + IDC_TESTWIN32 ACCELERATORS MOVEABLE PURE BEGIN @@ -83,10 +83,10 @@ END #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 2 TEXTINCLUDE DISCARDABLE BEGIN @@ -111,10 +111,10 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -124,17 +124,17 @@ BEGIN END #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// -///////////////////////////////////////////////////////////////////////////// + + #endif // not APSTUDIO_INVOKED diff --git a/sal/workben/clipboardwben/testcopy/resource.h b/sal/workben/clipboardwben/testcopy/resource.h index 49813993870a..1c8fac62c973 100644 --- a/sal/workben/clipboardwben/testcopy/resource.h +++ b/sal/workben/clipboardwben/testcopy/resource.h @@ -2,7 +2,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by cbcpytest.rc -// + #define IDC_MYICON 2 #define IDD_TESTWIN32_DIALOG 102 #define IDD_ABOUTBOX 103 @@ -21,7 +21,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 129 diff --git a/sal/workben/clipboardwben/testpaste/StdAfx.h b/sal/workben/clipboardwben/testpaste/StdAfx.h index d71036003969..480916b75367 100644 --- a/sal/workben/clipboardwben/testpaste/StdAfx.h +++ b/sal/workben/clipboardwben/testpaste/StdAfx.h @@ -2,7 +2,7 @@ // stdafx.h : Include-Datei für Standard-System-Include-Dateien, // oder projektspezifische Include-Dateien, die häufig benutzt, aber // in unregelmäßigen Abständen geändert werden. -// + #if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx b/sal/workben/clipboardwben/testpaste/cbptest.cxx index f4cf9cd94ea2..283790f28a81 100644 --- a/sal/workben/clipboardwben/testpaste/cbptest.cxx +++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx @@ -19,7 +19,7 @@ // TestWin32.cpp : Defines the entry point for the application -// + #define _WIN32_DCOM diff --git a/sal/workben/clipboardwben/testpaste/cbptest.rc b/sal/workben/clipboardwben/testpaste/cbptest.rc index d5026fd0778f..5b0adb7f07e2 100644 --- a/sal/workben/clipboardwben/testpaste/cbptest.rc +++ b/sal/workben/clipboardwben/testpaste/cbptest.rc @@ -17,23 +17,23 @@ */ //Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #define APSTUDIO_HIDDEN_SYMBOLS #include "windows.h" #undef APSTUDIO_HIDDEN_SYMBOLS #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -42,20 +42,20 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // Icon -// + // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_TESTWIN32 ICON DISCARDABLE "TestWin32.ICO" IDI_SMALL ICON DISCARDABLE "SMALL.ICO" -///////////////////////////////////////////////////////////////////////////// -// + + // Menu -// + IDC_TESTWIN32 MENU DISCARDABLE BEGIN @@ -68,10 +68,10 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// + + // Accelerator -// + IDC_TESTWIN32 ACCELERATORS MOVEABLE PURE BEGIN @@ -81,10 +81,10 @@ END #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 2 TEXTINCLUDE DISCARDABLE BEGIN @@ -109,10 +109,10 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -122,17 +122,17 @@ BEGIN END #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// -///////////////////////////////////////////////////////////////////////////// + + #endif // not APSTUDIO_INVOKED diff --git a/sal/workben/clipboardwben/testpaste/resource.h b/sal/workben/clipboardwben/testpaste/resource.h index 3f0af2dc3ecc..8eda4e8fedc1 100644 --- a/sal/workben/clipboardwben/testpaste/resource.h +++ b/sal/workben/clipboardwben/testpaste/resource.h @@ -2,7 +2,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by mtacb.rc -// + #define IDC_MYICON 2 #define IDD_TESTWIN32_DIALOG 102 #define IDD_ABOUTBOX 103 @@ -18,7 +18,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 129 diff --git a/sal/workben/clipboardwben/testviewer/StdAfx.h b/sal/workben/clipboardwben/testviewer/StdAfx.h index d71036003969..480916b75367 100644 --- a/sal/workben/clipboardwben/testviewer/StdAfx.h +++ b/sal/workben/clipboardwben/testviewer/StdAfx.h @@ -2,7 +2,7 @@ // stdafx.h : Include-Datei für Standard-System-Include-Dateien, // oder projektspezifische Include-Dateien, die häufig benutzt, aber // in unregelmäßigen Abständen geändert werden. -// + #if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx index e39a71e6405e..9eda0fbd94e7 100644 --- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx +++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx @@ -19,7 +19,7 @@ // TestWin32.cpp : Defines the entry point for the application. -// + #define _WIN32_DCOM diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.rc b/sal/workben/clipboardwben/testviewer/cbvtest.rc index 627934606fd8..047cc790ca47 100644 --- a/sal/workben/clipboardwben/testviewer/cbvtest.rc +++ b/sal/workben/clipboardwben/testviewer/cbvtest.rc @@ -17,23 +17,23 @@ */ //Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #define APSTUDIO_HIDDEN_SYMBOLS #include "windows.h" #undef APSTUDIO_HIDDEN_SYMBOLS #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -42,20 +42,20 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // Icon -// + // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_TESTWIN32 ICON DISCARDABLE "TestWin32.ICO" IDI_SMALL ICON DISCARDABLE "SMALL.ICO" -///////////////////////////////////////////////////////////////////////////// -// + + // Menu -// + IDC_TESTWIN32 MENU DISCARDABLE BEGIN @@ -68,10 +68,10 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// + + // Accelerator -// + IDC_TESTWIN32 ACCELERATORS MOVEABLE PURE BEGIN @@ -81,10 +81,10 @@ END #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 2 TEXTINCLUDE DISCARDABLE BEGIN @@ -109,10 +109,10 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -129,17 +129,17 @@ BEGIN END #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// -///////////////////////////////////////////////////////////////////////////// + + #endif // not APSTUDIO_INVOKED diff --git a/sal/workben/clipboardwben/testviewer/resource.h b/sal/workben/clipboardwben/testviewer/resource.h index 3c9101cf6463..3bd18adc497d 100644 --- a/sal/workben/clipboardwben/testviewer/resource.h +++ b/sal/workben/clipboardwben/testviewer/resource.h @@ -20,7 +20,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by cbvtest.rc -// + #define IDC_MYICON 2 #define IDD_TESTWIN32_DIALOG 102 #define IDD_ABOUTBOX 103 @@ -40,7 +40,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 129 |