[Libreoffice-commits] core.git: editeng/source

Stephan Bergmann sbergman at redhat.com
Wed Sep 9 01:24:43 PDT 2015


 editeng/source/rtf/rtfitem.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3870d1145696a5d3969c269b5a8b19a6360d6b63
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 9 10:22:17 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    (a use of nStyleNo at the end of SvxRTFParser::ReadAttr had been in a commented-
    out clode block ever since fd069bee7e57ad529c3c0974559fd2d84ec3151a "initial
    import," and later been cleaned from the code)
    
    Change-Id: Ic9e30cc1bccca9c4246deb50fbc6d545e3ea31a2

diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index fb3e84c..d8a9739 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -206,7 +206,6 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
     DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" );
     bool bFirstToken = true;
     bool bContinue = true;
-    sal_uInt16 nStyleNo = 0;        // default
     FontUnderline eUnderline;
     FontUnderline eOverline;
     FontEmphasisMark eEmphasis;
@@ -222,7 +221,6 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
         {
         case RTF_PARD:
             RTFPardPlain( true, &pSet );
-            nStyleNo = 0;
             bPardTokenRead = true;
             break;
 
@@ -287,7 +285,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 }
                 else
                 {
-                    nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue);
+                    sal_uInt16 nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue);
                     /* setze am akt. auf dem AttrStack stehenden Style die
                        I sit on akt. which is on the immediate style AttrStack */
                     // StyleNummer


More information about the Libreoffice-commits mailing list