[Libreoffice-commits] .: editeng/source sw/source

[Julien Nabet]

 editeng/source/accessibility/AccessibleStaticTextBase.cxx |    2 +-
 sw/source/core/doc/ftnidx.cxx                             |   10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 428c9d516d3408460f1b7f8ce2c753b9a829de87
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Feb 1 19:36:28 2012 +0100

    Some cppcheck cleaning

diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 9e234d9..734dc1b 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -344,7 +344,7 @@ namespace accessibility
     {
         // Keep 'invalid' values at the TextSegment
         if( aTextSegment.SegmentStart != -1 &&
-            aTextSegment.SegmentStart != -1 )
+            aTextSegment.SegmentEnd != -1 )
         {
             // #112814# Correct TextSegment by paragraph offset
             sal_Int32 nOffset(0);
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 3ccd856..52f9873 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -192,10 +192,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
 
             if( nSectNo )
             {
-                if( rFtn.IsEndNote() )
-                    pTxtFtn->SetNumber( nSectNo, &rFtn.GetNumStr() );
-                else
-                    pTxtFtn->SetNumber( nSectNo, &rFtn.GetNumStr() );
+                pTxtFtn->SetNumber( nSectNo, &rFtn.GetNumStr() );
             }
         }
     }
@@ -281,10 +278,7 @@ void SwFtnIdxs::UpdateAllFtn()
 
             if( nSectNo )
             {
-                if( rFtn.IsEndNote() )
-                    pTxtFtn->SetNumber( nSectNo, &rFtn.GetNumStr() );
-                else
-                    pTxtFtn->SetNumber( nSectNo, &rFtn.GetNumStr() );
+                pTxtFtn->SetNumber( nSectNo, &rFtn.GetNumStr() );
             }
         }
     }