diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-02 19:02:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-03 00:05:29 +0100 |
| commit | 9519deda120b73b72e75d89c3b2ae3d66220ec2d (patch) | |
| tree | 1d59e072a75a4965b9410621f6a65b2dbbf54bbe /sw/inc/txtfld.hxx | |
| parent | eb237af5aa0a5d8616e4a8ddd1e528433bdd0f82 (diff) | |
fdo#39694: SwTxtFld: do expand the field in the ctor
While only the text formatting is able to expand all fields correctly,
this is still good enough for many field types and fixes a race
condition when the field value is requested before layout is finished.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
Diffstat (limited to 'sw/inc/txtfld.hxx')
| -rw-r--r-- | sw/inc/txtfld.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 3ecabb8889bc..f5748117bf93 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -42,7 +42,8 @@ class SwTxtFld : public SwTxtAttr SwTxtNode * m_pTxtNode; public: - SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStart); + SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStart, + bool const bInClipboard); virtual ~SwTxtFld(); void CopyFld( SwTxtFld *pDest ) const; |