Bin MA_FASTCALL nonsense

Change-Id: Ifebc06daf56ee0e4dc29d592afba5a07575c99af

10 files changed, 56 insertions, 62 deletions

diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index e31d8b93cd5c..8e3a65209cea 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -50,12 +50,6 @@ class SwPageDesc;
 class SwTableBox;
 struct SwFindRowSpanCacheObj;
 
-#if defined(MSC)
-#define MA_FASTCALL __fastcall
-#else
-#define MA_FASTCALL
-#endif
-
 #define FAR_AWAY       LONG_MAX - 20000        //Initale Position der Flys.
 #define BROWSE_HEIGHT   56700L * 10L               //10 Meter
 
@@ -66,13 +60,13 @@ struct SwFindRowSpanCacheObj;
 //Painten des Hintergrunds. Mit Brush oder Graphic.
 // - add 6th parameter to indicate that method should
 //     consider background transparency, saved in the color of the brush item
-void MA_FASTCALL DrawGraphic( const SvxBrushItem *, OutputDevice *,
-      const SwRect &rOrg, const SwRect &rOut, const sal_uInt8 nGrfNum = GRFNUM_NO,
-      const sal_Bool bConsiderBackgroundTransparency = sal_False );
+void DrawGraphic( const SvxBrushItem *, OutputDevice *,
+                  const SwRect &rOrg, const SwRect &rOut, const sal_uInt8 nGrfNum = GRFNUM_NO,
+                  const sal_Bool bConsiderBackgroundTransparency = sal_False );
 
 // - method to align rectangle
 // Created declaration here to avoid <extern> declarations
-void MA_FASTCALL SwAlignRect( SwRect &rRect, const ViewShell *pSh );
+void SwAlignRect( SwRect &rRect, const ViewShell *pSh );
 
 // - method to align graphic rectangle
 // Created declaration here to avoid <extern> declarations
@@ -84,13 +78,13 @@ void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut );
 SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh );
 
 //Nicht gleich die math.lib anziehen.
-sal_uLong MA_FASTCALL SqRt( BigInt nX );
+sal_uLong SqRt( BigInt nX );
 
 SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart );
 void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow );
 
 //CntntNodes besorgen, CntntFrms erzeugen und in den LayFrm haengen.
-void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, sal_uLong nIndex,
+void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, sal_uLong nIndex,
                  sal_Bool bPages = sal_False, sal_uLong nEndIndex = 0,
                  SwFrm *pPrv = 0 );
 
@@ -105,11 +99,11 @@ extern sal_Bool bDontCreateObjects;
 extern sal_Bool bSetCompletePaintOnInvalidate;
 
 //Fuer Tabelleneinstellung per Tastatur.
-long MA_FASTCALL CalcRowRstHeight( SwLayoutFrm *pRow );
-long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm );  //MA_FLY_HEIGHT
+long CalcRowRstHeight( SwLayoutFrm *pRow );
+long CalcHeightWidthFlys( const SwFrm *pFrm );
 
 //Neue Seite einsetzen
-SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
+SwPageFrm *InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
                           sal_Bool bOdd, sal_Bool bInsertEmpty, sal_Bool bFtn,
                           SwFrm *pSibling );
 
@@ -134,7 +128,7 @@ const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp );
 
 sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
 
-const SwFrm * MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage );
+const SwFrm * FindPage( const SwRect &rRect, const SwFrm *pPage );
 
 // wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm
 //              gerufen
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 5f08cda28beb..99648f3e8f65 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -83,7 +83,7 @@ SwColumnFrm::~SwColumnFrm()
 |*
 |*************************************************************************/
 
-void MA_FASTCALL lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt )
+void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt )
 {
     OSL_ENSURE( pCont && pCont->Lower() && pCont->Lower()->IsColumnFrm(),
             "Keine Spalten zu entfernen." );
@@ -105,7 +105,7 @@ void MA_FASTCALL lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt )
     }
 }
 
