path: root/helpcontent2
diff options
authorJan-Marek Glogowski <>2017-07-04 17:15:14 +0200
committerChristian Lohmaier <>2017-07-06 23:17:05 +0200
commitb28b21216cce1cf0ae4b35b0d251df9c6b42730b (patch)
treece10269effc2d4e3e1159e83dbeebe34d54d0cb1 /helpcontent2
parent571dea70574294d75051a37fa4f5eef5e9ed5cbc (diff)
tdf#108873 fix merge data handling in fields
This is a regression from tdf#70346 / commit 4851cde7b98226b0f82ae2b191c290173e9b06c6 It added the whole DB row as variables to the SwCalc hash set. This works correct for conditionals when hiding sections, but not for conditionals used in fields - actually they break. Previously the field would do a fallback to query the DB again, if no variable was in the dict and the only possible variables in the dict could have been user-defined fields. This handles the added variables correctly for fields. Also fixes a bug to store the DB number values as number variables and adds the record number, as SwCalc::VarLook does. Change-Id: Ib0dbeda68234e671768ede55b2012235a3680276 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Samuel Mehrbrodt <> (cherry picked from commit f54c6938f73b94fb6f722f3ea68454fee424e62e) Reviewed-on: Reviewed-by: Christian Lohmaier <>
Diffstat (limited to 'helpcontent2')
0 files changed, 0 insertions, 0 deletions