[PATCH] __cdecl -> SAL_CALL

[Christina Rossmanith]

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


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