-SwLayoutFrm * MA_FASTCALL lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount )
+SwLayoutFrm * lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount )
 {
     SwFrm *pCol = pLay->Lower();
     if ( pLay->IsPageFrm() )
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 3aa99b323c2e..58d41138b679 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -581,7 +581,7 @@ public:
           !rTwo.nSub || nSub <= rTwo.nSub ) ); }
 };
 
-const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet,
+const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
                                          const Point &rPt,
                                          const SwCntntFrm *pCnt )
 {
@@ -896,7 +896,7 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet,
     return 0;
 }
 
-sal_uLong MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
+sal_uLong lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
                           const SwCntntFrm *& rpCnt,
                           const sal_Bool bBody, const sal_Bool bFtn )
 {
@@ -961,7 +961,7 @@ sal_uLong MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay
     return nDistance;
 }
 
-const SwCntntFrm * MA_FASTCALL lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt,
+const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt,
                                   const sal_Bool bBody, const sal_Bool bFtn )
 {
     //Starting from pCnt searches the CntntFrm whose left upper corner is the
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index fe4286304b8b..d1ff0b3b566d 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1206,7 +1206,7 @@ void lcl_SetPos( SwFrm&             _rNewFrm,
         _rNewFrm.Frm().Pos().Y() += 1;
 }
 
-void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
+void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                              sal_uLong nIndex, sal_Bool bPages, sal_uLong nEndIndex,
                              SwFrm *pPrv )
 {
@@ -2354,7 +2354,7 @@ const SdrObject *SwOrderIter::Prev()
 
 // #115759# - 'remove' also drawing object from page and
 // at-fly anchored objects from page
-void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm )
+void lcl_RemoveObjsFromPage( SwFrm* _pFrm )
 {
     OSL_ENSURE( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_RemoveFlysFromPage." );
     SwSortedObjs &rObjs = *_pFrm->GetDrawObjs();
@@ -2517,7 +2517,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
 
 // #115759# - add also drawing objects to page and at-fly
 // anchored objects to page
-void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
+void lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
 {
     OSL_ENSURE( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_AddFlysToPage." );
     SwSortedObjs &rObjs = *_pFrm->GetDrawObjs();
@@ -2666,7 +2666,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
 |*
 |*************************************************************************/
 
-sal_uLong MA_FASTCALL SqRt( BigInt nX )
+sal_uLong SqRt( BigInt nX )
 {
     BigInt nErg = 1;
 
@@ -2684,7 +2684,7 @@ sal_uLong MA_FASTCALL SqRt( BigInt nX )
 
 /*************************************************************************/
 
-SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
+SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
                           sal_Bool bOdd, sal_Bool bInsertEmpty, sal_Bool bFtn,
                           SwFrm *pSibling )
 {
@@ -2724,7 +2724,7 @@ SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
 |*
 |*************************************************************************/
 
-void MA_FASTCALL lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch )
+void lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch )
 {
     SwSortedObjs *pObjs = (SwSortedObjs*)pAnch->GetDrawObjs();
     for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i )
@@ -2892,7 +2892,7 @@ void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect )
     }
 }
 
-void MA_FASTCALL lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt,
+void lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt,
     const SwRect &rRect, const PrepareHint eHint )
 {
     if ( pCnt->IsTxtFrm() )
@@ -3224,7 +3224,7 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm )
 
 //---------------------------------
 
-SwTwips MA_FASTCALL lcl_CalcCellRstHeight( SwLayoutFrm *pCell )
+SwTwips lcl_CalcCellRstHeight( SwLayoutFrm *pCell )
 {
     if ( pCell->Lower()->IsCntntFrm() || pCell->Lower()->IsSctFrm() )
     {
@@ -3268,7 +3268,7 @@ SwTwips MA_FASTCALL lcl_CalcCellRstHeight( SwLayoutFrm *pCell )
     }
 }
 
-SwTwips MA_FASTCALL CalcRowRstHeight( SwLayoutFrm *pRow )
+SwTwips CalcRowRstHeight( SwLayoutFrm *pRow )
 {
     SwTwips nRstHeight = LONG_MAX;
     SwLayoutFrm *pLow = (SwLayoutFrm*)pRow->Lower();
@@ -3280,7 +3280,7 @@ SwTwips MA_FASTCALL CalcRowRstHeight( SwLayoutFrm *pRow )
     return nRstHeight;
 }
 
