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 | f9637c9a6b44a7f53afd4190bc7c104ec9b8dd3a (patch) | |
| tree | 39a43d50b61969a3944d7096c481e76cac438236 | |
| parent | ed3c740619c90bf1d2d6a4e43eb44492cda051c4 (diff) | |
| parent | b391df7c03a9f43c754795fc70be2948e9736c74 (diff) | |
CWS-TOOLING: integrate CWS sw32bf08_DEV300ooo/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 8fcdbca8e7..913ca9e393 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 2292a27b78..5f52d45631 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; } |