Hi,
more __cdecl->SAL_CALL work for reviewing. I'll push them if the changes
are fine.
Christina
From d92538be9eba632a9f016878814fcc31e9a4aa9a Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <ChrRossmanith@web.de>
Date: Thu, 26 May 2011 16:34:43 +0200
Subject: [PATCH 1/2] __cdecl -> SAL_CALL
---
sc/inc/rangelst.hxx | 7 ++-----
sc/source/core/tool/rangelst.cxx | 7 ++-----
sc/source/core/tool/rangenam.cxx | 7 ++-----
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 6465416..ad5d4a7 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -129,11 +129,8 @@ private:
};
SV_DECL_IMPL_REF( ScRangePairList );
-extern "C" int
-#ifdef WNT
-__cdecl
-#endif
-ScRangePairList_QsortNameCompare( const void*, const void* );
+extern "C"
+int SAL_CALL ScRangePairList_QsortNameCompare( const void*, const void* );
#endif
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 25e06dc..3e387f6 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -697,11 +697,8 @@ struct ScRangePairNameSort
};
//-----------------------------------------------------------------------------
-extern "C" int
-#ifdef WNT
-__cdecl
-#endif
-ScRangePairList_QsortNameCompare( const void* p1, const void* p2 )
+extern "C"
+int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 )
{
const ScRangePairNameSort* ps1 = (const ScRangePairNameSort*)p1;
const ScRangePairNameSort* ps2 = (const ScRangePairNameSort*)p2;
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 94d6797..5ac3ab6 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -647,11 +647,8 @@ void ScRangeData::ValidateTabRefs()
}
-extern "C" int
-#ifdef WNT
-__cdecl
-#endif
-ScRangeData_QsortNameCompare( const void* p1, const void* p2 )
+extern "C"
+int SAL_CALL ScRangeData_QsortNameCompare( const void* p1, const void* p2 )
{
return (int) ScGlobal::GetCollator()->compareString(
(*(const ScRangeData**)p1)->GetName(),
--
1.7.4.1
From 8be9f1ed28ae9af5f9b620d711315269ca7f23f5 Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <ChrRossmanith@web.de>
Date: Tue, 24 May 2011 20:40:26 +0200
Subject: [PATCH] __cdecl -> SAL_CALL
---
cui/source/dialogs/iconcdlg.cxx | 6 +-----
extensions/source/update/tools/ztool.cxx | 6 +-----
extensions/test/ole/OleClient/clientTest.cxx | 2 +-
extensions/test/ole/OleConverterVar1/convTest.cxx | 2 +-
extensions/test/ole/cppToUno/testcppuno.cxx | 2 +-
5 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 6b20547..5dd9edc 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -45,11 +45,7 @@
using ::std::vector;
-#ifdef WNT
-int __cdecl IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
-#else
-int IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
-#endif
+int SAL_CALL IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
{
return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
}
diff --git a/extensions/source/update/tools/ztool.cxx b/extensions/source/update/tools/ztool.cxx
index 3695823..ad40c9f 100644
--- a/extensions/source/update/tools/ztool.cxx
+++ b/extensions/source/update/tools/ztool.cxx
@@ -37,11 +37,7 @@ void show_usage()
fputs("ztool usage: ztool <source> <dest>\n", stderr);
}
-int
-#ifdef WNT
-__cdecl
-#endif
-main( int argc, char **argv )
+int SAL_CALL main( int argc, char **argv )
{
if ( argc != 3 )
{
diff --git a/extensions/test/ole/OleClient/clientTest.cxx
b/extensions/test/ole/OleClient/clientTest.cxx
index a1b0e22..8277bd8 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -82,7 +82,7 @@ void printResultVariantArray( VARIANT & var);
void printVariant( VARIANT & var);
void printSequence( Sequence<Any>& val);
-extern "C" int __cdecl main( int , char **)
+extern "C" int SAL_CALL main( int , char **)
{
HRESULT hr;
if( FAILED( hr=CoInitialize(NULL)))
diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx
b/extensions/test/ole/OleConverterVar1/convTest.cxx
index 8b8da67..0bc278b 100644
--- a/extensions/test/ole/OleConverterVar1/convTest.cxx
+++ b/extensions/test/ole/OleConverterVar1/convTest.cxx
@@ -74,7 +74,7 @@ void printVariant( VARIANT & var);
-int __cdecl _tmain( int argc, _TCHAR * argv[] )
+int SAL_CALL _tmain( int argc, _TCHAR * argv[] )
{
HRESULT hr;
if( FAILED( hr=CoInitialize(NULL)))
diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx
b/extensions/test/ole/cppToUno/testcppuno.cxx
index df0ce91..2e6a442 100644
--- a/extensions/test/ole/cppToUno/testcppuno.cxx
+++ b/extensions/test/ole/cppToUno/testcppuno.cxx
@@ -61,7 +61,7 @@ bool incrementMultidimensionalIndex(
const sal_Int32 * parDimensionLengths,
sal_Int32 * parMultidimensionalIndex);
-int __cdecl _tmain( int /*argc*/, _TCHAR * /*argv[]*/ )
+int SAL_CALL _tmain( int /*argc*/, _TCHAR * /*argv[]*/ )
{
HRESULT hr;
if( FAILED( hr=CoInitialize(NULL)))
--
1.7.4.1
From 56fbc29ae01b9334975214d776b07817957ba714 Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <ChrRossmanith@web.de>
Date: Thu, 26 May 2011 16:52:36 +0200
Subject: [PATCH] __cdecl -> SAL_CALL
---
io/test/testconnection.cxx | 6 +-----
sal/workben/t_random.c | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx
index 4fddf5f..d44a4b2 100644
--- a/io/test/testconnection.cxx
+++ b/io/test/testconnection.cxx
@@ -179,11 +179,7 @@ void testConnection( const OUString &sConnectionDescription ,
}
-#if (defined UNX)
-int main( int argc, char * argv[] )
-#else
-int __cdecl main( int argc, char * argv[] )
-#endif
+int SAL_CALL main( int argc, char * argv[] )
{
Reference< XMultiServiceFactory > xMgr(
createRegistryServiceFactory( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")) ) );
diff --git a/sal/workben/t_random.c b/sal/workben/t_random.c
index ea24cc4..56f2da5 100644
--- a/sal/workben/t_random.c
+++ b/sal/workben/t_random.c
@@ -45,11 +45,7 @@ static char *pt (unsigned char *md, int length)
/*
* main.
*/
-#ifdef WIN32
-int __cdecl main (void)
-#else
-int main (void)
-#endif
+int SAL_CALL main (void)
{
rtlRandomPool pool;
pool = rtl_random_createPool();
--
1.7.4.1
From 51704e1e0d410c34f8491a878502201588b92861 Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <ChrRossmanith@web.de>
Date: Thu, 26 May 2011 16:58:59 +0200
Subject: [PATCH 1/4] __cdecl -> SAL_CALL
---
sw/source/core/bastyp/calc.cxx | 9 +--------
sw/source/core/docnode/section.cxx | 18 ++----------------
sw/source/filter/html/svxcss1.cxx | 9 +--------
3 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 2bd18ed..6bf8e26 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -167,14 +167,7 @@ const sal_Int32 coContFlags =
extern "C" {
-static int
-#if defined( WNT )
- __cdecl
-#endif
-#if defined( ICC )
- _Optlink
-#endif
- OperatorCompare( const void *pFirst, const void *pSecond)
+static int SAL_CALL OperatorCompare( const void *pFirst, const void *pSecond)
{
int nRet = 0;
if( CALC_NAME == ((_CalcOp*)pFirst)->eOp )
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index ca4b4f2..ecb5c24 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -904,14 +904,7 @@ sal_Bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const
extern "C" {
- int
-#if defined( WNT )
- __cdecl
-#endif
-#if defined( ICC )
- _Optlink
-#endif
- lcl_SectionCmpPos( const void *pFirst, const void *pSecond)
+ int SAL_CALL lcl_SectionCmpPos( const void *pFirst, const void *pSecond)
{
const SwSectionFmt* pFSectFmt = (*(SwSectionPtr*)pFirst)->GetFmt();
const SwSectionFmt* pSSectFmt = (*(SwSectionPtr*)pSecond)->GetFmt();
@@ -923,14 +916,7 @@ extern "C" {
pSSectFmt->GetCntnt(sal_False).GetCntntIdx()->GetIndex();
}
- int
-#if defined( WNT )
- __cdecl
-#endif
-#if defined( ICC )
- _Optlink
-#endif
- lcl_SectionCmpNm( const void *pFirst, const void *pSecond)
+ int SAL_CALL lcl_SectionCmpNm( const void *pFirst, const void *pSecond)
{
const SwSectionPtr pFSect = *(SwSectionPtr*)pFirst;
const SwSectionPtr pSSect = *(SwSectionPtr*)pSecond;
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 9359a29..117ef4e 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -3172,14 +3172,7 @@ static int bSortedPropFns = sal_False;
extern "C"
{
-static int
-#if defined( WNT )
- __cdecl
-#endif
-#if defined( ICC )
- _Optlink
-#endif
- CSS1PropEntryCompare( const void *pFirst, const void *pSecond)
+static int SAL_CALL CSS1PropEntryCompare( const void *pFirst, const void *pSecond)
{
int nRet;
if( ((CSS1PropEntry*)pFirst)->pFunc )
--
1.7.4.1
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.