[PATCH 1/2] __cdecl -> SAL_CALL

[Christina Rossmanith]

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


--------------080602030602070101080504
Content-Type: text/x-patch;
 name="0001-__cdecl-SAL_CALL.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0001-__cdecl-SAL_CALL.patch"