diff options
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 3 | ||||
| -rw-r--r-- | slideshow/source/engine/smilfunctionparser.cxx | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 3b1cccc8bd75..138491151b81 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -890,8 +890,7 @@ SlideSharedPtr SlideShowImpl::makeSlide( return SlideSharedPtr(); //Retrieve polygons for the current slide - PolygonMap::iterator aIter; - aIter = findPolygons(xDrawPage); + PolygonMap::iterator aIter = findPolygons(xDrawPage); const SlideSharedPtr pSlide( createSlide(xDrawPage, xDrawPages, diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index ed397d0a7eca..678e3c5ed740 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -538,11 +538,9 @@ namespace slideshow StringIteratorT aStart( rAsciiSmilValue.getStr() ); StringIteratorT aEnd( rAsciiSmilValue.getStr()+rAsciiSmilValue.getLength() ); - ParserContextSharedPtr pContext; - // static parser context, because the actual // Spirit parser is also a static object - pContext = getParserContext(); + ParserContextSharedPtr pContext = getParserContext(); pContext->maShapeBounds = rRelativeShapeBounds; pContext->mbParseAnimationFunction = false; // parse with '$' disabled @@ -583,11 +581,9 @@ namespace slideshow StringIteratorT aStart( rAsciiSmilFunction.getStr() ); StringIteratorT aEnd( rAsciiSmilFunction.getStr()+rAsciiSmilFunction.getLength() ); - ParserContextSharedPtr pContext; - // static parser context, because the actual // Spirit parser is also a static object - pContext = getParserContext(); + ParserContextSharedPtr pContext = getParserContext(); pContext->maShapeBounds = rRelativeShapeBounds; pContext->mbParseAnimationFunction = true; // parse with '$' enabled |