Re: [PATCH] Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition

Hi,
ok thank you for your advice and guidelines. 

I haven't deleted helpcontent2 yet but I will do it before the
next autogen and compilation. 

Would you like to have a look at the attached patch? What is
your opinion now?

Christos.

On Mon, 2012-12-10 at 13:24 +0100, Lubos Lunak wrote:
> On Sunday 09 of December 2012, Christos Strubulis wrote:
> > Ok thanks. I thought that this command would commit to the official
> > repository and not locally.
> >
> > Is this right now?
>
>  Yes, that's right. There are still two minor issues with the patch though:
>
> - your email in the commit is invalid ( "Christos Strubulis <strubul@ubuntu.
> (none)>"), see e.g. 
> https://help.github.com/articles/setting-your-email-in-git for how to fix it
>
> - SAL_CALL is already defined in sal/inc/sal/types.h , so there's no need to 
> define it again in tools/inc/tools/solar.h , the definition of 
> __LOADONCALLAPI should be simply removed there
>
>  Can you submit a new patch with these changes? Doing the solar.h change 
> and 'git commit -a --amend --reset-author'  should alter the already existing 
> commit you've already made. Thanks. I'll push the patch afterwards.
>
> PS: In the patch there's also a line about the helpcontent2 git subrepository, 
> meaning that it's probably out of date. You need to either do 'git submodule 
> update' after each 'git pull -r' ('./g pull -r' in the toplevel dir does that 
> automatically), or delete helpcontent2 and pass --without-help to autogen.sh 
> to avoid using it.

From 9503d7bde86638b1cc40fdbabdae0822f4a28a1a Mon Sep 17 00:00:00 2001
From: Christos Strubulis <strubul@ubuntu.(none)>
Date: Sun, 9 Dec 2012 10:08:10 -0800
Subject: [PATCH] Replacing '__LOADONCALLAPI' with 'SAL_CALL' definition

