summaryrefslogtreecommitdiffstats
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-03-02 21:32:27 +0100
committerMichael Stahl <mstahl@redhat.com>2012-03-03 00:05:29 +0100
commite3dfae0741aae8581cd3fc713ba1b4459bb22d88 (patch)
tree923a22fcd166eba2769776811f23c8bc5a833dcc /sw
parentfdo#39694: SwTxtFld: do expand the field in the ctor (diff)
downloadcore-e3dfae0741aae8581cd3fc713ba1b4459bb22d88.tar.gz
core-e3dfae0741aae8581cd3fc713ba1b4459bb22d88.zip
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.
Diffstat (limited to 'sw')
-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 c12ac1413fe2..0cc0223f9c9b 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1912,9 +1912,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();
}