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

[Eike Rathke]

 sc/source/core/tool/token.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 079ef12f13d0fcc658127568c7f1e184bb350893
Author: Eike Rathke <er...@redhat.com>
Date:   Mon Jun 8 17:49:29 2015 +0200

    Windows MSVC: cannot specify explicit initializer for arrays
    
    Change-Id: Ic42897ba6bb520c931f63e56d0f453ed14cfaa3d
    (cherry picked from commit 883ebe0283dc6bdf62f08191dede2a249f777f63)

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3df3717..00c9395 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -119,6 +119,7 @@ namespace
         FormulaToken**  mpStart;
         FormulaToken**  mpStop;
 
+        TokenPointerRange() : mpStart(NULL), mpStop(NULL) {}
         TokenPointerRange( FormulaToken** p, sal_uInt16 n ) :
             mpStart(p), mpStop( p + static_cast<size_t>(n)) {}
     };
@@ -126,8 +127,11 @@ namespace
     {
         TokenPointerRange maPointerRange[2];
 
-        TokenPointers( FormulaToken** pCode, sal_uInt16 nLen, FormulaToken** 
pRPN, sal_uInt16 nRPN ) :
-            maPointerRange{ TokenPointerRange( pCode, nLen), 
TokenPointerRange( pRPN, nRPN)} {}
+        TokenPointers( FormulaToken** pCode, sal_uInt16 nLen, FormulaToken** 
pRPN, sal_uInt16 nRPN )
+        {
+            maPointerRange[0] = TokenPointerRange( pCode, nLen);
+            maPointerRange[1] = TokenPointerRange( pRPN, nRPN);
+        }
 
         static bool skipToken( size_t i, const FormulaToken* const * pp )
         {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits