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 /sw | |
| parent | e7e4d6778661d039d6ee9cba1da1a22cea542f3e (diff) | |
Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition
Change-Id: I692a9cfdca5ad50170eea2178a6aa87e8154b951
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swabstdlg.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 8664fa4239bb..7e64eb8d8716 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -742,8 +742,8 @@ void GetWW8Writer( const String& rFltName, const String& rBaseURL, WriterRef& xR #endif } -typedef sal_uLong ( __LOADONCALLAPI *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const String& ); -typedef sal_uLong ( __LOADONCALLAPI *GetSaveWarning )( SfxObjectShell& ); +typedef sal_uLong ( SAL_CALL *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const String& ); +typedef sal_uLong ( SAL_CALL *GetSaveWarning )( SfxObjectShell& ); sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const String& rStorageName ) { diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index fc65f7c9bdfb..1a1993a7c4a9 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -24,7 +24,7 @@ #include <tools/string.hxx> #include <vcl/unohelp.hxx> -typedef SwAbstractDialogFactory* (__LOADONCALLAPI *SwFuncPtrCreateDialogFactory)(); +typedef SwAbstractDialogFactory* (SAL_CALL *SwFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING @@ -44,7 +44,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) - fp = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() ) + fp = ( SwAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory"))); if ( fp ) return fp(); |