diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-06-01 14:25:22 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-06-01 14:29:08 +0300 |
commit | 08dedb5ea1acf78ab355c5444ab68a3dc522b1a4 (patch) | |
tree | 042ea4eac74fcccce9984240fe8cff3456c70833 /sw/source/core/inc | |
parent | 20a132b51715bb1869068a52202e63701550041d (diff) |
Bin MA_FASTCALL nonsense
Change-Id: Ifebc06daf56ee0e4dc29d592afba5a07575c99af
Diffstat (limited to 'sw/source/core/inc')
-rw-r--r-- | sw/source/core/inc/frmtool.hxx | 26 |
1 files changed, 10 insertions, 16 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 |