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 | |
parent | e7e4d6778661d039d6ee9cba1da1a22cea542f3e (diff) |
Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition
Change-Id: I692a9cfdca5ad50170eea2178a6aa87e8154b951
45 files changed, 52 insertions, 58 deletions
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index df3f7102fd9b..3e07025597ab 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -396,7 +396,7 @@ BOOL PythonCodeLibrary::queryInterface( Uik aUik, XInterfaceRef & rOut ) /* * main. */ -int __LOADONCALLAPI main (int argc, char **argv) +int SAL_CALL main (int argc, char **argv) { // necessary startup code XMultiServiceFactoryRef xSMgr = createRegistryServiceManager(); diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index 71639c243991..0d2f96296f6e 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -463,7 +463,7 @@ BOOL CmdDebugger::queryInterface( Uik aUik, XInterfaceRef & rOut ) /* * main. */ -int __LOADONCALLAPI main (int argc, char **argv) +int SAL_CALL main (int argc, char **argv) { XMultiServiceFactoryRef xSMgr = createRegistryServiceManager(); registerUsrServices( xSMgr ); diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 9cd7dd43515a..61a4723730fe 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -50,7 +50,7 @@ using ::rtl::OStringToOWString; extern "C" void ChangeGlobalInit(); #endif -int __LOADONCALLAPI main (int argc, char **argv) +int SAL_CALL main (int argc, char **argv) { if( argc < 3) { diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index 9e5a296e7e16..7f3313d9442c 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -18,7 +18,7 @@ extern "C" { - SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index 9edcf62b57a7..08c7998d6bd9 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -38,7 +38,7 @@ extern "C" { - SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index b967393e9ec8..fcf0203215fa 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -38,7 +38,7 @@ extern "C" { - SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 675f159d4ae0..e95d13526277 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -562,7 +562,7 @@ void GIFWriter::WriteTerminator() #define GraphicExport egiGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ) { diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 834a0f462798..5e8bd9bc502c 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -2557,7 +2557,7 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, #define GraphicExport emeGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool ) { METWriter aMETWriter; diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 6fa40f6b69df..f1b6c1567340 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -193,7 +193,7 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) #define GraphicExport epbGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PBMWriter aPBMWriter(rStream); diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index ee1531602e5c..98edf9a6ca6a 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -218,7 +218,7 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) #define GraphicExport epgGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PGMWriter aPGMWriter(rStream); diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index e62bca119ceb..7ac44a7ebd1f 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2277,7 +2277,7 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea #define GraphicExport eptGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PictWriter aPictWriter; diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index d908002734fd..f238a84ba26e 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -226,7 +226,7 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) #define GraphicExport eppGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PPMWriter aPPMWriter(rStream); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 5304e03d5eac..68f7a3a528e0 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2765,7 +2765,7 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL #define GraphicExport epsGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PSWriter aPSWriter; diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 350239e7bf36..f5b008eabcee 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -273,7 +273,7 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis ) #define GraphicExport eraGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { RASWriter aRASWriter(rStream); diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index ee79f50bb777..4ef3950849e3 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -603,7 +603,7 @@ void TIFFWriter::EndCompression() #define GraphicExport etiGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { TIFFWriter aWriter(rStream); diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 51cafa036ae3..8cce4e736715 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -254,7 +254,7 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) #define GraphicExport expGraphicExport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { XPMWriter aXPMWriter(rStream); diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 993bfa19fdff..c8dd2c0632ad 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -762,7 +762,7 @@ SvStream& operator>>( SvStream& rOStm, CGM& /*rCGM*/ ) //================== GraphicImport - die exportierte Funktion ================ -extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar ) { diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index 13915ffee0b9..bfb1edc193c9 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -33,7 +33,7 @@ class FilterConfigItem; #define GraphicImport idxGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { DXFRepresentation aDXF; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 252dadd9db66..ee146dbc25ea 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -499,7 +499,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, #define GraphicImport ipsGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { if ( rStream.GetError() ) diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 21dae7b075eb..c98011e84e36 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2723,7 +2723,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF #define GraphicImport imeGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { OS2METReader aOS2METReader; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 6f5fcce96f04..7be589ea8f72 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -524,7 +524,7 @@ sal_Bool PBMReader::ImplReadBody() #define GraphicImport ipbGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PBMReader aPBMReader(rStream); diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index f0928fb4a14d..9eaea9fd24a8 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -371,7 +371,7 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent) #define GraphicImport icdGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool) { PCDReader aPCDReader(rStream); diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index b51c2221ad2f..d9a9e68fad8b 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -404,7 +404,7 @@ void PCXReader::ImplReadPalette( sal_uLong nCol ) #define GraphicImport ipxGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PCXReader aPCXReader(rStream); diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 97e90d7b1fac..f7b3af308f87 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1868,7 +1868,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) #define GraphicImport iptGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { GDIMetaFile aMTF; diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 21597a61553c..ce565ae9a3de 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -724,7 +724,7 @@ sal_Bool PSDReader::ImplReadBody() #define GraphicImport ipdGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PSDReader aPSDReader(rStream); diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 833d2fefcd83..93d92737616b 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -342,7 +342,7 @@ sal_uInt8 RASReader::ImplGetByte() #define GraphicImport iraGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { RASReader aRASReader(rStream); diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 01e18aca87bc..60715b107500 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -801,7 +801,7 @@ sal_Bool TGAReader::ImplReadPalette() #define GraphicImport itgGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { TGAReader aTGAReader(rStream); diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 961acdd1ba98..55b71823de58 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1369,7 +1369,7 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) #define GraphicImport itiGraphicImport #endif -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { TIFFReader aTIFFReader; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index c57ca80646e1..d07856787ba8 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -281,7 +281,7 @@ EscherProperties EscherPropertyContainer::GetOpts() const return aVector; } -extern "C" int __LOADONCALLAPI EscherPropSortFunc( const void* p1, const void* p2 ) +extern "C" int SAL_CALL EscherPropSortFunc( const void* p1, const void* p2 ) { sal_Int16 nID1 = ((EscherPropSortStruct*)p1)->nPropId &~0xc000; sal_Int16 nID2 = ((EscherPropSortStruct*)p2)->nPropId &~0xc000; 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; 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 ), diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 020bb6a30c8b..1ed280f14bac 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1730,7 +1730,7 @@ struct ImplHdlAndIndex // Helper method for sorting handles taking care of OrdNums, keeping order in // single objects and re-sorting polygon handles intuitively -extern "C" int __LOADONCALLAPI ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) +extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) { const ImplHdlAndIndex* p1 = (ImplHdlAndIndex*)pVoid1; const ImplHdlAndIndex* p2 = (ImplHdlAndIndex*)pVoid2; 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(); diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index 74df22f58843..2712f9c62b5a 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -35,12 +35,6 @@ typedef sal_uIntPtr sal_uLong; /* Replaces type ULONG */ #define DELETEZ( p ) ( delete p,p = 0 ) -#ifdef WNT -#define __LOADONCALLAPI __cdecl -#else -#define __LOADONCALLAPI -#endif - // solar binary types /* Solar (portable) Binary (exchange) Type; OSI 6 subset 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; |