[Libreoffice-commits] .: 3 commits - starmath/source sw/source

[Caolán McNamara]

 starmath/source/dialog.cxx            |    7 +++----
 sw/source/core/fields/flddropdown.cxx |    2 +-
 sw/source/filter/writer/writer.cxx    |    3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 417dc9311229c6a3c069b3ca6e46a5d99c5b3e04
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 23 12:51:06 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 81b7cb2..c9f13f9 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -141,7 +141,7 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
     int i = 0;
     vector<String>::const_iterator aIt;
 
-    for (aIt = aValues.begin(); aIt != aValues.end(); aIt++)
+    for (aIt = aValues.begin(); aIt != aValues.end(); ++aIt)
     {
         pSeq[i] = rtl::OUString(*aIt);
 
commit 6a738db72970487d55c5da83b4fa3bf8fd1e7562
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 23 12:45:41 2010 +0000

    cppcheck: the scope of this variable can be reduced

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 35c595c..bcccf16 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1974,8 +1974,7 @@ void SmSymDefineDialog::UpdateButtons()
 {
     bool  bAdd    = false,
           bChange = false,
-          bDelete = false,
-          bEqual;
+          bDelete = false;
     XubString aTmpSymbolName    (aSymbols.GetText()),
               aTmpSymbolSetName (aSymbolSets.GetText());
 
@@ -1983,7 +1982,7 @@ void SmSymDefineDialog::UpdateButtons()
     {
         // alle Einstellungen gleich?
         //! (Font-, Style- und SymbolSet Name werden nicht case sensitiv verglichen)
-        bEqual = pOrigSymbol
+        bool bEqual = pOrigSymbol
                     && aTmpSymbolSetName.EqualsIgnoreCaseAscii(aOldSymbolSetName.GetText())
                     && aTmpSymbolName.Equals(pOrigSymbol->GetName())
                     && aFonts.GetSelectEntry().EqualsIgnoreCaseAscii(
@@ -2000,7 +1999,7 @@ void SmSymDefineDialog::UpdateButtons()
 
         // aendern nur falls altes Symbol vorhanden und am neuen etwas anders ist
         bChange = pOrigSymbol && !bEqual;
-}
+    }
 
     aAddBtn   .Enable(bAdd);
     aChangeBtn.Enable(bChange);
commit 4cab3f5985179126132da3418c1590b4dc9e4e3c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 23 12:44:37 2010 +0000

    cppcheck: uninit member variable

diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index c6c2ad5..ad55d1f 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -73,7 +73,8 @@ struct Writer_Impl
 
 Writer_Impl::Writer_Impl()
     : m_pStream(0)
-    , pSrcArr( 0 ), pDestArr( 0 ), pFontRemoveLst( 0 ), pBkmkNodePos( 0 )
+    , pSrcArr( 0 ), pDestArr( 0 ), pFontRemoveLst( 0 )
+    , pBkmkArr( 0 ), pBkmkNodePos( 0 )
 {
 }