[Libreoffice-commits] core.git: sc/qa

Miklos Vajna vmiklos at collabora.co.uk
Wed May 14 22:32:37 PDT 2014


 sc/qa/unit/ucalc_formula.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 282b0123a34b978ea221d88ac668ed0c4423f801
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu May 15 07:29:07 2014 +0200

    error: invalid conversion from 'int' to 'formula::StackVar'
    
    Change-Id: I77280f843ae3123a6e0459becb2ce0b5fd7b78cc

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 7720881..b1ef561 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -821,11 +821,11 @@ void Test::testFormulaCompilerJumpReordering()
         TokenCheck aCheckRPN[] =
         {
             { ocPush,  svSingleRef },
-            { ocIf,    0           },
+            { ocIf,    static_cast<formula::StackVar>(0) },
             { ocPush,  svDouble    },
-            { ocSep,   0           },
+            { ocSep,   static_cast<formula::StackVar>(0) },
             { ocPush,  svString    },
-            { ocClose, 0           },
+            { ocClose, static_cast<formula::StackVar>(0) },
         };
 
         sal_uInt16 nLen = pCode->GetCodeLen();
@@ -852,7 +852,7 @@ void Test::testFormulaCompilerJumpReordering()
             { ocPush,  svSingleRef },
             { ocPush,  svDouble    },
             { ocPush,  svString    },
-            { ocIf,    0           },
+            { ocIf,    static_cast<formula::StackVar>(0) },
         };
 
         nLen = pCode->GetCodeLen();


More information about the Libreoffice-commits mailing list