[Libreoffice-commits] .: cli_ure/source extensions/source hwpfilter/source

Thorsten Behrens thorsten at kemper.freedesktop.org
Mon Feb 6 01:17:59 PST 2012


 cli_ure/source/uno_bridge/cli_proxy.cxx |    1 -
 extensions/source/ole/unoobjw.cxx       |    2 +-
 hwpfilter/source/hbox.cxx               |   12 ++++++------
 hwpfilter/source/hbox.h                 |    2 +-
 hwpfilter/source/hwpfile.cxx            |   14 +++++++-------
 5 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 664b22c56b7e37006e07ad194fe2ab98980cb8f0
Author: PKEuS <philipp.kloke at web.de>
Date:   Mon Feb 6 09:44:32 2012 +0100

    Fixed some cppcheck messages

diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 9be5afe..4672dd5 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -497,7 +497,6 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg)
                         method_td->pParams, args, argTypes, &pExc);
                     return constructReturnMessage(cli_ret, args, method_td,
                                                   callmsg, pExc);
-                    break;
                 }
             }
             else
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 4e81a8f..641e643 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1007,7 +1007,7 @@ HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, V
         if (pvarResult)
             anyToVariant(pvarResult, returnValue);
     }
-    catch(const UnknownPropertyException e) //XInvocation::getValue
+    catch(const UnknownPropertyException& e) //XInvocation::getValue
     {
         writeExcepinfo(pexcepinfo, e.Message);
         ret = DISP_E_MEMBERNOTFOUND;
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index fcdd706..fdecbdf 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -335,12 +335,12 @@ TxtBox::~TxtBox(void)
     for (int ii = 0; ii < nCell; ++ii)
     {
         LinkedListIterator < HWPPara > it(&plists[ii]);
-        for (; it.current(); it++)
+        for (; it.current(); ++it)
             delete it.current();
     }
 
     LinkedListIterator < HWPPara > it(&caption);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         delete it.current();
 
     delete[]plists;
@@ -369,7 +369,7 @@ Picture::~Picture(void)
         delete (HWPDrawingObject *) picinfo.picdraw.hdo;
 
     LinkedListIterator < HWPPara > it(&caption);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         delete it.current();
 }
 
@@ -391,7 +391,7 @@ hunit Picture::Height(CharShape * sty)
 Hidden::~Hidden(void)
 {
     LinkedListIterator < HWPPara > it(&plist);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         delete it.current();
 }
 
@@ -400,7 +400,7 @@ Hidden::~Hidden(void)
 HeaderFooter::~HeaderFooter(void)
 {
     LinkedListIterator < HWPPara > it(&plist);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         delete it.current();
 }
 
@@ -409,7 +409,7 @@ HeaderFooter::~HeaderFooter(void)
 Footnote::~Footnote(void)
 {
     LinkedListIterator < HWPPara > it(&plist);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         delete it.current();
 }
 
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index ea4bd26..bbd5a37 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -537,7 +537,7 @@ struct Table
      Table(){};
      ~Table(){
           LinkedListIterator<TCell> it(&cells);
-          for( ; it.current(); it++)
+          for( ; it.current(); ++it)
                 delete it.current();
      };
      Columns columns;
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 66e0eb9..6de5198 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -76,19 +76,19 @@ HWPFile::~HWPFile()
     delete hiodev;
 
     LinkedListIterator < ColumnInfo > it_column(&columnlist);
-    for (; it_column.current(); it_column++)
+    for (; it_column.current(); ++it_column)
         delete it_column.current();
 
     LinkedListIterator < HWPPara > it(&plist);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         delete it.current();
 
     LinkedListIterator < Table > tbl(&tables);
-    for (; tbl.current(); tbl++)
+    for (; tbl.current(); ++tbl)
         delete tbl.current();
 
     LinkedListIterator < HyperText > hyp(&hyperlist);
-    for (; hyp.current(); hyp++)
+    for (; hyp.current(); ++hyp)
     {
         delete hyp.current();
     }
@@ -390,7 +390,7 @@ int HWPFile::GetPageMasterNum(int page)
     ColumnInfo *now = 0;
     int i;
 
-    for( i = 1 ; it.current() ; it++, i++){
+    for( i = 1 ; it.current() ; ++it, i++){
         now = it.current();
         if( page < now->start_page )
             return i-1;
@@ -412,7 +412,7 @@ EmPicture *HWPFile::GetEmPicture(Picture * pic)
     name[2] = 'P';
 
     LinkedListIterator < EmPicture > it(&emblist);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         if (strcmp(name, it.current()->name) == 0)
             return it.current();
     return 0;
@@ -425,7 +425,7 @@ EmPicture *HWPFile::GetEmPictureByName(char * name)
     name[2] = 'P';
 
     LinkedListIterator < EmPicture > it(&emblist);
-    for (; it.current(); it++)
+    for (; it.current(); ++it)
         if (strcmp(name, it.current()->name) == 0)
             return it.current();
     return 0;


More information about the Libreoffice-commits mailing list