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:50:46 +0200
commit883ebe0283dc6bdf62f08191dede2a249f777f63 (patch)
tree9038dbe85b8b5c4a5c37c620dc8743c2e7c9b307
parentbd856bdeb1e04311c3c389093afbc4d6a6321ecb (diff)
Windows MSVC: cannot specify explicit initializer for arrays
Change-Id: Ic42897ba6bb520c931f63e56d0f453ed14cfaa3d
-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 )
{