Change-Id: I692a9cfdca5ad50170eea2178a6aa87e8154b951
---
 extensions/workben/pythonautotest.cxx           |    2 +-
 extensions/workben/pythontest.cxx               |    2 +-
 extensions/workben/testcomponent.cxx            |    2 +-
 filter/qa/cppunit/filters-pict-test.cxx         |    2 +-
 filter/qa/cppunit/filters-tga-test.cxx          |    2 +-
 filter/qa/cppunit/filters-tiff-test.cxx         |    2 +-
 filter/source/graphicfilter/egif/egif.cxx       |    2 +-
 filter/source/graphicfilter/eos2met/eos2met.cxx |    2 +-
 filter/source/graphicfilter/epbm/epbm.cxx       |    2 +-
 filter/source/graphicfilter/epgm/epgm.cxx       |    2 +-
 filter/source/graphicfilter/epict/epict.cxx     |    2 +-
 filter/source/graphicfilter/eppm/eppm.cxx       |    2 +-
 filter/source/graphicfilter/eps/eps.cxx         |    2 +-
 filter/source/graphicfilter/eras/eras.cxx       |    2 +-
 filter/source/graphicfilter/etiff/etiff.cxx     |    2 +-
 filter/source/graphicfilter/expm/expm.cxx       |    2 +-
 filter/source/graphicfilter/icgm/cgm.cxx        |    2 +-
 filter/source/graphicfilter/idxf/idxf.cxx       |    2 +-
 filter/source/graphicfilter/ieps/ieps.cxx       |    2 +-
 filter/source/graphicfilter/ios2met/ios2met.cxx |    2 +-
 filter/source/graphicfilter/ipbm/ipbm.cxx       |    2 +-
 filter/source/graphicfilter/ipcd/ipcd.cxx       |    2 +-
 filter/source/graphicfilter/ipcx/ipcx.cxx       |    2 +-
 filter/source/graphicfilter/ipict/ipict.cxx     |    2 +-
 filter/source/graphicfilter/ipsd/ipsd.cxx       |    2 +-
 filter/source/graphicfilter/iras/iras.cxx       |    2 +-
 filter/source/graphicfilter/itga/itga.cxx       |    2 +-
 filter/source/graphicfilter/itiff/itiff.cxx     |    2 +-
 filter/source/msfilter/escherex.cxx             |    2 +-
 helpcontent2                                    |    2 +-
 sc/source/ui/attrdlg/scabstdlg.cxx              |    4 ++--
 sc/workben/test.cxx                             |    2 +-
 sd/source/filter/cgm/sdcgmfilter.cxx            |    4 ++--
 sd/source/filter/eppt/eppt.cxx                  |    4 ++--
 sd/source/filter/sdpptwrp.cxx                   |    4 ++--
 sd/source/ui/dlg/sdabstdlg.cxx                  |    4 ++--
 sd/source/ui/unoidl/unoobj.cxx                  |    2 +-
 svx/source/svdraw/svdhdl.cxx                    |    2 +-
 sw/source/filter/basflt/fltini.cxx              |    4 ++--
 sw/source/ui/dialog/swabstdlg.cxx               |    4 ++--
 tools/inc/tools/solar.h                         |    4 ++--
 vcl/source/gdi/bitmap3.cxx                      |    2 +-
 vcl/source/gdi/bitmap4.cxx                      |    2 +-
 vcl/source/gdi/impvect.cxx                      |    2 +-
 vcl/source/gdi/outdev4.cxx                      |    2 +-
 vcl/source/window/abstdlg.cxx                   |    4 ++--
 46 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index df3f710..3e07025 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 71639c2..0d2f962 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 9cd7dd4..61a4723 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 9e5a296..7f3313d 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 9edcf62..08c7998 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 b967393..fcf0203 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 675f159..e95d135 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 834a0f4..5e8bd9b 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 6fa40f6..f1b6c15 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 ee15316..98edf9a 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 e62bca1..7ac44a7 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 d908002..f238a84 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 5304e03..68f7a3a 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 350239e..f5b008e 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 ee79f50..4ef3950 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 51cafa0..8cce4e7 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 993bfa1..c8dd2c0 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 13915ff..bfb1edc 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 252dadd..ee146db 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 21dae7b..c98011e 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 6f5fcce..7be589e 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 f0928fb..9eaea9f 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 b51c222..d9a9e68 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 97e90d7..f7b3af3 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 21597a6..ce565ae 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 833d2fe..93d9273 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 01e18ac..60715b1 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 961acdd..55b7182 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 c57ca80..d078567 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/helpcontent2 b/helpcontent2
index 6ff9e11..22de25a 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6ff9e113ec347757b3f5c91836c55902bd0e0ac9
+Subproject commit 22de25aee5060ad81e2c37d3012eb0eab509614e
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 2200c7c..925ff99 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 236dd79..2ec6a2f 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 ba62441..e414453 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 c138bd8..ac11be4 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 049b2fe..bbb3839 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 aa49403..aa8fcfc 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 30f5ec7..83dc942 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 020bb6a..1ed280f 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 6df6cd7..3f92f99 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -888,8 +888,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 fc65f7c..1a1993a 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 74df22f..fa3562a 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -36,9 +36,9 @@ typedef sal_uIntPtr    sal_uLong; /* Replaces type ULONG */
 #define DELETEZ( p )    ( delete p,p = 0 )
 
 #ifdef WNT
-#define __LOADONCALLAPI __cdecl
+#define SAL_CALL __cdecl
 #else
-#define __LOADONCALLAPI
+#define SAL_CALL
 #endif
 
 // solar binary types
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index fab9d90..10b1160 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 be50269..dccb5fa 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 b952b68..26c12f8 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 73e4f9c..8096924 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 f5dcef7..f2a8cb6 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;
-- 
1.7.10.4