diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-02 21:32:27 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2012-03-05 15:00:51 +0100 |
| commit | ea137eef21554dfc7b8420b1f40e7a26eaaa5210 (patch) | |
| tree | 3141310203a9e15a6af1bfc073dac4ad0ebcbe26 | |
| parent | bad17b39d1567c5f58c439093c8f8b692e106cdc (diff) | |
fdo#42073: sw: expand all text fields when setting properties:
SwXTextField::setPropertyValue: call Expand() for all text fields
Fixes getPresentation returning stale values.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
Also, without this the text formatting does not actually update and the new
content is not displayed until some other unrelated editing operation.
(cherry picked from commit e3dfae0741aae8581cd3fc713ba1b4459bb22d88)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
| -rw-r--r-- | sw/source/core/unocore/unofield.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 835197038b..ca9511b12c 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1902,9 +1902,8 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An const_cast<SwFmtFld*>(pFmtFld)->Broadcast(SwFmtFldHint( 0, SWFMTFLD_CHANGED )); } - // changes of the expanded string have to be notified - //#to the SwTxtFld - if(RES_DBFLD == nWhich && pFmtFld->GetTxtFld()) + // fdo#42073 notify SwTxtFld about changes of the expanded string + if (pFmtFld->GetTxtFld()) { pFmtFld->GetTxtFld()->Expand(); } |