diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-14 20:32:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-14 21:21:29 +0200 |
| commit | 9d29d3dad4e944182b2fad6e58bd1cd02aa0a8fd (patch) | |
| tree | 13af36e1a95ddafc04ff62bdcd351a705bbd31c1 /svx | |
| parent | f6afad4c7bc0e77ec374a7bf1cd4b97a66921b1c (diff) | |
BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE has been defined forever in these files
Change-Id: I0afa1b404192f44540aa318e748452e0328fac6b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 0fff90ae9392..d8d5758383e0 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -28,6 +28,7 @@ // state not visible to this code! #define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE + #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) #define BOOST_SPIRIT_DEBUG #endif @@ -1087,7 +1088,6 @@ private: ParserContextSharedPtr mpParserContext; // might get modified during parsing }; -#ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE const ParserContextSharedPtr& getParserContext() { static ParserContextSharedPtr lcl_parserContext( new ParserContext() ); @@ -1099,7 +1099,6 @@ const ParserContextSharedPtr& getParserContext() return lcl_parserContext; } -#endif } @@ -1119,13 +1118,9 @@ std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& r ParserContextSharedPtr pContext; -#ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE // static parser context, because the actual // Spirit parser is also a static object pContext = getParserContext(); -#else - pContext.reset( new ParserContext() ); -#endif pContext->mpCustoShape = &rCustoShape; ExpressionGrammar aExpressionGrammer( pContext ); |