[Libreoffice-commits] .: sw/source

Julien Nabet serval2412 at kemper.freedesktop.org
Sun Mar 11 01:03:53 PST 2012


 sw/source/filter/ww8/WW8FFData.cxx              |    2 +-
 sw/source/filter/ww8/wrtw8nds.cxx               |    4 ++--
 sw/source/filter/xml/XMLRedlineImportHelper.cxx |    2 +-
 sw/source/filter/xml/xmltexti.cxx               |    2 +-
 sw/source/ui/dochdl/swdtflvr.cxx                |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f96ac4aa501fb50150af9c9164f3bc1657f9c896
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Mar 11 10:01:26 2012 +0100

    Some cppcheck cleaning

diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx
index f6e665f..7f347d8 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -163,7 +163,7 @@ void WW8FFData::Write(SvStream * pDataStrm)
             const ::rtl::OUString & rEntry = *aIt;
             WriteOUString(pDataStrm, rEntry, false);
 
-            aIt++;
+            ++aIt;
         }
     }
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 53f95ad..1c7e87b 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1676,7 +1676,7 @@ bool MSWordExportBase::NearestBookmark( xub_StrLen& rNearest, const xub_StrLen n
 {
     bool bHasBookmark = false;
 
-    if ( m_rSortedMarksStart.size( ) > 0 )
+    if ( !m_rSortedMarksStart.empty() )
     {
         IMark* pMarkStart = m_rSortedMarksStart.front();
         xub_StrLen nNext = pMarkStart->GetMarkStart().nContent.GetIndex();
@@ -1687,7 +1687,7 @@ bool MSWordExportBase::NearestBookmark( xub_StrLen& rNearest, const xub_StrLen n
         }
     }
 
-    if ( m_rSortedMarksEnd.size( ) > 0 )
+    if ( !m_rSortedMarksEnd.empty() )
     {
         IMark* pMarkEnd = m_rSortedMarksEnd[0];
         xub_StrLen nNext = pMarkEnd->GetMarkEnd().nContent.GetIndex();
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 49a3110..b91a81b 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -330,7 +330,7 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 {
     // delete all left over (and obviously incomplete) RedlineInfos (and map)
     RedlineMapType::iterator aFind = aRedlineMap.begin();
-    for( ; aRedlineMap.end() != aFind; aFind++ )
+    for( ; aRedlineMap.end() != aFind; ++aFind )
     {
         RedlineInfo* pInfo = aFind->second;
 
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 4b77b18..d690dee 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -946,7 +946,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
                 aCommandSequence[nIndex].Handle = -1;
                 aCommandSequence[nIndex].Value = makeAny( OUString((*aIter).second) );
                 aCommandSequence[nIndex].State = beans::PropertyState_DIRECT_VALUE;
-                aIter++, nIndex++;
+                ++aIter, ++nIndex;
             }
 
             // unfortunately the names of the properties are depending on the object
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index adfa4d1..2760a7d 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -854,7 +854,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
             // remove all DDE-Bookmarks, they are invalid inside the clipdoc!
             for(::std::vector< ::sw::mark::IMark* >::iterator ppMark = vDdeMarks.begin();
                 ppMark != vDdeMarks.end();
-                ppMark++)
+                ++ppMark)
                 pMarkAccess->deleteMark(*ppMark);
         }
 


More information about the Libreoffice-commits mailing list