summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-03-02 21:32:27 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-03-05 14:48:40 +0100
commitbe999f1bc692a122e36add37f23312edad8f81d2 (patch)
treecdddb5ea19a7818e7ce65b3b1447262b3658841a
parent81828ab68a37715505b19988cdb4508ee0477c68 (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>
-rw-r--r--sw/source/core/unocore/unofield.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 6b0ddc7ccbe9..77134ec89342 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1911,9 +1911,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();
}