From 4905a190326a423b418a6b5531c5d990a5cc0082 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 14 Oct 2010 08:27:31 +0200 Subject: Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth --- tools/workben/fstest.cxx | 3 +++ tools/workben/hashtbl.cxx | 3 +++ tools/workben/hashtbl.hxx | 2 ++ tools/workben/inetmimetest.cxx | 3 +++ tools/workben/tldem.cxx | 3 +++ tools/workben/urltest.cxx | 3 +++ 6 files changed, 17 insertions(+) (limited to 'tools/workben') diff --git a/tools/workben/fstest.cxx b/tools/workben/fstest.cxx index 8048f2c166b0..3db8780a72df 100644 --- a/tools/workben/fstest.cxx +++ b/tools/workben/fstest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ void CheckTimes(DirEntry aDE) return; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/workben/hashtbl.cxx b/tools/workben/hashtbl.cxx index bcd9f903ab64..5f75d481e8db 100644 --- a/tools/workben/hashtbl.cxx +++ b/tools/workben/hashtbl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -513,3 +514,5 @@ void* HashTableIterator::FindValidObject(BOOL bForward) return pObject; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/workben/hashtbl.hxx b/tools/workben/hashtbl.hxx index f4593b8148cf..7c1b89c873cf 100644 --- a/tools/workben/hashtbl.hxx +++ b/tools/workben/hashtbl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,4 @@ public: #endif // _HASHTBL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/workben/inetmimetest.cxx b/tools/workben/inetmimetest.cxx index e380fb7f6fbe..9aac5719550e 100644 --- a/tools/workben/inetmimetest.cxx +++ b/tools/workben/inetmimetest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ main() { success &= testDecode("=?iso-8859-1?B?QUJD?=", "ABC"); return success ? EXIT_SUCCESS : EXIT_FAILURE; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/workben/tldem.cxx b/tools/workben/tldem.cxx index 9571d3ff9b94..b23686e82479 100644 --- a/tools/workben/tldem.cxx +++ b/tools/workben/tldem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ main( int argc, char **argv ) } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx index 0930dfcc5239..80e0e4c664b6 100644 --- a/tools/workben/urltest.cxx +++ b/tools/workben/urltest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1904,3 +1905,5 @@ main() return bSuccess ? EXIT_SUCCESS : EXIT_FAILURE; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From bbe30ed8144fbfee7500b98a67224731c581663e Mon Sep 17 00:00:00 2001 From: Kenneth Venken Date: Mon, 18 Oct 2010 12:28:33 +0200 Subject: replace sizeof(foo)/sizeof(foo[0]) by SAL_N_ELEMENTS --- tools/workben/urltest.cxx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tools/workben') diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx index 80e0e4c664b6..0b0239a96f5a 100644 --- a/tools/workben/urltest.cxx +++ b/tools/workben/urltest.cxx @@ -39,6 +39,7 @@ #include "rtl/textenc.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" +#include #include #include @@ -497,7 +498,7 @@ main() { "vnd.sun.star.help://swriter?foo", "vnd.sun.star.help://swriter/?foo" }, { "vnd.sun.star.help://swriter/?foo", 0 } }; - for (std::size_t i = 0; i < sizeof aTest / sizeof aTest[0]; ++i) + for (std::size_t i = 0; i < SAL_N_ELEMENTS( aTest ); ++i) { INetURLObject aUrl(aTest[i].in); if (aUrl.HasError()) @@ -531,7 +532,7 @@ main() /*TODO "wfs:///c|/xyz/",*/ /*TODO "wfs://xxx/yyy?zzz",*/ /*TODO "wfs:///x/y/z"*/ }; - for (std::size_t i = 0; i < sizeof aTest / sizeof aTest[0]; ++i) + for (std::size_t i = 0; i < SAL_N_ELEMENTS(aTest); ++i) { INetURLObject aUrl(aTest[i]); if (aUrl.HasError()) @@ -566,7 +567,7 @@ main() "vnd.sun.star.pkg://file:%2F%2F%2Fa:%2Fb%20c/xx", /*TODO "vnd.sun.star.pkg://file:%2F%2F%2Fa:%2Fb%20c/xx;yy",*/ "vnd.sun.star.pkg://file:%2F%2F%2Fa:%2Fb%20c/xx//yy" }; - for (std::size_t i = 0; i < sizeof aTest / sizeof aTest[0]; ++i) + for (std::size_t i = 0; i < SAL_N_ELEMENTS(aTest); ++i) { INetURLObject aUrl(aTest[i]); if (aUrl.HasError()) @@ -591,7 +592,7 @@ main() "vnd.sun.star.cmd:log/out", /*TODO "vnd.sun.star.cmd:[logout]",*/ "vnd.sun.star.cmd:log[out]" }; - for (std::size_t i = 0; i < sizeof aTest / sizeof aTest[0]; ++i) + for (std::size_t i = 0; i < SAL_N_ELEMENTS( aTest ); ++i) { INetURLObject aUrl(aTest[i]); if (aUrl.HasError()) @@ -1220,7 +1221,7 @@ main() { "smb://foo", "smb://foo/" }, { "smb://x;foo:bar@baz.xyz:12345/ab?cd", "smb://x;foo:bar@baz.xyz:12345/ab?cd" } }; - for (std::size_t i = 0; i < sizeof aTest / sizeof aTest[0]; ++i) + for (std::size_t i = 0; i < SAL_N_ELEMENTS( aTest ); ++i) { INetURLObject aUrl(aTest[i].m_pInput); if (aTest[i].m_pOutput == 0 @@ -1250,7 +1251,7 @@ main() static Test const aTest[] = { { "file://d:\\dir1\\file1", "file:///d:/dir1/file1" }, { "http://as@alaska:8000/test/test.sxw", 0 } }; - for (std::size_t i = 0; i < sizeof aTest / sizeof aTest[0]; ++i) + for (std::size_t i = 0; i < SAL_N_ELEMENTS( aTest ); ++i) { INetURLObject aUrl = INetURLObject( String(aTest[i].m_pInput, RTL_TEXTENCODING_UTF8), @@ -1379,7 +1380,7 @@ main() { INET_PROT_NEWS, "abc@def.ghi@", 0 }, { INET_PROT_NEWS, "!\"#@def", "news:!%22%23@def" }, { INET_PROT_NEWS, " @def", "news:%20@def" } }; - for (std::size_t i = 0; i < sizeof aTest / sizeof aTest[0]; ++i) + for (std::size_t i = 0; i < SAL_N_ELEMENTS( aTest ); ++i) { INetURLObject aUri; bool bOk = aUri.ConcatData(aTest[i].eScheme, String(), String(), -- cgit From ab9eecc53a6f87ccb6004e21c44d73b5f6e1ec1f Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 21 Oct 2010 17:34:55 -0500 Subject: Finally, gut the vos module out of the build --- tools/workben/makefile.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/workben') diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk index 73d5753fe233..97e7ebfa9a15 100644 --- a/tools/workben/makefile.mk +++ b/tools/workben/makefile.mk @@ -53,9 +53,9 @@ APP1LIBS = $(LB)$/itools.lib APP2TARGET = urltest APP2OBJS = $(OBJ)$/urltest.obj .IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" -APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) +APP2STDLIBS = $(TOOLSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) .ELSE -APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) +APP2STDLIBS = $(LB)$/itools.lib $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) .ENDIF APP3TARGET = inetmimetest @@ -73,17 +73,17 @@ APP3STDLIBS = $(SALLIB) $(TOOLSLIB) # APP4TARGET = demostor # APP4OBJS = $(OBJ)$/demostor.obj # .IF "$(GUI)" == "UNX" -# APP4STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) +# APP4STDLIBS = $(TOOLSLIB) $(SALLIB) # .ELSE -# APP4STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) +# APP4STDLIBS = $(LB)$/itools.lib $(SALLIB) # .ENDIF # APP5TARGET = fstest # APP5OBJS = $(OBJ)$/fstest.obj # .IF "$(GUI)" == "UNX" -# APP5STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) +# APP5STDLIBS = $(TOOLSLIB) $(SALLIB) # .ELSE -# APP5STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) +# APP5STDLIBS = $(LB)$/itools.lib $(SALLIB) # .ENDIF .INCLUDE: target.mk -- cgit From 08cbfebc045715334701b2a7f318d10256499d50 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 27 Oct 2010 12:30:13 +0100 Subject: add modelines to .h and .c files as well --- tools/workben/helloworld.c | 3 +++ tools/workben/solar.c | 3 +++ 2 files changed, 6 insertions(+) (limited to 'tools/workben') diff --git a/tools/workben/helloworld.c b/tools/workben/helloworld.c index 5d86cf2db21b..d26d986ba594 100644 --- a/tools/workben/helloworld.c +++ b/tools/workben/helloworld.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,3 +32,5 @@ main( ) printf( "%s\n", "hello world"); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/workben/solar.c b/tools/workben/solar.c index 06c4a787ec72..283234220245 100644 --- a/tools/workben/solar.c +++ b/tools/workben/solar.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -425,3 +426,5 @@ main( int argc, char* argv[] ) exit( 0 ); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 324612c06bb1c16c575224d5791be1a0afee6a5e Mon Sep 17 00:00:00 2001 From: Kevin Hunter Date: Thu, 18 Nov 2010 16:54:53 -0500 Subject: Easy Hack: RTL_CONST macro from createFromAscii --- tools/workben/urltest.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/workben') diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx index 0b0239a96f5a..2d3bd9b445f8 100644 --- a/tools/workben/urltest.cxx +++ b/tools/workben/urltest.cxx @@ -611,7 +611,7 @@ main() if (true) { rtl::OUString - aParameters(rtl::OUString::createFromAscii("; CharSet=UTF-8 ; Blubber=Blob")); + aParameters(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "; CharSet=UTF-8 ; Blubber=Blob" ))); sal_Unicode const * pBegin = aParameters.getStr(); sal_Unicode const * pEnd = pBegin + aParameters.getLength(); INetContentTypeParameterList aList; @@ -1451,7 +1451,7 @@ main() } if (true) { // #112130# - INetURLObject url1(rtl::OUString::createFromAscii(".uno:abc%3Fdef")); + INetURLObject url1(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:abc%3Fdef" ))); if (url1.GetProtocol() != INET_PROT_UNO) { printf("BAD .uno:abc%%3Fdef\n"); bSuccess = false; @@ -1469,7 +1469,7 @@ main() printf("BAD HasParam(.uno:abc%%3Fdef)\n"); bSuccess = false; } - INetURLObject url2(rtl::OUString::createFromAscii(".uno:abc?def?ghi")); + INetURLObject url2(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:abc?def?ghi" ))); if (url2.GetProtocol() != INET_PROT_UNO) { printf("BAD .uno:abc?def?ghi\n"); bSuccess = false; -- cgit From 32ce576ef908d3cc7046f04ad08e91718799e260 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 31 Jan 2011 21:56:43 +0100 Subject: Remove RCS information --- tools/workben/fstest.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/workben') diff --git a/tools/workben/fstest.cxx b/tools/workben/fstest.cxx index 3db8780a72df..1feb2871af55 100644 --- a/tools/workben/fstest.cxx +++ b/tools/workben/fstest.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" -#define _FSTEST_CXX "$Revision: 1.5 $" +#define _FSTEST_CXX #include #include -- cgit From 11d20507806d30e2d1955b93a568b84a2216ef69 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Mar 2011 19:08:19 +0100 Subject: Move DBG_ERROR to OSL_FAIL --- tools/workben/hashtbl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/workben') diff --git a/tools/workben/hashtbl.cxx b/tools/workben/hashtbl.cxx index 5f75d481e8db..c431ea159160 100644 --- a/tools/workben/hashtbl.cxx +++ b/tools/workben/hashtbl.cxx @@ -138,7 +138,7 @@ void* HashTable::GetObjectAt(ULONG lPos) const void HashTable::OnDeleteObject(void*) { - DBG_ERROR("HashTable::OnDeleteObject(void*) nicht überladen"); + OSL_FAIL("HashTable::OnDeleteObject(void*) nicht überladen"); } ULONG HashTable::Hash(String const& Key) const @@ -222,7 +222,7 @@ BOOL HashTable::Insert(String const& Key, void* pObject) if (IsFull()) { - DBG_ERROR("HashTable::Insert() is full"); + OSL_FAIL("HashTable::Insert() is full"); return FALSE; } -- cgit From 7943b8dc8787727d0f917e128396595895299d73 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Thu, 28 Apr 2011 22:34:09 -0700 Subject: Remove references to sstring.hxx One isn't used and the 2nd one is an unused test program. --- tools/workben/tldem.cxx | 85 ------------------------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 tools/workben/tldem.cxx (limited to 'tools/workben') diff --git a/tools/workben/tldem.cxx b/tools/workben/tldem.cxx deleted file mode 100644 index b23686e82479..000000000000 --- a/tools/workben/tldem.cxx +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_tools.hxx" - -#include -#include -#include - -int -#ifdef WNT -__cdecl -#endif -main( int argc, char **argv ) -{ - String aString; - aString = "*.*"; - Dir aDir(aString); - SvFileStream aFile; - SvFileStream aSortedFile; - - StringList *pList = new StringList; - SStringList *pSortedList = new SStringList; - ULONG nCount = aDir.Count(); - - for ( ULONG i=0; iInsert( new String( aString ), LIST_APPEND ); - pSortedList->PutString( new String( aString )); - } - - aFile.Open( "test.dir", STREAM_WRITE ); - for ( ULONG j=0; jGetObject(j) ); - } - aFile.Close(); - - - aSortedFile.Open( "stest.dir", STREAM_WRITE ); - for ( ULONG k=0; kGetObject(k) ); - } - if ( pSortedList->IsString( new String("bloedString")) != NOT_THERE ) - aSortedFile.WriteLine( "Fehler !" ); - if ( pSortedList->IsString( new String(".")) == NOT_THERE ) - aSortedFile.WriteLine( "Fehler ?!?" ); - aSortedFile.Close(); - - delete pList; - delete pSortedList; - return 0; -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 27266b10b8aaa9e2f559de7e6c36249c329105f4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 21 May 2011 17:00:45 +0300 Subject: Drop OS2 --- tools/workben/makefile.mk | 4 ++-- tools/workben/solar.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/workben') diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk index d97156c7f66c..129360e70fba 100644 --- a/tools/workben/makefile.mk +++ b/tools/workben/makefile.mk @@ -42,7 +42,7 @@ OBJFILES = \ APP1TARGET = solar APP1OBJS = $(OBJ)$/solar.obj -.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "UNX" APP1STDLIBS = $(TOOLSLIB) .ELSE APP1LIBS = $(LB)$/itools.lib @@ -50,7 +50,7 @@ APP1LIBS = $(LB)$/itools.lib APP2TARGET = urltest APP2OBJS = $(OBJ)$/urltest.obj -.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "UNX" APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) .ELSE APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) diff --git a/tools/workben/solar.c b/tools/workben/solar.c index 283234220245..9ebece78ea12 100644 --- a/tools/workben/solar.c +++ b/tools/workben/solar.c @@ -43,7 +43,7 @@ int GetStackAlignment(void); void PrintArgs( int p, ... ); int check( TestFunc func, Type eT, void* p ); -#if defined (UNX) || defined (WNT) || defined (OS2) +#if defined (UNX) || defined (WNT) #ifdef UNX #include @@ -123,7 +123,7 @@ int GetStackAlignment() -#if defined (UNX) || defined (WNT) || defined (OS2) +#if defined (UNX) || defined (WNT) #ifdef I_STDARG void PrintArgs( int p, ... ) @@ -154,7 +154,7 @@ va_dcl #ifndef USE_FORK_TO_CHECK static jmp_buf check_env; static int bSignal; -#if defined (UNX) || defined (OS2) +#if defined (UNX) void SignalHandler( int sig ) #else void __cdecl SignalHandler( int sig ) -- cgit From e6703ce8a24fdc5b1698f0c3789b4423a84ad8fa Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Thu, 26 May 2011 15:02:42 +0200 Subject: remove __cdecl and use SAL_CALL instead --- tools/workben/inetmimetest.cxx | 6 +----- tools/workben/solar.c | 12 ++---------- tools/workben/urltest.cxx | 6 +----- 3 files changed, 4 insertions(+), 20 deletions(-) (limited to 'tools/workben') diff --git a/tools/workben/inetmimetest.cxx b/tools/workben/inetmimetest.cxx index 9aac5719550e..30b00a9373c3 100644 --- a/tools/workben/inetmimetest.cxx +++ b/tools/workben/inetmimetest.cxx @@ -55,11 +55,7 @@ bool testDecode(char const * input, char const * expected) { } -int -#if defined WNT -__cdecl -#endif -main() { +int SAL_CALL main() { bool success = true; success &= testDecode("=?iso-8859-1?B?QQ==?=", "A"); success &= testDecode("=?iso-8859-1?B?QUI=?=", "AB"); diff --git a/tools/workben/solar.c b/tools/workben/solar.c index 9ebece78ea12..934278f7ae2c 100644 --- a/tools/workben/solar.c +++ b/tools/workben/solar.c @@ -154,11 +154,7 @@ va_dcl #ifndef USE_FORK_TO_CHECK static jmp_buf check_env; static int bSignal; -#if defined (UNX) -void SignalHandler( int sig ) -#else -void __cdecl SignalHandler( int sig ) -#endif +void SAL_CALL SignalHandler( int sig ) { bSignal = 1; /* @@ -354,11 +350,7 @@ void Description_Print( struct Description* pThis, char* name ) fclose(f); } -int -#ifdef WNT -__cdecl -#endif -main( int argc, char* argv[] ) +int SAL_CALL main( int argc, char* argv[] ) { printTypeSign( char, "char" ); printTypeSign( short, "short" ); diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx index 2d3bd9b445f8..69a53950507c 100644 --- a/tools/workben/urltest.cxx +++ b/tools/workben/urltest.cxx @@ -290,11 +290,7 @@ bool test_removeSegment( } -int -#if defined WNT -__cdecl -#endif // WNT -main() +int SAL_CALL main() { bool bSuccess = true; -- cgit From 7843cfd879d4d06e441e4b3ae2f5336149c3570c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 14 Jun 2011 12:07:00 +0100 Subject: remove GetCleanedNextLine --- tools/workben/mempooltest.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tools/workben') diff --git a/tools/workben/mempooltest.cxx b/tools/workben/mempooltest.cxx index bf00343bc9d6..e99e2175d372 100644 --- a/tools/workben/mempooltest.cxx +++ b/tools/workben/mempooltest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "tools/mempool.hxx" struct MempoolTest @@ -16,3 +17,5 @@ int main() delete p; return 1; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit