summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-11-06 13:33:58 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-09 20:51:08 +0000
commit74d6d268e9a7193dcca39bbfad2830a2504dfe79 (patch)
tree4451105f06563faf32cd674f082b82fa7d8bee79
parent5889d97f4e6ac41db9cd65b55baa14c46a283893 (diff)
tdf#94624 calculation of power operator fixed
cell values are added in parentheses to make sure negative values are handled correctly Change-Id: I7366493e3cd6c25607e311d4b610ef8aa704a8bb Reviewed-on: https://gerrit.libreoffice.org/19821 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit 0bd2a5eedd91466f97806e198b125546d256d1f8) Reviewed-on: https://gerrit.libreoffice.org/19826 Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/source/core/fields/cellfml.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 1010f0032b8e..656540103ce6 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -366,8 +366,10 @@ void SwTableFormula::_MakeFormula( const SwTable& rTable, OUString& rNewStr,
// calculate the value of the box
if ( pSttBox->getRowSpan() >= 1 )
{
+ rNewStr += "(";
rNewStr += pCalcPara->rCalc.GetStrResult(
pSttBox->GetValue( *pCalcPara ), false );
+ rNewStr += ")";
}
}
else