diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-07-04 17:15:14 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-07-05 21:43:13 +0200 |
commit | f54c6938f73b94fb6f722f3ea68454fee424e62e (patch) | |
tree | 641f66bd315c54fef9c6c860125ea29716376bd8 /sw/inc/calc.hxx | |
parent | 14f562b109042ebde90261f93952b4c730e1427d (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: https://gerrit.libreoffice.org/39509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/inc/calc.hxx')
-rw-r--r-- | sw/inc/calc.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 9e7b3c817d08..c6f3380cceee 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -101,10 +101,11 @@ enum class SwCalcError class SwSbxValue : public SbxValue { bool bVoid; + bool bDBvalue; public: // always default to a number. otherwise it will become a SbxEMPTY - SwSbxValue( long n = 0 ) : bVoid(false) { PutLong( n ); } - SwSbxValue( const double& rD ) : bVoid(false) { PutDouble( rD ); } + SwSbxValue( long n = 0 ) : bVoid(false), bDBvalue(false) { PutLong( n ); } + SwSbxValue( const double& rD ) : bVoid(false), bDBvalue(false) { PutDouble( rD ); } bool GetBool() const; double GetDouble() const; @@ -112,6 +113,9 @@ public: bool IsVoidValue() {return bVoid;} void SetVoidValue(bool bSet) {bVoid = bSet;} + + bool IsDBvalue() {return bDBvalue;} + void SetDBvalue(bool bSet) {bDBvalue = bSet;} }; // Calculate HashTables for VarTable and Operations |