-const SwFrm* MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage )
+const SwFrm* FindPage( const SwRect &rRect, const SwFrm *pPage )
 {
     if ( !rRect.IsOver( pPage->Frm() ) )
     {
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 38e3ee847389..c7124fdb3798 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -61,7 +61,7 @@
 
 #define ENDNOTE 0x80000000
 
-sal_uLong MA_FASTCALL lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr )
+sal_uLong lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr )
 {
     const SwFtnIdxs &rFtnIdxs = pDoc->GetFtnIdxs();
 
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 127cc6f4a3b6..aa646c4e2505 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -405,7 +405,7 @@ void SwPageFrm::CheckDirection( sal_Bool bVert )
 |*      generischen Cntnt
 |*
 |*************************************************************************/
-void MA_FASTCALL lcl_FormatLay( SwLayoutFrm *pLay )
+void lcl_FormatLay( SwLayoutFrm *pLay )
 {
     //Alle LayoutFrms - nicht aber Tables, Flys o.ae. - formatieren.
 
@@ -420,7 +420,7 @@ void MA_FASTCALL lcl_FormatLay( SwLayoutFrm *pLay )
     pLay->Calc();
 }
 
-void MA_FASTCALL lcl_MakeObjs( const SwSpzFrmFmts &rTbl, SwPageFrm *pPage )
+void lcl_MakeObjs( const SwSpzFrmFmts &rTbl, SwPageFrm *pPage )
 {
     //Anlegen bzw. registrieren von Flys und Drawobjekten.
     //Die Formate stehen in der SpzTbl (vom Dokument).
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 1fc1744e43db..2510c45b507e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1180,7 +1180,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
 // Correction: adjust rectangle on pixel level in order
 //          to assure, that the border 'leaves its original pixel', if it has to.
 //          No prior adjustments for odd relation between pixel and twip.
-void MA_FASTCALL SwAlignRect( SwRect &rRect, const ViewShell *pSh )
+void SwAlignRect( SwRect &rRect, const ViewShell *pSh )
 {
     if( !rRect.HasArea() )
         return;
@@ -1329,7 +1329,7 @@ void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut )
     pGrfRect->SSize( rOut.PixelToLogic( aPxRect.GetSize() ) );
 }
 
-long MA_FASTCALL lcl_AlignWidth( const long nWidth )
+long lcl_AlignWidth( const long nWidth )
 {
     if ( nWidth )
     {
@@ -1341,7 +1341,7 @@ long MA_FASTCALL lcl_AlignWidth( const long nWidth )
     return nWidth;
 }
 
-long MA_FASTCALL lcl_AlignHeight( const long nHeight )
+long lcl_AlignHeight( const long nHeight )
 {
     if ( nHeight )
     {
@@ -1353,14 +1353,14 @@ long MA_FASTCALL lcl_AlignHeight( const long nHeight )
     return nHeight;
 }
 
-long MA_FASTCALL lcl_MinHeightDist( const long nDist )
+long lcl_MinHeightDist( const long nDist )
 {
     if ( aScaleX < aMinDistScale || aScaleY < aMinDistScale )
         return nDist;
     return ::lcl_AlignHeight( Max( nDist, nMinDistPixelH ));
 }
 
-long MA_FASTCALL lcl_MinWidthDist( const long nDist )
+long lcl_MinWidthDist( const long nDist )
 {
     if ( aScaleX < aMinDistScale || aScaleY < aMinDistScale )
         return nDist;
@@ -1368,7 +1368,7 @@ long MA_FASTCALL lcl_MinWidthDist( const long nDist )
 }
 
 //Calculate PrtArea plus surrounding plus shadow.
-void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm,
+void lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm,
                                         const SwBorderAttrs &rAttrs,
                                         const sal_Bool bShadow )
 {
@@ -1463,7 +1463,7 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm,
     ::SwAlignRect( rRect, pGlobalShell );
 }
 
-void MA_FASTCALL lcl_ExtendLeftAndRight( SwRect&                _rRect,
+void lcl_ExtendLeftAndRight( SwRect&                _rRect,
                                          const SwFrm&           _rFrm,
                                          const SwBorderAttrs&   _rAttrs,
                                          const SwRectFn&        _rRectFn )
@@ -1482,7 +1482,7 @@ void MA_FASTCALL lcl_ExtendLeftAndRight( SwRect&                _rRect,
     }
 }
 
-void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
+void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
                            const SwRect &rRect, SwRegionRects &rRegion )
 {
     const SwSortedObjs& rObjs = *pPage->GetSortedObjs();
@@ -1800,7 +1800,7 @@ void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut,
         pOut->Pop();
 } // end of method <lcl_DrawGraphic>
 
-void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush,
+void DrawGraphic( const SvxBrushItem *pBrush,
                               OutputDevice *pOutDev,
                               const SwRect &rOrg,
                               const SwRect &rOut,
@@ -3257,7 +3257,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
 |*
 |*************************************************************************/
 
-void MA_FASTCALL lcl_EmergencyFormatFtnCont( SwFtnContFrm *pCont )
+void lcl_EmergencyFormatFtnCont( SwFtnContFrm *pCont )
 {
     //It's possible that the Cont will get destroyed.
     SwCntntFrm *pCnt = pCont->ContainsCntnt();
@@ -3860,7 +3860,7 @@ void SwCellFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 |*************************************************************************/
 
 //Weiter unten definiert
-void MA_FASTCALL lcl_PaintLowerBorders( const SwLayoutFrm *pLay,
+void lcl_PaintLowerBorders( const SwLayoutFrm *pLay,
                                const SwRect &rRect, const SwPageFrm *pPage );
 
 struct BorderLinesGuard
@@ -4413,7 +4413,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect,
 // printer output device.
 // NOTE: For printer output device left/right border rectangle <_iorRect>
 //       has to be already non-overlapping the outer top/bottom border rectangle.
-void MA_FASTCALL lcl_SubTopBottom( SwRect&              _iorRect,
+void lcl_SubTopBottom( SwRect&              _iorRect,
                                    const SvxBoxItem&    _rBox,
                                    const SwBorderAttrs& _rAttrs,
                                    const SwFrm&         _rFrm,
@@ -6293,7 +6293,7 @@ SizePtr pWidth = &Size::nA;
 SizePtr pHeight = &Size::nB;
 
 // OD 18.11.2002 #99672# - new parameter <_pSubsLines>
-void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
+void lcl_RefreshLine( const SwLayoutFrm *pLay,
                                   const SwPageFrm *pPage,
                                   const Point &rP1,
                                   const Point &rP2,
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 27d8ffdb9173..a008a13bb120 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -197,19 +197,19 @@ void SwTabFrm::RegistFlys()
 /*************************************************************************
 |*  Some prototypes
 |*************************************************************************/
-void MA_FASTCALL SwInvalidateAll( SwFrm *pFrm, long nBottom );
-void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom );
+void SwInvalidateAll( SwFrm *pFrm, long nBottom );
+void lcl_RecalcRow( SwRowFrm& rRow, long nBottom );
 sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva );
 // #i26945# - add parameter <_bOnlyRowsAndCells> to control
 // that only row and cell frames are formatted.
-sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm,
+sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm,
                                       long nBottom,
                                       bool _bOnlyRowsAndCells = false );
 // OD 2004-02-18 #106629# - correct type of 1st parameter
 // #i26945# - add parameter <_bConsiderObjs> in order to
 // control, if floating screen objects have to be considered for the minimal
 // cell height.
-SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm *pRow,
+SwTwips lcl_CalcMinRowHeight( const SwRowFrm *pRow,
                                           const sal_Bool _bConsiderObjs );
 SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm&, const SwBorderAttrs& );
 
@@ -1380,7 +1380,7 @@ bool SwTabFrm::Join()
 |*  SwTabFrm::MakeAll()
 |*
 |*************************************************************************/
-void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom )
+void SwInvalidatePositions( SwFrm *pFrm, long nBottom )
 {
     // LONG_MAX == nBottom means we have to calculate all
     sal_Bool bAll = LONG_MAX == nBottom;
@@ -1405,7 +1405,7 @@ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom )
               (*fnRect->fnYDiff)( (pFrm->Frm().*fnRect->fnGetTop)(), nBottom ) < 0 ) );
 }
 
