diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2011-05-26 15:02:42 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-05-26 15:05:21 +0200 |
| commit | e6703ce8a24fdc5b1698f0c3789b4423a84ad8fa (patch) | |
| tree | 65a08757905ca9a5fecbc62ef56a3f70d8fe0e82 /svtools | |
| parent | Don't build qa executables for iOS (diff) | |
| download | core-e6703ce8a24fdc5b1698f0c3789b4423a84ad8fa.tar.gz core-e6703ce8a24fdc5b1698f0c3789b4423a84ad8fa.zip | |
remove __cdecl and use SAL_CALL instead
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/edit/textdoc.cxx | 16 | ||||
| -rw-r--r-- | svtools/source/svrtf/rtfkeywd.cxx | 6 |
2 files changed, 4 insertions, 18 deletions
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index d070e8364dcc..fa7536035288 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -38,18 +38,8 @@ SV_IMPL_PTRARR( TextCharAttribs, TextCharAttribPtr ); // Vergleichmethode wird von QuickSort gerufen... -EXTERN_C -#ifdef WNT -#if _MSC_VER >= 1200 -int __cdecl -#else -int _cdecl -#endif -#else -int -#endif - -CompareStart( const void* pFirst, const void* pSecond ) +extern "C" { +int SAL_CALL CompareStart( const void* pFirst, const void* pSecond ) { if ( (*((TextCharAttrib**)pFirst))->GetStart() < (*((TextCharAttrib**)pSecond))->GetStart() ) return (-1); @@ -57,7 +47,7 @@ CompareStart( const void* pFirst, const void* pSecond ) return (1); return 0; } - +} // ------------------------------------------------------------------------- // (+) class TextCharAttrib diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index 76dccb5a5026..d3d5eedf6afd 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -1187,11 +1187,7 @@ static RTF_TokenEntry aRTFTokenTab[] = { extern "C" { -static int -#if defined( WNT ) - __cdecl -#endif - RTFKeyCompare( const void *pFirst, const void *pSecond) +static int SAL_CALL RTFKeyCompare( const void *pFirst, const void *pSecond) { int nRet = 0; if( -1 == ((RTF_TokenEntry*)pFirst)->nToken ) |