summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-06-08 17:49:29 +0200
committerEike Rathke <erack@redhat.com>2015-06-08 17:53:19 +0200
commit079ef12f13d0fcc658127568c7f1e184bb350893 (patch)
treed9056fbbc515e2d082abdbce661fa87f5c38a993
parentaeb50bc04085058715f60d96ac60885ee0bfdd52 (diff)
Windows MSVC: cannot specify explicit initializer for arrays
Change-Id: Ic42897ba6bb520c931f63e56d0f453ed14cfaa3d (cherry picked from commit 883ebe0283dc6bdf62f08191dede2a249f777f63)
-rw-r--r--sc/source/core/tool/token.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3df3717377d5..00c9395434f0 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 )
{