diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:22:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:22:27 +0000 |
| commit | d2885a2efd2b10b7c813c284a0f8e018d378c2f3 (patch) | |
| tree | 43486990f5d7abdcc258277fdeb2ce8ecf1c6345 /sw/inc/fmtwrapinfluenceonobjpos.hxx | |
| parent | INTEGRATION: CWS oasisbf2 (1.4.70); FILE MERGED (diff) | |
| download | core-d2885a2efd2b10b7c813c284a0f8e018d378c2f3.tar.gz core-d2885a2efd2b10b7c813c284a0f8e018d378c2f3.zip | |
INTEGRATION: CWS oasisbf2 (1.2.122); FILE MERGED
2004/10/20 06:56:30 od 1.2.122.1: #i35017# - adjustments for changed com::sun::star::text::WrapInfluenceOnPosition
- enable treatment of <ITERATIVE> as <ONCE_CONCURRENT>
Diffstat (limited to 'sw/inc/fmtwrapinfluenceonobjpos.hxx')
| -rw-r--r-- | sw/inc/fmtwrapinfluenceonobjpos.hxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 7286d5b49f8f..a78d684d30cf 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtwrapinfluenceonobjpos.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-08-02 13:57:08 $ + * last change: $Author: rt $ $Date: 2004-11-26 13:22:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,9 +83,11 @@ private: public: TYPEINFO(); + // --> OD 2004-10-18 #i35017# - constant name has changed SwFmtWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition = - text::WrapInfluenceOnPosition::NONE_CONCURRENT_POSITIONED ); + text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); + // <-- SwFmtWrapInfluenceOnObjPos( const SwFmtWrapInfluenceOnObjPos& _rCpy ); ~SwFmtWrapInfluenceOnObjPos(); @@ -102,7 +104,11 @@ public: // direct accessors to data void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ); - sal_Int16 GetWrapInfluenceOnObjPos() const; + // --> OD 2004-10-18 #i35017# - add parameter <_bIterativeAsOnceConcurrent> + // to control, if value <ITERATIVE> has to be treated as <ONCE_CONCURRENT> + sal_Int16 GetWrapInfluenceOnObjPos( + const bool _bIterativeAsOnceConcurrent = false ) const; + // <-- }; inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(BOOL bInP) const |