summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-04-13 21:26:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-04-16 12:19:49 +0200
commitf03310eac0162c8b582a0f5f6cb0489d29aaa488 (patch)
tree146f5e5d56ac7ec3a5e98d64704e999a27ea7539 /slideshow
parentf0d07c5b84300e508d49dfceb968cb6a0dae436c (diff)
loplugin:sequentialassign in sfx2..solenv
Change-Id: I57e11d45aad48713b7c6802e2b6976fd916fc6ba Reviewed-on: https://gerrit.libreoffice.org/70717 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx3
-rw-r--r--slideshow/source/engine/smilfunctionparser.cxx8
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