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 /sd | |
| parent | fdo#55570 - use a hash instead of set initially until sorting needed (diff) | |
| download | core-c13ad097fb224a2fd110234db7a60f133735dfa6.tar.gz core-c13ad097fb224a2fd110234db7a60f133735dfa6.zip | |
Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition
Change-Id: I692a9cfdca5ad50170eea2178a6aa87e8154b951
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/cgm/sdcgmfilter.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdabstdlg.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index ba624419e576..e414453ca191 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -58,8 +58,8 @@ using namespace ::com::sun::star::frame; // ------------ -typedef sal_uInt32 ( __LOADONCALLAPI *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); -typedef sal_Bool ( __LOADONCALLAPI *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); +typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); #ifdef DISABLE_DYNLOADING diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index c138bd85673d..ac11be4a1be5 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1467,7 +1467,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() // - exported function - // --------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) @@ -1486,7 +1486,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( const std::v return bStatus; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) { SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 049b2febf616..bbb383937f9f 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -40,14 +40,14 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_Bool ( __LOADONCALLAPI *ExportPPTPointer )( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&, +typedef sal_Bool ( SAL_CALL *ExportPPTPointer )( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, SvMemoryStream*, sal_uInt32 nCnvrtFlags ); typedef sal_Bool ( SAL_CALL *ImportPPTPointer )( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); -typedef sal_Bool ( __LOADONCALLAPI *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& ); +typedef sal_Bool ( SAL_CALL *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& ); #ifdef DISABLE_DYNLOADING diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index aa49403bd486..aa8fcfc48e4d 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -24,7 +24,7 @@ #include <rtl/ustring.hxx> #include <vcl/unohelp.hxx> -typedef SdAbstractDialogFactory* (__LOADONCALLAPI *SdFuncPtrCreateDialogFactory)(); +typedef SdAbstractDialogFactory* (SAL_CALL *SdFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING @@ -43,7 +43,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() static ::osl::Module aDialogLibrary; static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) ) - fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() ) + fp = ( SdAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" ); if ( fp ) return fp(); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 30f5ec7174fb..83dc942d7473 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -298,7 +298,7 @@ struct SortStruct typedef SortStruct SORT; typedef SORT* PSORT; -extern "C" int __LOADONCALLAPI SortFunc( const void* p1, const void* p2 ); +extern "C" int SAL_CALL SortFunc( const void* p1, const void* p2 ); SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw() : mpShape( pShape ), |