[Libreoffice-commits] core.git: 2 commits - basegfx/source comphelper/source

[Stephan Bergmann]

 basegfx/source/polygon/b2dpolygontools.cxx   |    1 -
 basegfx/source/polygon/b2dsvgpolypolygon.cxx |    4 ----
 comphelper/source/misc/syntaxhighlight.cxx   |    3 +--
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit cc8736ae602014297a594677a857cb2d789142ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 5 09:54:11 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    Change-Id: Id2d7c2aa0ba1783710a141bd910af785ecf81f8a

diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index e031143..95ee250 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3462,7 +3462,6 @@ namespace basegfx
                     && aControlA.equal(aRetval.getB2DPoint(aRetval.count() - 1)))
                 {
                     bControlA = false;
-                    bControlB = false;
                 }
 
                 if(bControlA)
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 3ba9423..25773e7 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -784,7 +784,6 @@ namespace basegfx
                                     if(aLastSVGCommand != aCommand)
                                     {
                                         aResult.append(aCommand);
-                                        aLastSVGCommand = aCommand;
                                     }
 
                                     basegfx::internal::putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
@@ -799,7 +798,6 @@ namespace basegfx
                                     if(aLastSVGCommand != aCommand)
                                     {
                                         aResult.append(aCommand);
-                                        aLastSVGCommand = aCommand;
                                     }
 
                                     basegfx::internal::putNumberCharWithSpace(aResult, aLeft.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
@@ -820,7 +818,6 @@ namespace basegfx
                                     if(aLastSVGCommand != aCommand)
                                     {
                                         aResult.append(aCommand);
-                                        aLastSVGCommand = aCommand;
                                     }
 
                                     basegfx::internal::putNumberCharWithSpace(aResult, aControlEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
@@ -837,7 +834,6 @@ namespace basegfx
                                     if(aLastSVGCommand != aCommand)
                                     {
                                         aResult.append(aCommand);
-                                        aLastSVGCommand = aCommand;
                                     }
 
                                     basegfx::internal::putNumberCharWithSpace(aResult, aControlEdgeStart.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
commit 9a1f09b93bc83276516fcfe3a7db4a23ca8c8c2c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 5 09:52:43 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    Change-Id: Ifd016962dda31b312070745e7646879186d074e9

diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index 710d8c0..e071a93 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -375,8 +375,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const sal_Unicode*& pos, /*out*/
                         sal_Unicode cPeek = *pos;
                         while( cPeek != 0 && !testCharFlags( cPeek, CHAR_EOL ) )
                         {
-                            c = *pos++;
-                            cPeek = *pos;
+                            cPeek = *++pos;
                         }
 
                         reType = TT_COMMENT;