diff options
| author | Christos Strubulis <strubul@ubuntu.(none)> | 2012-12-09 10:08:10 -0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-12-10 21:38:28 +0000 |
| commit | c13ad097fb224a2fd110234db7a60f133735dfa6 (patch) | |
| tree | f3851afc849ff74a3defdef560e2f8738a082614 /vcl | |
| parent | e7e4d6778661d039d6ee9cba1da1a22cea542f3e (diff) | |
Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition
Change-Id: I692a9cfdca5ad50170eea2178a6aa87e8154b951
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmap4.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/impvect.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev4.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index fab9d90acae1..10b1160f471d 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -1634,7 +1634,7 @@ struct PopularColorCount sal_uInt32 mnCount; }; -extern "C" int __LOADONCALLAPI ImplPopularCmpFnc( const void* p1, const void* p2 ) +extern "C" int SAL_CALL ImplPopularCmpFnc( const void* p1, const void* p2 ) { int nRet; diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index be50269b9fd3..dccb5fa05dcf 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -933,7 +933,7 @@ struct PopArtEntry // ------------------------------------------------------------------------ -extern "C" int __LOADONCALLAPI ImplPopArtCmpFnc( const void* p1, const void* p2 ) +extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 ) { int nRet; diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index b952b680f33d..26c12f8f4be1 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -122,7 +122,7 @@ inline sal_Bool ImplColorSet::operator>( const ImplColorSet& rSet ) const // ---------------------------------------------------------------------------- -extern "C" int __LOADONCALLAPI ImplColorSetCmpFnc( const void* p1, const void* p2 ) +extern "C" int SAL_CALL ImplColorSetCmpFnc( const void* p1, const void* p2 ) { ImplColorSet* pSet1 = (ImplColorSet*) p1; ImplColorSet* pSet2 = (ImplColorSet*) p2; diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index 73e4f9cbcf62..8096924a1bfa 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -54,7 +54,7 @@ // - Cmp-Function - // ---------------- -extern "C" int __LOADONCALLAPI ImplHatchCmpFnc( const void* p1, const void* p2 ) +extern "C" int SAL_CALL ImplHatchCmpFnc( const void* p1, const void* p2 ) { const long nX1 = ( (Point*) p1 )->X(); const long nX2 = ( (Point*) p2 )->X(); diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index f5dcef742ad9..f2a8cb64d0d9 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -23,7 +23,7 @@ #include <osl/module.hxx> #include <tools/string.hxx> -typedef VclAbstractDialogFactory* (__LOADONCALLAPI *FuncPtrCreateDialogFactory)(); +typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } @@ -38,7 +38,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() static ::osl::Module aDialogLibrary; if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( CUI_DLL_NAME ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) - fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() ) + fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); #else fp = CreateDialogFactory; |