[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Oliver Specht]

 sw/source/core/fields/cellfml.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 74d6d268e9a7193dcca39bbfad2830a2504dfe79
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Fri Nov 6 13:33:58 2015 +0100

    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 at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>
    (cherry picked from commit 0bd2a5eedd91466f97806e198b125546d256d1f8)
    Reviewed-on: https://gerrit.libreoffice.org/19826
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 1010f00..6565401 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