diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:23:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:23:42 +0000 |
| commit | d4fa17c69ed60181fbc234cfe8741dff335f7a52 (patch) | |
| tree | 4e079c3e808f744861b0174b9cd3a69f36ab1182 /sw/source/core | |
| parent | 8c4a70a287b05c6b21222300860aec4636cc7142 (diff) | |
INTEGRATION: CWS oasisbf2 (1.2.122); FILE MERGED
2004/10/20 06:57:04 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/source/core')
| -rw-r--r-- | sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index 27c753bfd20f..444f833a16a7 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtwrapinfluenceonobjpos.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-08-02 14:00:06 $ + * last change: $Author: rt $ $Date: 2004-11-26 13:23:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,8 +140,12 @@ BOOL SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId ) { sal_Int16 nNewWrapInfluence; rVal >>= nNewWrapInfluence; - if ( nNewWrapInfluence == text::WrapInfluenceOnPosition::NONE_SUCCESSIVE_POSITIONED || - nNewWrapInfluence == text::WrapInfluenceOnPosition::NONE_CONCURRENT_POSITIONED ) + // --> OD 2004-10-18 #i35017# - constant names have changed and + // <ITERATIVE> has been added + if ( nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE || + nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_CONCURRENT || + nNewWrapInfluence == text::WrapInfluenceOnPosition::ITERATIVE ) + // <-- { SetWrapInfluenceOnObjPos( nNewWrapInfluence ); } @@ -162,8 +166,12 @@ BOOL SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId ) void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ) { - if ( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::NONE_SUCCESSIVE_POSITIONED || - _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::NONE_CONCURRENT_POSITIONED ) + // --> OD 2004-10-18 #i35017# - constant names have changed and consider + // new value <ITERATIVE> + if ( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE || + _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_CONCURRENT || + _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ITERATIVE ) + // <-- { mnWrapInfluenceOnPosition = _nWrapInfluenceOnPosition; } @@ -173,7 +181,19 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu } } -sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos() const +// --> OD 2004-10-18 #i35017# - add parameter <_bIterativeAsOnceConcurrent> +// to control, if value <ITERATIVE> has to be treated as <ONCE_CONCURRENT> +sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos( + const bool _bIterativeAsOnceConcurrent ) const { - return mnWrapInfluenceOnPosition; + sal_Int16 nWrapInfluenceOnPosition( mnWrapInfluenceOnPosition ); + + if ( _bIterativeAsOnceConcurrent && + nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ITERATIVE ) + { + nWrapInfluenceOnPosition = text::WrapInfluenceOnPosition::ONCE_CONCURRENT; + } + + return nWrapInfluenceOnPosition; } +// <-- |