diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-12-04 18:58:15 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-12-04 18:58:15 +0100 |
| commit | b4c4d7ac0a50b17c526fc8092d1fa3b7b39dadd5 (patch) | |
| tree | d539cac3a6e1661ac236bfff872e3fc3cf118351 | |
| parent | b81cab7eabc391ad5eb89417c06aa057896667e3 (diff) | |
| parent | adee06162f7537a69d658f38cdf1de3596994a7e (diff) | |
CWS-TOOLING: integrate CWS sw32bf08_DEV300
Notes
Notes:
split repo tag: writer_ooo/DEV300_m67
| -rw-r--r-- | sw/source/core/text/porfld.cxx | 7 | ||||
| -rw-r--r-- | sw/source/core/text/porfld.hxx | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 932eb1c72b6f..162c0fddd07b 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -82,8 +82,13 @@ SwFldPortion *SwFldPortion::Clone( const XubString &rExpand ) const { SwFont *pNewFnt; if( 0 != ( pNewFnt = pFnt ) ) + { pNewFnt = new SwFont( *pFnt ); - SwFldPortion* pClone = new SwFldPortion( rExpand, pNewFnt ); + } + // --> OD 2009-11-25 #i107143# + // pass placeholder property to created <SwFldPortion> instance. + SwFldPortion* pClone = new SwFldPortion( rExpand, pNewFnt, bPlaceHolder ); + // <-- pClone->SetNextOffset( nNextOffset ); pClone->m_bNoLength = this->m_bNoLength; return pClone; diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index 331ee8d401c7..b2ece8ffe8c6 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -60,7 +60,7 @@ protected: sal_Bool bAnimated : 1; // wird von SwGrfNumPortion benutzt sal_Bool bNoPaint : 1; // wird von SwGrfNumPortion benutzt sal_Bool bReplace : 1; // wird von SwGrfNumPortion benutzt - sal_Bool bPlaceHolder : 1; + const sal_Bool bPlaceHolder : 1; sal_Bool m_bNoLength : 1; // HACK for meta suffix (no CH_TXTATR) inline void SetFont( SwFont *pNew ) { pFnt = pNew; } |