[PATCH 1/4] __cdecl -> SAL_CALL

[Christina Rossmanith]

---
 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


--------------080602030602070101080504--