diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-05-24 12:59:31 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-06-04 22:52:39 +0200 |
| commit | 070010f0505836b4dc47e737965d9d0a736fd3a0 (patch) | |
| tree | 9cd03a97090a6311dcd4b4e6e21de7bade91eb36 | |
| parent | 207156d8eeee7b0aec1d6513e0aca2f9535adeb1 (diff) | |
__cdecl -> SAL_CALL
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 6 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridcols.cxx | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 49359002de34..67152990891c 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1360,11 +1360,7 @@ void SfxBindings::UpdateSlotServer_Impl() //-------------------------------------------------------------------- -#ifdef WNT -int __cdecl CmpUS_Impl(const void *p1, const void *p2) -#else -int CmpUS_Impl(const void *p1, const void *p2) -#endif +int SAL_CALL CmpUS_Impl(const void *p1, const void *p2) /* [Description] diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 059c57667a25..8c69e1b4bbc5 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -987,11 +987,7 @@ void SfxSingleTabDialog::SetInfoLink( const Link& rLink ) //-------------------------------------------------------------------- // Comparison function for qsort -#ifdef WNT -int __cdecl BaseDlgsCmpUS_Impl( const void* p1, const void* p2 ) -#else -extern "C" int BaseDlgsCmpUS_Impl( const void* p1, const void* p2 ) -#endif +extern "C" int SAL_CALL BaseDlgsCmpUS_Impl( const void* p1, const void* p2 ) { return *(sal_uInt16*)p1 - *(sal_uInt16*)p2; } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 94897e75356c..c9d90ae59b0b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1590,11 +1590,7 @@ int SfxTabDialog::FillOutputItemSet() // ----------------------------------------------------------------------- -#ifdef WNT -int __cdecl TabDlgCmpUS_Impl( const void* p1, const void* p2 ) -#else -extern "C" int TabDlgCmpUS_Impl( const void* p1, const void* p2 ) -#endif +extern "C" int SAL_CALL TabDlgCmpUS_Impl( const void* p1, const void* p2 ) /* [Description] diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 9b6dfd688eac..75a604822720 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -58,11 +58,7 @@ const ::comphelper::StringSequence& getColumnTypes() //------------------------------------------------------------------ // Vergleichen von PropertyInfo -extern "C" int -#if defined( WNT ) - __cdecl -#endif - NameCompare(const void* pFirst, const void* pSecond) +extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) { return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond); } |