diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 16:30:06 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 16:30:06 +0000 |
| commit | f3715c0b75b8b8f1c012216542a421d80c1d107a (patch) | |
| tree | cea1f13490a3379904e7dfe14fa84a4b4e0a61c5 /sw/source/core/text/txtfld.cxx | |
| parent | 672fa525df3b04b82356a81a031db0cff9fc7017 (diff) | |
INTEGRATION: CWS os106 (1.25.70); FILE MERGED
2007/11/02 11:46:10 fme 1.25.70.1: #i81434# New option: Do not paint placeholder field
Diffstat (limited to 'sw/source/core/text/txtfld.cxx')
| -rw-r--r-- | sw/source/core/text/txtfld.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index fabcfdde6589..68dec6813b21 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtfld.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2007-09-27 09:20:11 $ + * last change: $Author: ihi $ $Date: 2007-11-26 17:30:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,6 +117,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, pFld->SetLanguage( GetFnt()->GetLanguage() ); ViewShell *pSh = rInf.GetVsh(); + sal_Bool bPlaceHolder = sal_False; switch( pFld->GetTyp()->Which() ) { @@ -230,6 +231,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, if( !bName ) pChFmt = ((SwJumpEditField*)pFld)->GetCharFmt(); bNewFlyPor = sal_True; + bPlaceHolder = sal_True; break; default: @@ -258,7 +260,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, else pTmpFnt->SetDiffFnt( &pChFmt->GetAttrSet(), pFrm->GetTxtNode()->getIDocumentSettingAccess() ); } - pRet = new SwFldPortion( pFld->GetCntnt( bName ), pTmpFnt ); + pRet = new SwFldPortion( pFld->GetCntnt( bName ), pTmpFnt, bPlaceHolder ); } return pRet; |