[Libreoffice-commits] .: 5 commits - comphelper/source sot/source svtools/source toolkit/source

[Caolán McNamara]

 comphelper/source/property/propertysetinfo.cxx |    4 ++--
 sot/source/sdstor/ucbstorage.cxx               |    2 +-
 svtools/source/edit/syntaxhighlight.cxx        |    2 +-
 toolkit/source/awt/vclxwindow.cxx              |    2 +-
 toolkit/source/layout/core/proplist.cxx        |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a3f1ff79c2ff9d845fa2cefaf0875042f90e1bc0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 6 14:13:20 2011 +0000

    cppunit: prefer prefix variant

diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 78a2449..8b0409f 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1389,7 +1389,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe
     // lovely hack from:
     // void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId )
     std::list< sal_uInt16 >::const_iterator iter;
-    for( iter = rIds.begin(); iter != rIds.end(); iter++) {
+    for( iter = rIds.begin(); iter != rIds.end(); ++iter) {
         if( *iter == BASEPROPERTY_FONTDESCRIPTOR )
         {
             // some properties are not included in the FontDescriptor, but everytime
commit b998eac521322710cbd8b172d6e9ece046365d84
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 6 14:08:49 2011 +0000

    cppunit: prefer prefix variant

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index e65d576..360e052 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2220,7 +2220,7 @@ UCBStorage_Impl::~UCBStorage_Impl()
     if ( m_pUNOStorageHolderList )
     {
         for ( UNOStorageHolderList::iterator aIter = m_pUNOStorageHolderList->begin();
-              aIter != m_pUNOStorageHolderList->end(); aIter++ )
+              aIter != m_pUNOStorageHolderList->end(); ++aIter )
             if ( *aIter )
             {
                 (*aIter)->InternalDispose();
commit e513878f2ce77e61605c5ee3544650606ad36eb6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 6 14:06:38 2011 +0000

    cppunit: prefer prefix variant

diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index e17d3d1..64b1a82 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -131,8 +131,8 @@ Sequence< Property > PropertyMapImpl::getProperties() throw()
             pProperties->Type = *pEntry->mpType;
             pProperties->Attributes = pEntry->mnAttributes;
 
-            pProperties++;
-            aIter++;
+            ++pProperties;
+            ++aIter;
         }
     }
 
commit ae59a01d5987014cad4ef6e5d150d6924ca3ae19
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 6 13:48:25 2011 +0000

    cppunit: prefer prefix variant

diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index d77fbc4..f5c85a9 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -193,7 +193,7 @@ uno::Any anyFromString( OUString const& value, uno::Type const& type )
             uno::Sequence< OUString > seq( values.size() );
             i = 0;
             for ( std::list< OUString >::const_iterator it = values.begin();
-                  it != values.end(); it++, ++i )
+                  it != values.end(); ++it, ++i )
                 seq[ i ] = *it;
 
             return uno::makeAny( seq );
commit fd4dc478de63240e0fe8a0d8871dde5cc18d5311
Author: Andreas Bregas <ab at openoffice.org>
Date:   Thu Jan 6 12:05:14 2011 +0000

    Resolves: #i109702# basic editor reads past end of string when line ie just '

diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index 2d58301..4c7590b 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -527,7 +527,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
                 c = getChar();	// '/' entfernen
 
                 // Alle Zeichen bis Zeilen-Ende oder EOF entfernen
-                sal_Unicode cPeek = peekChar();
+                sal_Unicode cPeek = c;
                 while( cPeek != CHAR_EOF && testCharFlags( cPeek, CHAR_EOL ) == FALSE )
                 {
                     getChar();