diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-10-31 10:40:41 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-10-31 12:35:56 +0100 |
commit | d09336fbdceaafd9320466b660a2b32a07dcc16a (patch) | |
tree | 2c5ef78ca58314fe249223aafd9b0b752f585721 /include/vcl/opengl/OpenGLWrapper.hxx | |
parent | 25c608dc3508843845f117e526c0788e92e44214 (diff) |
tdf#125038 DOCX import: fix lost MERGEFIELD result inside an IF field
The problem here was that the IF field result didn't have a plain text
string, rather it had a MERGEFIELD in it. Writer's conditional text
field expects a plain text string, so just use the result of the
MERGEFIELD for an IF parent. Do this in a generic way, it's likely that
other parent-child field combinations want to do the same in the future.
With this, all lost strings are fixed from the original bugdoc + all
unexpected content is hidden in Writer as well.
Change-Id: Ic5c03b1df2f08a2cd851647b625e0c303cc5d6c5
Reviewed-on: https://gerrit.libreoffice.org/81825
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'include/vcl/opengl/OpenGLWrapper.hxx')
0 files changed, 0 insertions, 0 deletions