diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-04 12:24:46 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-04 12:24:46 +0000 |
| commit | 95e675ecd797f31cffbd86899b2e44c4e29e03ce (patch) | |
| tree | c85e9577307decc25418433df5b277c9314ced21 /sw/source/core/text/porfly.hxx | |
| parent | INTEGRATION: CWS aig02 (1.19.38); FILE MERGED (diff) | |
| download | core-95e675ecd797f31cffbd86899b2e44c4e29e03ce.tar.gz core-95e675ecd797f31cffbd86899b2e44c4e29e03ce.zip | |
INTEGRATION: CWS aig02 (1.6.214); FILE MERGED
2003/06/23 15:26:36 od 1.6.214.1: #108784# - further adjustments for supporting drawing objects in header/footer
Diffstat (limited to 'sw/source/core/text/porfly.hxx')
| -rw-r--r-- | sw/source/core/text/porfly.hxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index ab395ac4205c..bf40171c1dfa 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porfly.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fme $ $Date: 2002-03-26 08:08:49 $ + * last change: $Author: vg $ $Date: 2003-07-04 13:24:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,20 +110,12 @@ class SwFlyCntPortion : public SwLinePortion virtual xub_StrLen GetCrsrOfst( const KSHORT nOfst ) const; public: -#ifdef VERTICAL_LAYOUT SwFlyCntPortion( const SwTxtFrm& rFrm, SwFlyInCntFrm *pFly, const Point &rBase, long nAscent, long nDescent, long nFlyAsc, long nFlyDesc, sal_uInt8 nFlags ); SwFlyCntPortion( const SwTxtFrm& rFrm, SwDrawContact *pDrawContact, const Point &rBase, long nAscent, long nDescent, long nFlyAsc, long nFlyDesc, sal_uInt8 nFlags ); -#else - SwFlyCntPortion( SwFlyInCntFrm *pFly, const Point &rBase, long nAscent, - long nDescent, long nFlyAsc, long nFlyDesc, sal_uInt8 nFlags ); - SwFlyCntPortion( SwDrawContact *pDrawContact, const Point &rBase, - long nAscent, long nDescent, long nFlyAsc, long nFlyDesc, - sal_uInt8 nFlags ); -#endif inline const Point& GetRefPoint() const { return aRef; } inline SwFlyInCntFrm *GetFlyFrm() { return (SwFlyInCntFrm*)pContact; } inline const SwFlyInCntFrm *GetFlyFrm() const @@ -136,14 +128,9 @@ public: inline const sal_uInt8 GetAlign() const { return nAlign; } inline void SetAlign( sal_uInt8 nNew ) { nAlign = nNew; } inline void SetMax( sal_Bool bNew ) { bMax = bNew; } -#ifdef VERTICAL_LAYOUT void SetBase( const SwTxtFrm& rFrm, const Point &rBase, long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, sal_uInt8 nFlags ); -#else - void SetBase( const Point &rBase, long nLnAscent, long nLnDescent, - long nFlyAscent, long nFlyDescent, sal_uInt8 nFlags ); -#endif const SwFrmFmt *GetFrmFmt() const; xub_StrLen GetFlyCrsrOfst( const KSHORT nOfst, const Point &rPoint, SwPosition *pPos, const SwCrsrMoveState* pCMS ) const; |