diff options
| author | Eike Rathke <erack@redhat.com> | 2015-06-08 17:49:29 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-06-08 21:46:04 +0200 |
| commit | 4fb7983c71c8997293edfe5e1aaf790b446acb3b (patch) | |
| tree | 75b4204e42dce649f9d5c729a4c36bfbcb153d84 | |
| parent | 059fa2b7a3bda92168c65c61e50cc5c6fda8cfac (diff) | |
Windows MSVC: cannot specify explicit initializer for arrays
Change-Id: Ic42897ba6bb520c931f63e56d0f453ed14cfaa3d
(cherry picked from commit 883ebe0283dc6bdf62f08191dede2a249f777f63)
(cherry picked from commit 079ef12f13d0fcc658127568c7f1e184bb350893)
| -rw-r--r-- | sc/source/core/tool/token.cxx | 8 |
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 ) { |