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 /sc | |
| parent | e7e4d6778661d039d6ee9cba1da1a22cea542f3e (diff) | |
Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition
Change-Id: I692a9cfdca5ad50170eea2178a6aa87e8154b951
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/attrdlg/scabstdlg.cxx | 4 | ||||
| -rw-r--r-- | sc/workben/test.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 2200c7c75639..925ff9963cc8 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -25,7 +25,7 @@ using ::rtl::OUStringBuffer; -typedef ScAbstractDialogFactory* (__LOADONCALLAPI *ScFuncPtrCreateDialogFactory)(); +typedef ScAbstractDialogFactory* (SAL_CALL *ScFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING @@ -48,7 +48,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) - fp = ( ScAbstractDialogFactory* (__LOADONCALLAPI*)() ) + fp = ( ScAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) ); if ( fp ) return fp(); diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 236dd79e3761..2ec6a2fcbee1 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -167,7 +167,7 @@ void ScTestListener::selectionChanged(const EventObject& aEvent) //----------------------------------------------------------------------- -extern "C" Window* __LOADONCALLAPI CreateWindow( Window *pParent, const String& rParam ) +extern "C" Window* SAL_CALL CreateWindow( Window *pParent, const String& rParam ) { MyWindow *pWin = new MyWindow( pParent ); return pWin; |