-void MA_FASTCALL SwInvalidateAll( SwFrm *pFrm, long nBottom )
+void SwInvalidateAll( SwFrm *pFrm, long nBottom )
 {
     // LONG_MAX == nBottom means we have to calculate all
     sal_Bool bAll = LONG_MAX == nBottom;
@@ -1556,7 +1556,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
 
 // #i26945# - add parameter <_bOnlyRowsAndCells> to control
 // that only row and cell frames are formatted.
-sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm,
+sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm,
                                       long nBottom,
                                       bool _bOnlyRowsAndCells )
 {
@@ -1599,7 +1599,7 @@ sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm,
     return bRet;
 }
 
-void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
+void lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
 {
     // #i26945# - For correct appliance of the 'straightforward
     // object positioning process, it's needed to notify that the page frame,
@@ -1696,7 +1696,7 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
         pPageFrm->SetLayoutInProgress( false );
 }
 
-void MA_FASTCALL lcl_RecalcTable( SwTabFrm& rTab,
+void lcl_RecalcTable( SwTabFrm& rTab,
                                   SwLayoutFrm *pFirstRow,
                                   SwLayNotify &rNotify )
 {
@@ -3767,7 +3767,7 @@ void SwRowFrm::MakeAll()
 |*  SwRowFrm::Format()
 |*
 |*************************************************************************/
-long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm )
+long CalcHeightWidthFlys( const SwFrm *pFrm )
 {
     SWRECTFN( pFrm )
     long nHeight = 0;
@@ -3903,7 +3903,7 @@ SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBorderAttr
 // #i26945# - add parameter <_bConsiderObjs> in order to
 // control, if floating screen objects have to be considered for the minimal
 // cell height.
-SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell,
+SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell,
                                            const sal_Bool _bConsiderObjs,
                                            const SwBorderAttrs *pAttrs = 0 )
 {
@@ -3960,7 +3960,7 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell,
 // OD 2004-02-18 #106629# - correct type of 1st parameter
 // #i26945# - add parameter <_bConsiderObjs> in order to control,
 // if floating screen objects have to be considered for the minimal cell height
-SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm* _pRow,
+SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow,
                                           const sal_Bool _bConsiderObjs )
 {
     SWRECTFN( _pRow )
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index a897ab4c3860..ef9ec60c42fb 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -618,7 +618,7 @@ sal_Bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm,
 //Ueberspringen von wiederholten Headlines.
 //MA 26. Jan. 98: Chg auch andere Geschuetzte Bereiche ueberspringen.
 // FME: Skip follow flow cells
-const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
+const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
                                                        GetNxtPrvCnt fnNxtPrv,
                                                        sal_Bool bMissHeadline,
                                                        sal_Bool bInReadOnly,
@@ -649,7 +649,7 @@ const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
     return pCnt;
 }
 
-sal_Bool MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
+sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
                     GetNxtPrvCnt fnNxtPrv, sal_Bool bInReadOnly )
 {
     OSL_ENSURE( pPam->GetNode() == (SwCntntNode*)pStart->GetNode(),
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 323f8573e970..9a5b34a2b0cf 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -3285,7 +3285,7 @@ long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, sal_Bool ) const
 /*************************************************************************
 |*  Local helpers for SwLayoutFrm::FormatWidthCols()
 |*************************************************************************/
-long MA_FASTCALL lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm )
+long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm )
 {
     long nDiff = 0, nFirstDiff = 0;
     SwLayoutFrm *pCol = (SwLayoutFrm*)pLayFrm->Lower();